Merge lp:~jsauer-deactivatedaccount/zim/translatable-templates into lp:~jaap.karssenberg/zim/pyzim
Proposed by
Jens Sauer
Status: | Merged |
---|---|
Merged at revision: | 824 |
Proposed branch: | lp:~jsauer-deactivatedaccount/zim/translatable-templates |
Merge into: | lp:~jaap.karssenberg/zim/pyzim |
Diff against target: |
155 lines (+29/-19) 6 files modified
data/templates/html/Default.html (+8/-8) data/templates/html/Default_with_index.html (+8/-8) data/templates/wiki/Default.txt (+1/-2) data/templates/wiki/Journal.txt (+1/-1) tools/xgettext.sh (+2/-0) zim/templates/functions.py (+9/-0) |
To merge this branch: | bzr merge lp:~jsauer-deactivatedaccount/zim/translatable-templates |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jaap Karssenberg | Pending | ||
Review via email: mp+286200@code.launchpad.net |
Description of the change
Implement translatable templates
Translatable text can now marked with [% gettext("text") %]
in templates.
Modify the html and wiki templates to use the new feature and
tools/xgettext.sh to extract the strings from the files.
To post a comment you must log in.
Looks good, merged in trunk