widelands

Merge lp:~qcumber-some/widelands/fix-locale-on-linux into lp:widelands

  1. fix-locale-on-linux
  2. Merge into trunk
Proposed by Jens Beyer
Status: Merged
Merged at revision: 5432
Proposed branch: lp:~qcumber-some/widelands/fix-locale-on-linux
Merge into: lp:widelands
Diff against target: 12 lines (+1/-1)
1 file modified
src/i18n.cc (+1/-1)
To merge this branch: bzr merge lp:~qcumber-some/widelands/fix-locale-on-linux
Reviewer Review Type Date Requested Status
Nasenbaer Approve
SirVer Approve
Review via email: mp+27947@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

does no harm on mac os x on my system

review: Approve
Revision history for this message
Nasenbaer (nasenbaer) wrote :

seems to work fine for me as well.

review: Approve
Revision history for this message
SirVer (sirver) wrote :

I thought this was already merged, but I realized it wasn't. I finally merged it today. All fine and dandy with that?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/i18n.cc'
2--- src/i18n.cc 2010-06-05 17:22:32 +0000
3+++ src/i18n.cc 2010-06-18 16:35:40 +0000
4@@ -139,7 +139,7 @@
5 lang = l;
6 /* Than set the variables */
7 setenv ("LANG", lang.c_str(), 1);
8- setenv ("LANGUAGE", (lang + ":" + lang.substr(0, 2)).c_str(), 1);
9+ setenv ("LANGUAGE", lang.c_str(), 1);
10 log
11 ("LANG %s, LANGUAGE %s\n",
12 lang.c_str(),

Subscribers

People subscribed via source and target branches

to status/vote changes: