[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands
kaputtnik has proposed merging
lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into
lp:widelands.
Commit message:
Add an extra key to get a translatable author-value.
Explicit close opened files.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1807701 in widelands: "Extraneous TRANSLATORS comment"
https://bugs.launchpad.net/widelands/+bug/1807701
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1807701_translate_update_authors/+merge/361401
The main change: Add an optional key 'translate' to data/txts/developers.json
and add the translation function (_) to the value(s).
Added two new functions for adding a lua key to a table and apply values as a
lua array automatically if given.
The new functions are only used for the developers, not the translators. Feel
free to use them also for the translators.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into
lp:widelands.
=== modified file 'data/txts/developers.json'
--- data/txts/developers.json 2018-10-12 17:15:47 +
+++ data/txts/developers.json 2019-01-06 09:43:32 +
@@ -18,8 +18,8 @@
"entries":[
{
"subheading": "Graphics",
- "members":[
- "Chuck Wilder (chuckw)"
+ "translate":[
+ "vacant"
]
},
{
@@ -392,7 +392,9 @@
"members":[
"Matt Howe (mdhowe)",
"Samuel Tilly (eldamar)",
- "WorldSavior",
+ "WorldSavior"
+ ],
+ "translate":[
"and many, many more (thank you for everything you've done)"
]
}
=== modified file 'data/txts/developers.lua'
--- data/txts/developers.lua 2018-10-26 05:29:19 +
+++ data/txts/developers.lua 2019-01-06 09:43:32 +
@@ -1,3 +1,3 @@
-- Do not edit this file - it is automatically generated
-- by utils/update_authors.py from developers.json.
-function developers() return {{heading = _"Chieftains",image = "images/players/genstats_player.png",entries = {{members = {"GunChleoc (Since 2016)","Holger Rapp (SirVer) (2001 – 2016)",},},},},{heading = _"Elders",image = "images/players/genstats_player.png",entries = {{subheading = _"Graphics",members = {"Chuck Wilder (chuckw)",},},{subheading = _"Homepage",members = {"Markus Pfitzner (janus)",},},{subheading = _"Sound",members = {"Jan Bruns (solatis)",},},{subheading = _"Tongues",members = {"GunChleoc",},},},},{heading = _"Coders",image = "images/wui/stats/genstats_nrwares.png",entries = {{members = {"Holger Rapp (SirVer)","Nicolai Hähnle (ixprefect)","Florian Bluemel","Florian Falkner (foldrian)","Florian Weber (Bedouin)","Philipp Engelhard","Stefan Boettner","Tron","Martin Quinson","Raul Ferriz","Willem Jan Palenstijn","Josef Spillner","Christof Petig","Erik Sigra (sigra)","Nanne Wams","Surgery","Andrius R. (knutux)","Jari Hautio (jarih)","Peter Schwanemann (Nasenbaer)","Victor Pelt (Dwarik)","Axel Gehlert (dunkelbrauer)","András Eisenberger (Kiscsirke)","Andi","Timo","Hannes","TimoW","Jens Beyer (Qcumber-some)","Andreas Breitschopp (ab-tools)","Joachim Breitner (nomeata)","Nizamov Shawkat","Carl-Philip Hänsch (carli)","Martin Prussak (martin)","David Allwicher (aber)","Nathan Peters (nathanpeters)","Leif Sandstede (lcsand)","Matthias Horne (shevonar)","Borim (borim)","Angelo Locritani (alocritani)","Gabriel Margiani (gamag)","Anthony J. Bentley (anthonyjbentley)","Peter Waller (iri)","Johannes Ebke (sirius-in4matiker)","Andreas Eriksson","Mark Scott","Teppo Mäenpää","Steven De Herdt (stdh)","Charly Ghislain (cghislai)","Tino Miegel (TinoM)","Tibor Bamhor (tiborb95)","GunChleoc","Ferdinand Thiessen (f-thiessen)","Willy Scheibel (willyscheibel)","Martin Schmidt (mars)","Simon Eilting","Alexander Kartzow (daAlx1)","Łukasz Majcher","Paul Mehrer (meitis)","Miroslav Remák (MiroslavR)","Janosch Peters","Klaus Halfmann (Hasi50)","Philipp Klaus Krause (PkK)","Notabilis","Jukka Pakarinen","Evgeny Kapun","ypopezios","Toni Förster (stonerl)","Arty","Benedikt Straub (Nordfriese)",},},},},{heading = _"Graphicians",image = "images/wui/stats/genstats_nrbuildings.png",entries = {{members = {"Albert Jasiowka","Holger Rapp (SirVer)","Marz","Philipp Engelhard","Yannick Warnier","Delia","Florian Neuerburg","Jerome Rosinski","Mats Olsson","Odin Omdal","Wolfgang Weidner","Andreas Baier","Juri Chomé","Toralf Bethke (bithunter32)","Peter Schwanemann (Nasenbaer)","Alexia Death","Repsa Jih","Geoffroy Schmitlin (Trimard)","Benedikt Freisen (Objpaswriter)","Stefano Guidoni (Ilguido)","Samith Sandanayake (samithdisal)","Chuck Wilder (chuckw)","Astuur","Gerrit Familiegrosskopf (kingcreole)","Florian Angermeier (fraang)","DragonAtma","Benedikt Straub (Nordfriese)",},},},},{heading = _"Musicians",image = "images/wui/overlays/workarea123.png",entries = {{members = {"Kristian","MiddleFinger","Valerio Orlandini (Symbiosis)","Barry van Oudtshoorn (barryvan)","Jan Bruns (Solatis)","Nikola Whallon (Saturn)","Joshua O'Leary (Joshun)"
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands has been updated. Description changed to: The main change: Add an optional key 'translate' to data/txts/developers.json and add the translation function (_) to the value(s). Added two new functions for adding a lua key to a table and apply values as a lua array automatically if given. The new functions are only used for the developers, not the translators. Feel free to use them also for the translators. After this change get into trunk, we have to merge the branch for the website before updating the widelands-package on the server: https://code.launchpad.net/~widelands-dev/widelands-website/bug-1807701_string_fixes_website For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1807701_translate_update_authors/+merge/361401 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands has been updated. Description changed to: The main change: Add an optional key 'translate' to data/txts/developers.json and add the translation function (_) to the value(s). Added two new functions for adding a lua key to a table and apply values as a lua array automatically if given. The new functions are only used for the developers, not the translators. Feel free to use them also for the translators. After this change get into trunk, we have to merge the branch for the website before updating the widelands-package on the server: https://code.launchpad.net/~widelands-dev/widelands-website/bug-1807701_string_fixes_website/+merge/361402 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1807701_translate_update_authors/+merge/361401 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands
Continuous integration builds have changed state: Travis build 4386. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/475944438. Appveyor build 4178. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1807701_translate_update_authors-4178. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1807701_translate_update_authors/+merge/361401 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1807701_translate_update_authors/+merge/361401 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1807701_translate_update_authors. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1807701_translate_update_authors into lp:widelands
Review: Approve LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1807701_translate_update_authors/+merge/361401 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1807701_translate_update_authors. ___ 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
