History: Translation branching strategy
Preview of version: 32
The policy is that translations are now no exception most of the time, changes are done in trunk and can be backported if desired (although backports still don't need to be fixes).
During the semi-automatic merging period (ex.: from pre 7.x to 7.1), there is no guarantee that changes on 7.x will be merged to trunk. Changes should be merged if there are no conflicts, but otherwise may be ignored. People should commit to trunk and backport to 7.x. If not, people who commit to 7.x are responsible to make sure their changes are properly merged to trunk in the next semi-automatic merge.
If someone is willing to handle merges for some languages, please speak up and the policy may be changed to one favoring more contributions.
How to merge language files
To merge language files from different branches you should use doc/devtools/mergelang.php
script.
Say you want to update 7.x with some translations you did on trunk to the Brazilian Portuguese (pt-br) file.
The first think you have to do is make sure that language.php file in 7.x is updated. Running get_strings.php from within your branch folder will get new string that have been added to Tiki:
php get_strings.php lang=pt-br
And than mergelang.php:
php doc/devtools/mergelang.php pathToTikiTrunk pathToTiki7x lang=pt-br
Where pathToTikiTrunk is the path to trunk root directory and pathToTiki7x is the path to 7.x root directory. lang can be a single language code or a list of language codes separated by commas. This param is optional and if you omit all language files will be updated.
For each English string that this script find in both files, it will replace the translation in the 7.x version with the translation from trunk version (even if the string is untranslated in 7.x).
i18n.tiki.org
i18n.tiki.org will always use trunk (the next version of Tiki in development). Periodically (every one or two weeks) Rodrigo exports the translations done there to the SVN repository (on trunk). Before exporting the translation in i18n.tiki.org from the database, he updates the language.php files, so no translation should be lost in this process.
Discussion
[+]Related
History
| Information | Version | |||||
|---|---|---|---|---|---|---|
| gezza | 35 | |||||
| Marc Laporte So we can bookmark to specific sections | 34 | |||||
| Marc Laporte | 33 | |||||
| Rodrigo Primo | 32 | |||||
| Bernard Sfez / Tiki Specialist | 31 | |||||
| Rodrigo Primo updating information about how to merge translations | 30 | |||||
| Marc Laporte from dev list | 29 | |||||
| Rodrigo Primo | 28 | |||||
| Rodrigo Primo | 27 | |||||
| Rodrigo Primo how to merge language files | 26 | |||||
| Rodrigo Primo moving current policy to the top of the page | 25 | |||||
| Marc Laporte | 24 | |||||
| Philippe Cloutier | 23 | |||||
| Philippe Cloutier disambiguate policy on semi-automatic merging period following discussion with Rodrigo and Sylvie | 22 | |||||
| Marc Laporte | 21 | |||||
| Marc Laporte | 20 | |||||
| Marc Laporte | 19 | |||||
| Philippe Cloutier add solutions for mods issue | 18 | |||||
| Rodrigo Primo moving the new policy to the beginning of the page | 17 | |||||
| Xavier de Pedro | 16 | |||||
| Philippe Cloutier revamp and announce new policy following discussion between Sylvie, Rodrigo and me in TikiFestBoston7 | 15 | |||||
| Philippe Cloutier | 14 | |||||
| Philippe Cloutier "Translate to stable branch, no merge up" is not an option | 13 | |||||
| Torsten Fabricius sorry, preview is not working | 12 | |||||
| Torsten Fabricius | 11 | |||||