Merge lp:~widelands-dev/widelands/bug-1798297-locale-C into lp:widelands
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 8935 | ||||
Proposed branch: | lp:~widelands-dev/widelands/bug-1798297-locale-C | ||||
Merge into: | lp:widelands | ||||
Diff against target: |
35 lines (+16/-5) 1 file modified
src/base/i18n.cc (+16/-5) |
||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands/bug-1798297-locale-C | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Widelands Developers | 2018-11-06 | Pending | |
Review via email:
|
Commit message
Fix fetching of translations when user locale is set to C. If the desired Widelands locale does not exist, try to fall back to en_US.utf8 to make libintl happy.
bunnybot (widelandsofficial) wrote : | # |
bunnybot (widelandsofficial) wrote : | # |
Continuous integration builds have changed state:
Travis build 4235. State: errored. Details: https:/
Appveyor build 4031. State: success. Details: https:/
Arty (artydent) wrote : | # |
Code LGTM, just some minor indentation irregularities (see comments below).
Not tested because I don't have a working Linux system atm.
GunChleoc (gunchleoc) wrote : | # |
I tested this pretty thoroughly on Linux, so it should be fine.
Bunnybot will take care of the indentation.
Thanks for the review! :)
@bunnybot merge
bunnybot (widelandsofficial) wrote : | # |
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.
Travis build 4235. State: errored. Details: https:/
GunChleoc (gunchleoc) wrote : | # |
Transient failure on Travis
@bunnybot merge force
Continuous integration builds have changed state:
Travis build 4193. State: passed. Details: https:/ /travis- ci.org/ widelands/ widelands/ builds/ 452673990. /ci.appveyor. com/project/ widelands- dev/widelands/ build/_ widelands_ dev_widelands_ bug_1798297_ locale_ C-3989.
Appveyor build 3989. State: success. Details: https:/