[california] Move locale initialization into main.vala: Bug #731231

[Jim Nelson <jnelson src gnome org>]

commit 3a0fc8f44c454743c1770b6a6c2ba96970cbb09f
Author: Jim Nelson <jim yorba org>
Date:   Wed Jun 18 17:26:05 2014 -0700

    Move locale initialization into main.vala: Bug #731231
    
    Need to move locale/gettext initialization into the very beginning of
    main() in order to ensure it's respected throughout the run of the
    application.

 src/application/california-application.vala |    7 -------
 src/application/main.vala                   |    7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/application/california-application.vala b/src/application/california-application.vala
index 6d2405f..49dfe8a 100644
--- a/src/application/california-application.vala
+++ b/src/application/california-application.vala
@@ -158,13 +158,6 @@ public class Application : Gtk.Application {
     public override void startup() {
         base.startup();
         
-        // prep gettext before initialize various units
-        Intl.setlocale(LocaleCategory.ALL, "");
-        Intl.bindtextdomain(GETTEXT_PACKAGE,
-            File.new_for_path(PREFIX).get_child("share").get_child("locale").get_path());
-        Intl.bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-        Intl.textdomain(GETTEXT_PACKAGE);
-        
         // unit initialization
         try {
             Util.init();
diff --git a/src/application/main.vala b/src/application/main.vala
index 61e5a77..93820d5 100644
--- a/src/application/main.vala
+++ b/src/application/main.vala
@@ -5,6 +5,13 @@
  */
 
 int main(string[] args) {
+    // prep gettext and locale before anything else
+    Intl.setlocale(LocaleCategory.ALL, "");
+    Intl.bindtextdomain(GETTEXT_PACKAGE,
+        File.new_for_path(PREFIX).get_child("share").get_child("locale").get_path());
+    Intl.bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+    Intl.textdomain(GETTEXT_PACKAGE);
+    
     return args[1] != "--tests" ? California.Application.instance.run(args) : California.Tests.run(args);
 }