server: Setup i18n for prompting related parts

Author: bilelmoussaoui

Cargo.lock

@@ -15,6 +15,7 @@ base64 = "0.22"
 caps = "0.5"
 clap.workspace = true
 enumflags2 = "0.7"
+gettext-rs = {version = "0.7", features = ["gettext-system"]}
 hkdf = { version = "0.12", optional = true }
 nix = { version = "0.30", default-features = false, features = ["user"]}
 num = "0.4.0"

server/Cargo.toml

@@ -5,9 +5,12 @@ project(
   meson_version: '>= 0.61.0',
 )
 
+i18n = import('i18n')
+
 is_devel = get_option('profile') == 'development'
 dbus_known_name = 'org.freedesktop.secrets'
 service_name = meson.project_name()
+gettext_package = meson.project_name()
 
 prefix = get_option('prefix')
 datadir = get_option('datadir')
@@ -43,3 +46,4 @@ summary({
 
 subdir('data')
 subdir('src')
+subdir('po')

server/meson.build

@@ -0,0 +1 @@
+src/gnome/prompter.rs

server/po/POTFILES.in

@@ -0,0 +1,5 @@
+i18n.gettext(
+    gettext_package,
+    args: ['--keyword=i18n_f'],
+    preset: 'glib',
+)

server/po/meson.build

@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use gettextrs::gettext;
 use oo7::{Key, ashpd::WindowIdentifierType, dbus::ServiceError};
 use serde::{Deserialize, Serialize};
 use tokio::sync::OnceCell;
@@ -11,6 +12,7 @@ use zbus::zvariant::{
 use super::secret_exchange;
 use crate::{
     error::custom_service_error,
+    i18n::i18n_f,
     prompt::{Prompt, PromptRole},
     service::Service,
 };
@@ -156,16 +158,16 @@ impl Properties {
     fn for_lock(keyring: &str, window_id: Option<&WindowIdentifierType>) -> Self {
         Self {
             title: None,
-            message: Some("Lock Keyring".to_owned()),
-            description: Some(format!("Confirm locking '{keyring}' Keyring")),
+            message: Some(gettext("Lock Keyring")),
+            description: Some(i18n_f("Confirm locking '{}' Keyring", &[keyring])),
             warning: None,
             password_new: None,
             password_strength: None,
             choice_label: None,
             choice_chosen: None,
             caller_window: window_id.map(ToOwned::to_owned),
-            continue_label: Some("Lock".to_owned()),
-            cancel_label: Some("Cancel".to_owned()),
+            continue_label: Some(gettext("Lock")),
+            cancel_label: Some(gettext("Cancel")),
         }
     }
 
@@ -175,37 +177,39 @@ impl Properties {
         window_id: Option<&WindowIdentifierType>,
     ) -> Self {
         Self {
-            title: Some("Unlock Keyring".to_owned()),
-            message: Some("Authentication required".to_owned()),
-            description: Some(format!(
-                "An application wants access to the keyring '{keyring}', but it is locked"
+            title: Some(gettext("Unlock Keyring")),
+            message: Some(gettext("Authentication required")),
+            description: Some(i18n_f(
+                "An application wants access to the keyring '{}', but it is locked",
+                &[keyring],
             )),
             warning: warning.map(ToOwned::to_owned),
             password_new: None,
             password_strength: None,
             choice_label: None,
             choice_chosen: None,
             caller_window: window_id.map(ToOwned::to_owned),
-            continue_label: Some("Unlock".to_owned()),
-            cancel_label: Some("Cancel".to_owned()),
+            continue_label: Some(gettext("Unlock")),
+            cancel_label: Some(gettext("Cancel")),
         }
     }
 
     fn for_create_collection(label: &str, window_id: Option<&WindowIdentifierType>) -> Self {
         Self {
-            title: Some("New Keyring Password".to_owned()),
-            message: Some("Choose password for new keyring".to_owned()),
-            description: Some(format!(
-                "An application wants to create a new keyring called '{label}'. Choose the password you want to use for it."
+            title: Some(gettext("New Keyring Password")),
+            message: Some(gettext("Choose password for new keyring")),
+            description: Some(i18n_f(
+                "An application wants to create a new keyring called '{}'. Choose the password you want to use for it.",
+                &[label],
             )),
             warning: None,
             password_new: Some(true),
             password_strength: None,
             choice_label: None,
             choice_chosen: None,
             caller_window: window_id.map(ToOwned::to_owned),
-            continue_label: Some("Create".to_owned()),
-            cancel_label: Some("Cancel".to_owned()),
+            continue_label: Some(gettext("Create")),
+            cancel_label: Some(gettext("Cancel")),
         }
     }
 }

server/src/gnome/prompter.rs

@@ -0,0 +1,15 @@
+use gettextrs::gettext;
+
+fn freplace(input: String, args: &[&str]) -> String {
+    let mut parts = input.split("{}");
+    let mut output = parts.next().unwrap_or("").to_string();
+    for (p, a) in parts.zip(args.iter()) {
+        output += &(a.to_string() + p);
+    }
+    output
+}
+
+pub(crate) fn i18n_f(format: &str, args: &[&str]) -> String {
+    let s = gettext(format);
+    freplace(s, args)
+}

server/src/i18n.rs

@@ -3,6 +3,7 @@ mod collection;
 mod error;
 #[allow(unused)]
 mod gnome;
+mod i18n;
 mod item;
 mod prompt;
 mod service;