widelands-dev team mailing list archive

[David Allwicher <aber@xxxxxxxxxxxxxxx>]

David Allwicher has proposed merging lp:~aber/widelands/bug752436 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~aber/widelands/bug752436/+merge/57581

This will work for Windows and OS X and compile.sh (-DWL_PORTABLE=true), because in general INSTALL_LOCALEDIR == "locale"

This fix will break in all situations, where you move the localedir away from datadir/locale or rename "locale".
-- 
https://code.launchpad.net/~aber/widelands/bug752436/+merge/57581
Your team Widelands Developers is requested to review the proposed merge of lp:~aber/widelands/bug752436 into lp:widelands.

=== modified file 'src/ui_fsmenu/options.cc'
--- src/ui_fsmenu/options.cc	2011-02-18 14:38:56 +0000
+++ src/ui_fsmenu/options.cc	2011-04-13 20:08:33 +0000
@@ -297,7 +297,7 @@
 
 	filenameset_t files;
 	Section * s = &g_options.pull_section("global");
-	g_fs->FindFiles(s->get_string("localedir", INSTALL_LOCALEDIR), "*", &files);
+	g_fs->FindFiles(s->get_string("localedir", "locale"), "*", &files);
 	Profile ln("txts/languages");
 	s = &ln.pull_section("languages");
 	bool own_selected = "" == opt.language || "en" == opt.language;