Merge lp:~widelands-dev/widelands/bug-1828355-windows-localedir into lp:widelands

Proposed by GunChleoc
Status: Work in progress
Proposed branch: lp:~widelands-dev/widelands/bug-1828355-windows-localedir
Merge into: lp:widelands
Diff against target: 12 lines (+1/-1)
1 file modified
src/wlapplication.cc (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1828355-windows-localedir
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+367938@code.launchpad.net

Commit message

Fix localedir for Windows.

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

Continuous integration builds have changed state:

Travis build 5067. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/537428233.
Appveyor build 4847. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1828355_windows_localedir-4847.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5182. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/544759262.
Appveyor build 4962. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1828355_windows_localedir-4962.

9126. By GunChleoc

Merged trunk.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5238. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/549847862.
Appveyor build 5017. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1828355_windows_localedir-5017.

9127. By kaputtnik

merged trunk

9128. By GunChleoc

Merged trunk.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Unmerged revisions

9128. By GunChleoc

Merged trunk.

9127. By kaputtnik

merged trunk

9126. By GunChleoc

Merged trunk.

9125. By GunChleoc

Fix localedir for Windows.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/wlapplication.cc'
2--- src/wlapplication.cc 2019-09-07 16:54:19 +0000
3+++ src/wlapplication.cc 2019-09-08 04:04:20 +0000
4@@ -867,7 +867,7 @@
5 // Initialize locale and grab "widelands" textdomain
6 i18n::init_locale();
7
8- i18n::set_localedir(datadir_ + "/locale");
9+ i18n::set_localedir(g_fs->canonicalize_name(datadir_ + "/locale"));
10 i18n::grab_textdomain("widelands");
11
12 // Set locale corresponding to selected language

Subscribers

People subscribed via source and target branches

to status/vote changes: