kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi into lp:widelands.
Commit message: Adapted buildcat.py to get translations for resources, added textdomain to blueberry bushes. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1805155 in widelands: "Frisian bushes not localized" https://bugs.launchpad.net/widelands/+bug/1805155 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi/+merge/361703 Adapted buildcat.py to get translations for resources, added textdomain to blueberry bushes. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1805155_frisian_bushes_and_resi into lp:widelands.
=== modified file 'data/tribes/immovables/berry_bushes/blueberry/init.lua' --- data/tribes/immovables/berry_bushes/blueberry/init.lua 2018-11-03 11:27:18 +0000 +++ data/tribes/immovables/berry_bushes/blueberry/init.lua 2019-01-12 13:19:48 +0000 @@ -1,3 +1,5 @@ +set_textdomain("tribes") + dirname = path.dirname (__file__) terrain_affinity = { === modified file 'utils/buildcat.py' --- utils/buildcat.py 2018-12-13 07:24:01 +0000 +++ utils/buildcat.py 2019-01-12 13:19:48 +0000 @@ -84,6 +84,7 @@ '../../data/tribes/*/*/*/helptexts.lua', '../../data/tribes/*/*/*/*/helptexts.lua', '../../data/tribes/*/*/*/*/*/helptexts.lua', + '../../data/tribes/*/resi/helptexts/*.lua', ]), ('widelands_editor/widelands_editor', [ '../../data/scripting/editor/*.lua',
_______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp