[geary/wip/default-spellcheck-lang: 1/4] Put International package under Util per naming convention.



commit 275c585d375ab525f770b537fa1d66de639efc06
Author: Michael Gratton <mike vee net>
Date:   Tue May 21 20:31:23 2019 +0200

    Put International package under Util per naming convention.

 src/client/application/geary-application.vala | 2 +-
 src/client/application/geary-config.vala      | 2 +-
 src/client/composer/spell-check-popover.vala  | 6 +++---
 src/client/util/util-international.vala       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index 96581ba7..f74369ba 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -407,7 +407,7 @@ public class GearyApplication : Gtk.Application {
 
     public override void startup() {
         Environment.set_application_name(NAME);
-        International.init(GETTEXT_PACKAGE, this.binary);
+        Util.International.init(GETTEXT_PACKAGE, this.binary);
 
         Configuration.init(this.is_installed, GSETTINGS_DIR);
         Geary.Logging.init();
diff --git a/src/client/application/geary-config.vala b/src/client/application/geary-config.vala
index 17fe8550..2dd94f53 100644
--- a/src/client/application/geary-config.vala
+++ b/src/client/application/geary-config.vala
@@ -125,7 +125,7 @@ public class Configuration {
         owned get {
             string[] langs = settings.get_strv(SPELL_CHECK_VISIBLE_LANGUAGES);
             if (langs.length == 0) {
-                langs = International.get_user_preferred_languages();
+                langs = Util.International.get_user_preferred_languages();
             }
             return langs;
         }
diff --git a/src/client/composer/spell-check-popover.vala b/src/client/composer/spell-check-popover.vala
index e83fd4cd..938b5c86 100644
--- a/src/client/composer/spell-check-popover.vala
+++ b/src/client/composer/spell-check-popover.vala
@@ -59,8 +59,8 @@ public class SpellCheckPopover {
 
             Gtk.Box box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 6);
 
-            lang_name = International.language_name_from_locale(lang_code);
-            country_name = International.country_name_from_locale(lang_code);
+            lang_name = Util.International.language_name_from_locale(lang_code);
+            country_name = Util.International.country_name_from_locale(lang_code);
 
             string label_text = lang_name;
             if (country_name != null)
@@ -210,7 +210,7 @@ public class SpellCheckPopover {
 
     private void setup_popover() {
         // We populate the popover with the list of languages that the user wants to see
-        string[] languages = International.get_available_dictionaries();
+        string[] languages = Util.International.get_available_dictionaries();
 
         content = new Gtk.Box(Gtk.Orientation.VERTICAL, 6);
         search_box = new Gtk.SearchEntry();
diff --git a/src/client/util/util-international.vala b/src/client/util/util-international.vala
index 47f3ae48..4f63fbea 100644
--- a/src/client/util/util-international.vala
+++ b/src/client/util/util-international.vala
@@ -9,7 +9,7 @@ extern const string ISO_CODE_639_XML;
 extern const string ISO_CODE_3166_XML;
 public const string TRANSLATABLE = "translatable";
 
-namespace International {
+namespace Util.International {
 
     private GLib.HashTable<string, string> language_names = null;
     private GLib.HashTable<string, string> country_names = null;


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