37234811a5
Without this patch, the -f param (for the translate script) add the modified line in the po file BUT comment all lines from others files. This patch concat the generated file with the previous one and merge them. This way produce a pretty po file with all our strings :) + Modification in LangInstaller.pm to fix a bug when the -f param was not given. Test plan: 1/ Update your po file : cd misc/translator perl translate update fr-FR git commit -a -m"TMP PO" 2/ Modification on 2 files: ie. catalogue/advsearch.tt:32 <h1>Advanced search Foo</h1> catalogue/issuehistory.tt:38 <th>Patron Bar</th> 3/ Update your po file with only the first file: perl translate update fr-FR -f advsearch.tt 4/ Edit your po file and check that only the foo string is present (or git diff). 5/ Update your po file with only the second file: perl translate update fr-FR -f issuehistory 6/ Edit your po file and check that 2 strings are present (or git diff). 7/ Change the translation for these 2 strings and delete the fuzzy lines. 8/ Install the first file for your language: perl translate install fr-FR -f advsearch.tt 9/ Edit your translated file and verify the string is translated. Check that the issuehistory.tt file is not changed. 10/ Same for issuehistory: perl translate install fr-FR -f issuehistory 11/ stash your modification in your tt files (or reset --hard): git stash 12/ Check in your po file that the 2 strings are commented (git diff). 13/ To finish, install all template files and check that they are replaced correctly: perl translate install fr-FR Signed-off-by: Frédéric Demians <f.demians@tamil.fr> I have squashed the both follow-up patches. Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Galen Charlton <gmc@esilibrary.com> |
||
|---|---|---|
| .. | ||
| po | ||
| LangInstaller.pm | ||
| Makefile | ||
| text-extract.pl | ||
| text-extract2.pl | ||
| tmpl_process3.pl | ||
| TmplTokenizer.pm | ||
| translate | ||
| translator_doc.html | ||
| translator_doc.txt | ||
| VerboseWarnings.pm | ||
| xgettext.pl | ||