[gnome-credentials] Fixed i18n issues



commit d7bd9cfb639cbfa3c0779a647fe956a3b62c735d
Author: Marek Cernocky <marek manet cz>
Date:   Wed Aug 30 23:45:32 2017 +0200

    Fixed i18n issues

 data/ui/gpg-add-user-id-dialog.ui  |    2 +-
 data/ui/gpg-edit-user-id-widget.ui |    2 +-
 data/ui/gpg-generator-dialog.ui    |    2 +-
 data/ui/secret-generator-dialog.ui |    2 +-
 src/Makefile.am                    |    1 +
 src/config.vapi                    |    2 ++
 src/gpg-editor.vala                |    3 ++-
 src/gpg-fetcher.vala               |   21 ++++++++++++++++-----
 src/gpg-view-adapter.vala          |   20 ++++++++++++++++----
 src/main.vala                      |    5 +++++
 src/secret-editor.vala             |    2 +-
 src/ssh-editor.vala                |    7 +++++--
 src/window.vala                    |    2 +-
 13 files changed, 53 insertions(+), 18 deletions(-)
---
diff --git a/data/ui/gpg-add-user-id-dialog.ui b/data/ui/gpg-add-user-id-dialog.ui
index 9d244e1..8dd2ce2 100644
--- a/data/ui/gpg-add-user-id-dialog.ui
+++ b/data/ui/gpg-add-user-id-dialog.ui
@@ -44,7 +44,7 @@
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Name</property>
+                <property name="label" translatable="yes" context="user">Name</property>
                 <property name="xalign">1</property>
                 <style>
                   <class name="dim-label"/>
diff --git a/data/ui/gpg-edit-user-id-widget.ui b/data/ui/gpg-edit-user-id-widget.ui
index 93b40ca..96395b4 100644
--- a/data/ui/gpg-edit-user-id-widget.ui
+++ b/data/ui/gpg-edit-user-id-widget.ui
@@ -45,7 +45,7 @@
         <child>
           <object class="GtkLabel">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Name</property>
+            <property name="label" translatable="yes" context="user">Name</property>
             <property name="xalign">1</property>
            <property name="no-show-all">True</property>
             <style>
diff --git a/data/ui/gpg-generator-dialog.ui b/data/ui/gpg-generator-dialog.ui
index 0c633c0..c4260a5 100644
--- a/data/ui/gpg-generator-dialog.ui
+++ b/data/ui/gpg-generator-dialog.ui
@@ -95,7 +95,7 @@
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Name</property>
+                <property name="label" translatable="yes" context="user">Name</property>
                 <property name="xalign">1</property>
                 <style>
                   <class name="dim-label"/>
diff --git a/data/ui/secret-generator-dialog.ui b/data/ui/secret-generator-dialog.ui
index 04ea03b..4313b2b 100644
--- a/data/ui/secret-generator-dialog.ui
+++ b/data/ui/secret-generator-dialog.ui
@@ -40,7 +40,7 @@
               <object class="GtkLabel" id="name_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Name</property>
+                <property name="label" translatable="yes" context="key">Name</property>
                 <property name="xalign">1</property>
                 <style>
                   <class name="dim-label"/>
diff --git a/src/Makefile.am b/src/Makefile.am
index 481ebe8..c8795fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,7 @@ AM_CPPFLAGS =                                 \
        -I$(top_srcdir)/libgd                   \
        -I$(top_srcdir)/gpgme-glib              \
        -I$(top_srcdir)/egg                     \
+       -DLOCALE_DIR=\""$(localedir)"\"         \
        -DGOA_API_IS_SUBJECT_TO_CHANGE=1
 AM_VALAFLAGS =                                 \
        --target-glib=2.38                      \
diff --git a/src/config.vapi b/src/config.vapi
index 35eb23a..d43685f 100644
--- a/src/config.vapi
+++ b/src/config.vapi
@@ -1,5 +1,7 @@
 [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
 namespace Config {
+    public const string LOCALE_DIR;
+    public const string GETTEXT_PACKAGE;
     public const string PACKAGE_NAME;
     public const string PACKAGE_VERSION;
     public const string PACKAGE_DESKTOP_NAME;
diff --git a/src/gpg-editor.vala b/src/gpg-editor.vala
index cd3034e..a7af284 100644
--- a/src/gpg-editor.vala
+++ b/src/gpg-editor.vala
@@ -317,7 +317,8 @@ namespace Credentials {
             key_id_label.label = this._subkey.key_id;
             pubkey_algo_label.label =
                 GpgUtils.format_pubkey_algo (this._subkey.pubkey_algo);
-            length_label.label = _("%u bits").printf (this._subkey.length);
+            length_label.label = 
+                ngettext ("%u bit", "%u bits", this._subkey.length).printf (this._subkey.length);
             fingerprint_label.label =
                 GpgUtils.format_fingerprint (this._subkey.fingerprint);
             status_label.label =
diff --git a/src/gpg-fetcher.vala b/src/gpg-fetcher.vala
index 3fe5a51..a053f62 100644
--- a/src/gpg-fetcher.vala
+++ b/src/gpg-fetcher.vala
@@ -94,7 +94,9 @@ namespace Credentials {
                         var remaining = uids.next.length () - count;
                         if (remaining > 0)
                             secondary_label =
-                                _("%s, and %u more…").printf (secondary_label,
+                                ngettext ("%s, and %u more…",
+                                          "%s, and %u more…",
+                                          remaining).printf (secondary_label,
                                                               remaining);
                         secondary_labels += secondary_label;
                         break;
@@ -251,12 +253,21 @@ namespace Credentials {
                         (obj, res) => {
                             try {
                                 var result = collection.import_items.end (res);
+                                string considered =
+                                    ngettext ("%d key imported", "%d keys imported", 
result.considered).printf (result.considered);
+                                string imported =
+                                    ngettext ("%d new", "%d new", result.imported).printf (result.imported);
+                                string unchanged =
+                                    ngettext ("%d unchanged", "%d unchanged", result.unchanged).printf 
(result.unchanged);
                                 Utils.show_notification (
                                     window,
-                                    _("%d keys imported (%d new, %d unchanged)"),
-                                    result.considered,
-                                    result.imported,
-                                    result.unchanged);
+                                    // TRANSLATORS: first string is number of imported keys,
+                                    // e.g. "5 keys imported"; second is number of new, e.g.
+                                    // "2 new"; third is number of unchanged, e.g. "3 unchanged"
+                                    _("%s (%s, %s)"),
+                                    considered,
+                                    imported,
+                                    unchanged);
                             } catch (GLib.Error e) {
                                 Utils.show_error (window,
                                                   "Couldn't import keys: %s",
diff --git a/src/gpg-view-adapter.vala b/src/gpg-view-adapter.vala
index a5801ef..89389c4 100644
--- a/src/gpg-view-adapter.vala
+++ b/src/gpg-view-adapter.vala
@@ -96,12 +96,24 @@ namespace Credentials {
                                 (obj, res) => {
                                     try {
                                         var result = collection.import_from_bytes.end (res);
+                                        string considered =
+                                            ngettext ("%d key imported",
+                                                      "%d keys imported",
+                                                      result.considered).printf (result.considered);
+                                        string imported =
+                                            ngettext ("%d new",
+                                                      "%d new",
+                                                      result.imported).printf (result.imported);
+                                        string unchanged =
+                                            ngettext ("%d unchanged",
+                                                      "%d unchanged",
+                                                      result.unchanged).printf (result.unchanged);
                                         Utils.show_notification (
                                             transient_for,
-                                            _("%d keys imported (%d new, %d unchanged)"),
-                                            result.considered,
-                                            result.imported,
-                                            result.unchanged);
+                                            _("%s (%s, %s)"),
+                                            considered,
+                                            imported,
+                                            unchanged);
                                     } catch (GLib.Error e) {
                                         Utils.show_error (
                                             transient_for,
diff --git a/src/main.vala b/src/main.vala
index b813284..df7fc2f 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -44,6 +44,11 @@ class Credentials.Application : Gtk.Application
 }
 
 public int main (string[] args) {
+    Intl.setlocale (LocaleCategory.ALL, "");
+    Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.LOCALE_DIR);
+    Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
+    Intl.textdomain (Config.GETTEXT_PACKAGE);
+
     GCrypt.check_version (GCrypt.VERSION);
     GCrypt.control (GCrypt.ControlCommand.DISABLE_SECMEM, 0);
     GCrypt.control (GCrypt.ControlCommand.INITIALIZATION_FINISHED, 0);
diff --git a/src/secret-editor.vala b/src/secret-editor.vala
index af83024..227836c 100644
--- a/src/secret-editor.vala
+++ b/src/secret-editor.vala
@@ -39,7 +39,7 @@ namespace Credentials {
                                          SecretSchema.Attribute attribute,
                                          string value)
         {
-            var label_widget = create_name_label (attribute.label);
+            var label_widget = create_name_label (_(attribute.label));
             label_widget.show ();
             properties_grid.attach_next_to (label_widget, top,
                                             Gtk.PositionType.TOP, 1, 1);
diff --git a/src/ssh-editor.vala b/src/ssh-editor.vala
index a3addc0..a6a9127 100644
--- a/src/ssh-editor.vala
+++ b/src/ssh-editor.vala
@@ -65,7 +65,7 @@ namespace Credentials {
         construct {
             var _item = (SshItem) item;
             var row_index = 0;
-            var label = create_name_label (_("Name"));
+            var label = create_name_label (C_("key", "Name"));
             properties_grid.attach (label, 0, row_index, 1, 1);
             this._comment_entry = new Gtk.Entry ();
             this._comment_entry.set_text (_item.comment);
@@ -81,7 +81,10 @@ namespace Credentials {
 
             label = create_name_label (_("Strength"));
             properties_grid.attach (label, 0, row_index, 1, 1);
-            label = create_value_label (_item.length == 0 ? _("Unknown") : _("%u bits").printf 
(_item.length));
+            label =
+                create_value_label (_item.length == 0 ?
+                                    _("Unknown") :
+                                    ngettext ("%u bit", "%u bits", _item.length).printf (_item.length));
             properties_grid.attach (label, 1, row_index, 1, 1);
             row_index++;
 
diff --git a/src/window.vala b/src/window.vala
index 3624909..b223e23 100644
--- a/src/window.vala
+++ b/src/window.vala
@@ -192,7 +192,7 @@ namespace Credentials {
             var dialog = new Gtk.AboutDialog ();
             dialog.set_authors (authors);
             dialog.set_artists (artists);
-            // TRANSLATORS: put your names here, one name per line.
+            // TRANSLATORS: put your names here, one name per line
             dialog.set_translator_credits (_("translator-credits"));
             dialog.set_program_name (_("Credentials"));
             dialog.set_copyright ("Copyright 2015 Daiki Ueno");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]