widelands-dev team mailing list archive

["Jens Beyer \(Qcumber-some\)" <Qcumber-some@xxxxxxxxxxxxx>]

Jens Beyer (Qcumber-some) has proposed merging lp:~qcumber-some/widelands/fix-locale-on-linux into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  #563285 Locales are not found if selected, and LANG states non-default (subcategory) name
  https://bugs.launchpad.net/bugs/563285


one line to fix the locale stuff...

should only harm Linux (through #ifdefs)

I guess replaying the patch is easier than merging this branch, but I thought providing a complete branch to download and compile, and propose a merge, would be better to get your attention.
-- 
https://code.launchpad.net/~qcumber-some/widelands/fix-locale-on-linux/+merge/27947
Your team Widelands Developers is requested to review the proposed merge of lp:~qcumber-some/widelands/fix-locale-on-linux into lp:widelands.

=== modified file 'src/i18n.cc'
--- src/i18n.cc	2010-06-05 17:22:32 +0000
+++ src/i18n.cc	2010-06-18 16:35:40 +0000
@@ -139,7 +139,7 @@
 			lang = l;
 	/* Than set the variables */
 	setenv ("LANG",     lang.c_str(), 1);
-	setenv ("LANGUAGE", (lang + ":" + lang.substr(0, 2)).c_str(), 1);
+	setenv ("LANGUAGE", lang.c_str(), 1);
 	log
 		("LANG %s, LANGUAGE %s\n",
 		lang.c_str(),