From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 701911FF183 for ; Wed, 27 Aug 2025 11:43:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6E1A815EF8; Wed, 27 Aug 2025 11:43:43 +0200 (CEST) Mime-Version: 1.0 Date: Wed, 27 Aug 2025 11:43:39 +0200 Message-Id: From: "Lukas Wagner" To: "Proxmox Datacenter Manager development discussion" , "Maximiliano Sandoval" X-Mailer: aerc 0.20.1-0-g2ecb8770224a References: <20250826091210.143858-1-m.sandoval@proxmox.com> In-Reply-To: <20250826091210.143858-1-m.sandoval@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1756287813887 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pdm-devel] applied: [PATCH proxmox-datacenter-manager] improve translatable strings X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" On Tue Aug 26, 2025 at 11:12 AM CEST, Maximiliano Sandoval wrote: > - The string "Mixed Subscriptions" is already in our pot files. > - We remove a newline and a trailing whitespace that leaked into the > pot file from the subscription string. > - The string in the wizard page was using it's instead of its. We also > make it easier to translate. > > Signed-off-by: Maximiliano Sandoval > --- > ui/src/dashboard/subscription_info.rs | 7 +++---- > ui/src/remotes/wizard_page_connect.rs | 8 +++----- > 2 files changed, 6 insertions(+), 9 deletions(-) > > diff --git a/ui/src/dashboard/subscription_info.rs b/ui/src/dashboard/subscription_info.rs > index 9677c15..08658d1 100644 > --- a/ui/src/dashboard/subscription_info.rs > +++ b/ui/src/dashboard/subscription_info.rs > @@ -55,14 +55,13 @@ fn render_subscription_status(subs: &[RemoteSubscriptions]) -> Row { > > let (status, title, msg) = if none > 0 { > let msg = tr!( > - "At least one remote does not have a valid subscription. Please visit www.proxmox.com to get > -a list of available options. ", > - ); > + "At least one remote does not have a valid subscription. Please visit www.proxmox.com to get a list of available options." > + ); > > let msg = Html::from_html_unchecked(msg.into()); > (Status::Error, tr!("No valid subscription"), msg) > } else if mixed > 0 { > - (Status::Warning, tr!("Mixed subscriptions"), tr!("At least one remote has mixed levels of subscription. These remotes fall back to the lowest one.").into()) > + (Status::Warning, tr!("Mixed Subscriptions"), tr!("At least one remote has mixed levels of subscription. These remotes fall back to the lowest one.").into()) > } else if unknown > 0 { > ( > Status::Unknown, > diff --git a/ui/src/remotes/wizard_page_connect.rs b/ui/src/remotes/wizard_page_connect.rs > index d05dab2..e7c5710 100644 > --- a/ui/src/remotes/wizard_page_connect.rs > +++ b/ui/src/remotes/wizard_page_connect.rs > @@ -90,11 +90,9 @@ impl PdmWizardPageConnect { > .with_child(Container::new().with_child(tr!( > "The certificate of the remote server is not trusted." > ))) > - .with_child( > - Container::new().with_child(tr!( > - "Do you want to trust it by saving it's fingerprint?" > - )), > - ) > + .with_child(Container::new().with_child(tr!( > + "Do you want to trust the certificate and save its fingerprint?" > + ))) > .with_child( > KVGrid::new() > .class(FlexFit) Applied, thank you! I think three individual commits as a single patch series for this could have been nicer (especially since Shannon has posted a similar patch for the "Save Fingerprint" string), but this is just a matter of preference, no biggie. I picked your fix over Shannon's since it a bit more clear IMO and also gives translators more context. _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel