Merge lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi into lp:widelands

Proposed by kaputtnik
Status: Merged
Merged at revision: 8960
Proposed branch: lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi
Merge into: lp:widelands
Diff against target: 21 lines (+3/-0)
2 files modified
data/tribes/immovables/berry_bushes/blueberry/init.lua (+2/-0)
utils/buildcat.py (+1/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi
Reviewer Review Type Date Requested Status
hessenfarmer review Approve
Review via email: mp+361703@code.launchpad.net

Commit message

Adapted buildcat.py to get translations for resources, added textdomain to blueberry bushes.

Description of the change

Adapted buildcat.py to get translations for resources, added textdomain to blueberry bushes.

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

Continuous integration builds have changed state:

Travis build 4393. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/478743572.
Appveyor build 4184. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1805155_frisian_bushes_and_resi-4184.

8943. By kaputtnik

merged trunk

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4399. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/478962324.
Appveyor build 4190. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1805155_frisian_bushes_and_resi-4190.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

Changes look good.

Travis error is transient.

@bunnybot merge

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

forgot to approve the branch.

review: Approve (review)
Revision history for this message
bunnybot (widelandsofficial) wrote :

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4399. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/478962324.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

@bunnybot merge force

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/immovables/berry_bushes/blueberry/init.lua'
2--- data/tribes/immovables/berry_bushes/blueberry/init.lua 2018-11-03 11:27:18 +0000
3+++ data/tribes/immovables/berry_bushes/blueberry/init.lua 2019-01-13 08:49:18 +0000
4@@ -1,3 +1,5 @@
5+set_textdomain("tribes")
6+
7 dirname = path.dirname (__file__)
8
9 terrain_affinity = {
10
11=== modified file 'utils/buildcat.py'
12--- utils/buildcat.py 2018-12-13 07:24:01 +0000
13+++ utils/buildcat.py 2019-01-13 08:49:18 +0000
14@@ -84,6 +84,7 @@
15 '../../data/tribes/*/*/*/helptexts.lua',
16 '../../data/tribes/*/*/*/*/helptexts.lua',
17 '../../data/tribes/*/*/*/*/*/helptexts.lua',
18+ '../../data/tribes/*/resi/helptexts/*.lua',
19 ]),
20 ('widelands_editor/widelands_editor', [
21 '../../data/scripting/editor/*.lua',

Subscribers

People subscribed via source and target branches

to status/vote changes: