widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1828355-windows-localedir into lp:widelands.

Commit message:
Fix localedir for Windows.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1828355 in widelands: "Problem with --homedir command line option in Windows"
  https://bugs.launchpad.net/widelands/+bug/1828355

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1828355-windows-localedir/+merge/367938
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1828355-windows-localedir into lp:widelands.

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2019-05-12 15:09:44 +0000
+++ src/wlapplication.cc	2019-05-26 11:48:48 +0000
@@ -863,7 +863,7 @@
 	// Initialize locale and grab "widelands" textdomain
 	i18n::init_locale();
 
-	i18n::set_localedir(datadir_ + "/locale");
+	i18n::set_localedir(g_fs->canonicalize_name(datadir_ + "/locale"));
 	i18n::grab_textdomain("widelands");
 
 	// Set locale corresponding to selected language