PR feedback for OpenRCT2#13125 - localisation for RCT2 data picker di…

…alogs; update changelog.txt
keithstellyes · Oct 8, 2020 · 0640a7e · 0640a7e
1 parent 63f0906
commit 0640a7e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/distribution/changelog.txt b/distribution/changelog.txt
@@ -17,6 +17,7 @@
 - Fix: [#13074] Entrance and exit ghosts for mazes not being removed.
 - Fix: [#13083] Dialog for renaming conflicting track design crops text out.
 - Improved: [#13023] Made add_news_item console command last argument, assoc, optional.
+- Fix: [#13125] Support localisation for RollerCoaster Tycoon 2 data picker dialogs
 
 0.3.1 (2020-09-27)
 ------------------------------------------------------------------------

diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp
@@ -361,9 +361,9 @@ namespace OpenRCT2
                 {
                     _localisationService->OpenLanguage(LANGUAGE_ENGLISH_UK);
                 }
-                catch (const std::exception&)
+                catch (const std::exception& eFallback)
                 {
-                    log_fatal("Failed to open fallback language: %s", e.what());
+                    log_fatal("Failed to open fallback language: %s", eFallback.what());
                     return false;
                 }
             }

diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp
@@ -794,8 +794,6 @@ bool config_find_or_browse_install_directory()
         try
         {
             const char* g1DatPath = PATH_SEPARATOR "Data" PATH_SEPARATOR "g1.dat";
-            char cantFindG1Dat[1024];
-
             while (true)
             {
                 auto uiContext = GetContext()->GetUiContext();
@@ -815,8 +813,7 @@ bool config_find_or_browse_install_directory()
                     return true;
                 }
 
-                format_string(cantFindG1Dat, 1024, STR_COULD_NOT_FIND_AT_PATH, &g1DatPath);
-                uiContext->ShowMessageBox(cantFindG1Dat);
+                uiContext->ShowMessageBox(format_string(STR_COULD_NOT_FIND_AT_PATH, &g1DatPath));
             }
         }
         catch (const std::exception& ex)