From: Ingo Ruhnke <grumbel@gmail.com>
Date: Tue, 12 Aug 2014 09:25:54 +0000 (+0200)
Subject: Changed order of initialisation, so that tinygettext comes sooner, should allow trans... 
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0e9c473dd31a06a0de119740d318c2c84562a6eb;p=supertux.git

Changed order of initialisation, so that tinygettext comes sooner, should allow translating --help messages, fixes #923
---

diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp
index 682b85c57..0ed1ff42a 100644
--- a/src/supertux/main.cpp
+++ b/src/supertux/main.cpp
@@ -56,7 +56,7 @@ extern "C" {
 
 namespace { DrawingContext *context_pointer; }
 
-void 
+void
 Main::init_config()
 {
   g_config = new Config();
@@ -78,7 +78,7 @@ Main::init_tinygettext()
   dictionary_manager->set_charset("UTF-8");
 
   // Config setting "locale" overrides language detection
-  if (g_config->locale != "") 
+  if (g_config->locale != "")
   {
     dictionary_manager->set_language(tinygettext::Language::from_name(g_config->locale));
   } else {
@@ -271,14 +271,14 @@ Main::run(int argc, char** argv)
 {
   int result = 0;
 
-  try 
+  try
   {
     CommandLineArguments args;
-    
+
     // Do this before pre_parse_commandline, because --help now shows the
     // default user data dir.
     init_physfs(argv[0]);
-    
+
     try
     {
       args.parse_args(argc, argv);
@@ -286,10 +286,28 @@ Main::run(int argc, char** argv)
     }
     catch(const std::exception& err)
     {
+      try
+      {
+        init_config();
+        args.merge_into(*g_config);
+        init_tinygettext();
+      }
+      catch(const std::exception& err)
+      {
+        log_fatal << "failed to init config or tinygettext: " << err.what() << std::endl;
+      }
+
       std::cout << "Error: " << err.what() << std::endl;
       return EXIT_FAILURE;
     }
 
+    timelog("config");
+    init_config();
+    args.merge_into(*g_config);
+
+    timelog("tinygettext");
+    init_tinygettext();
+
     switch (args.get_action())
     {
       case CommandLineArguments::PRINT_VERSION:
@@ -315,11 +333,6 @@ Main::run(int argc, char** argv)
     timelog("controller");
     g_input_manager = new InputManager();
 
-    timelog("config");
-    init_config();
-
-    args.merge_into(*g_config);
-
     timelog("commandline");
 
     timelog("video");
@@ -328,12 +341,9 @@ Main::run(int argc, char** argv)
     DrawingContext context(*renderer, *lightmap);
     context_pointer = &context;
     init_video();
-    
+
     timelog("audio");
     init_audio();
-    
-    timelog("tinygettext");
-    init_tinygettext();
 
     Console::instance->init_graphics();
 
@@ -342,7 +352,7 @@ Main::run(int argc, char** argv)
 
     timelog("resources");
     Resources::load_shared();
-    
+
     timelog("addons");
     AddonManager::get_instance().load_addons();
 
@@ -362,7 +372,7 @@ Main::run(int argc, char** argv)
       std::string fileProtocol = "file://";
       std::string::size_type position = dir.find(fileProtocol);
       if(position != std::string::npos) {
-         dir = dir.replace(position, fileProtocol.length(), "");
+        dir = dir.replace(position, fileProtocol.length(), "");
       }
       log_debug << "Adding dir: " << dir << std::endl;
       PHYSFS_addToSearchPath(dir.c_str(), true);