[pdm-devel] [PATCH proxmox-datacenter-manager] improve translatable strings

[pdm-devel] [PATCH proxmox-datacenter-manager] improve translatable strings

[Maximiliano Sandoval]

 - 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 <m.sandoval@proxmox.com>
---
 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 <a target=\"_blank\" href=\"https://www.proxmox.com\">www.proxmox.com</a> to get
-a list of available options. ",
-    );
+            "At least one remote does not have a valid subscription. Please visit <a target=\"_blank\" href=\"https://www.proxmox.com\">www.proxmox.com</a> 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)
-- 
2.47.2



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel

[pdm-devel] applied: [PATCH proxmox-datacenter-manager] improve translatable strings

[Lukas Wagner]

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 <m.sandoval@proxmox.com>
> ---
>  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 <a target=\"_blank\" href=\"https://www.proxmox.com\">www.proxmox.com</a> to get
> -a list of available options. ",
> -    );
> +            "At least one remote does not have a valid subscription. Please visit <a target=\"_blank\" href=\"https://www.proxmox.com\">www.proxmox.com</a> 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