Merge lp:~futatuki/mailman/i18n-add-whence-to-adminack-templates into lp:mailman/2.1
Status: | Merged |
---|---|
Merged at revision: | 1772 |
Proposed branch: | lp:~futatuki/mailman/i18n-add-whence-to-adminack-templates |
Merge into: | lp:mailman/2.1 |
Diff against target: |
625 lines (+77/-1) 76 files modified
templates/ar/adminsubscribeack.txt (+1/-0) templates/ar/adminunsubscribeack.txt (+1/-0) templates/ast/adminsubscribeack.txt (+1/-0) templates/ast/adminunsubscribeack.txt (+1/-0) templates/ca/adminsubscribeack.txt (+1/-0) templates/ca/adminunsubscribeack.txt (+1/-0) templates/cs/adminsubscribeack.txt (+1/-0) templates/cs/adminunsubscribeack.txt (+1/-0) templates/da/adminsubscribeack.txt (+1/-0) templates/da/adminunsubscribeack.txt (+1/-0) templates/de/adminsubscribeack.txt (+2/-1) templates/de/adminunsubscribeack.txt (+1/-0) templates/el/adminsubscribeack.txt (+1/-0) templates/el/adminunsubscribeack.txt (+1/-0) templates/es/adminsubscribeack.txt (+1/-0) templates/es/adminunsubscribeack.txt (+1/-0) templates/et/adminsubscribeack.txt (+1/-0) templates/et/adminunsubscribeack.txt (+1/-0) templates/eu/adminsubscribeack.txt (+1/-0) templates/eu/adminunsubscribeack.txt (+1/-0) templates/fa/adminsubscribeack.txt (+1/-0) templates/fa/adminunsubscribeack.txt (+1/-0) templates/fi/adminsubscribeack.txt (+1/-0) templates/fi/adminunsubscribeack.txt (+1/-0) templates/fr/adminsubscribeack.txt (+1/-0) templates/fr/adminunsubscribeack.txt (+1/-0) templates/gl/adminsubscribeack.txt (+1/-0) templates/gl/adminunsubscribeack.txt (+1/-0) templates/he/adminsubscribeack.txt (+1/-0) templates/he/adminunsubscribeack.txt (+1/-0) templates/hr/adminsubscribeack.txt (+1/-0) templates/hr/adminunsubscribeack.txt (+1/-0) templates/hu/adminsubscribeack.txt (+1/-0) templates/hu/adminunsubscribeack.txt (+1/-0) templates/ia/adminsubscribeack.txt (+1/-0) templates/ia/adminunsubscribeack.txt (+1/-0) templates/it/adminsubscribeack.txt (+1/-0) templates/it/adminunsubscribeack.txt (+1/-0) templates/ja/adminsubscribeack.txt (+1/-0) templates/ja/adminunsubscribeack.txt (+1/-0) templates/ko/adminsubscribeack.txt (+1/-0) templates/ko/adminunsubscribeack.txt (+1/-0) templates/lt/adminsubscribeack.txt (+1/-0) templates/lt/adminunsubscribeack.txt (+1/-0) templates/nl/adminsubscribeack.txt (+1/-0) templates/nl/adminunsubscribeack.txt (+1/-0) templates/no/adminsubscribeack.txt (+1/-0) templates/no/adminunsubscribeack.txt (+1/-0) templates/pl/adminsubscribeack.txt (+1/-0) templates/pl/adminunsubscribeack.txt (+1/-0) templates/pt/adminsubscribeack.txt (+1/-0) templates/pt/adminunsubscribeack.txt (+1/-0) templates/pt_BR/adminsubscribeack.txt (+1/-0) templates/pt_BR/adminunsubscribeack.txt (+1/-0) templates/ro/adminsubscribeack.txt (+1/-0) templates/ro/adminunsubscribeack.txt (+1/-0) templates/ru/adminsubscribeack.txt (+1/-0) templates/ru/adminunsubscribeack.txt (+1/-0) templates/sk/adminsubscribeack.txt (+1/-0) templates/sk/adminunsubscribeack.txt (+1/-0) templates/sl/adminsubscribeack.txt (+1/-0) templates/sl/adminunsubscribeack.txt (+1/-0) templates/sr/adminsubscribeack.txt (+1/-0) templates/sr/adminunsubscribeack.txt (+1/-0) templates/sv/adminsubscribeack.txt (+1/-0) templates/sv/adminunsubscribeack.txt (+1/-0) templates/tr/adminsubscribeack.txt (+1/-0) templates/tr/adminunsubscribeack.txt (+1/-0) templates/uk/adminsubscribeack.txt (+1/-0) templates/uk/adminunsubscribeack.txt (+1/-0) templates/vi/adminsubscribeack.txt (+1/-0) templates/vi/adminunsubscribeack.txt (+1/-0) templates/zh_CN/adminsubscribeack.txt (+1/-0) templates/zh_CN/adminunsubscribeack.txt (+1/-0) templates/zh_TW/adminsubscribeack.txt (+1/-0) templates/zh_TW/adminunsubscribeack.txt (+1/-0) |
To merge this branch: | bzr merge lp:~futatuki/mailman/i18n-add-whence-to-adminack-templates |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mark Sapiro | Approve | ||
Review via email: mp+347992@code.launchpad.net |
Commit message
Add '%(whence)s' to adminsubscribea
Description of the change
As far as I saw adminsubscribea
So, I did it by using sed and shell script below(in ./templates directory, FreeBSD envirionment):
--- begin ---
#!/bin/sh
LC_CTYPE=C
sed='/usr/bin/sed'
for l in * ; do
if [ -d "${l}" -a ! "$l" = en ] ; then
if [ -f ${l}/adminsubsc
${sed} -I '' -e 's/\(.\)$/\1\
%(whence)s/' ${l}/adminsubsc
fi
if [ -f ${l}/adminunsub
${sed} -I '' -e 's/\(.\)$/\1\
%(whence)s/' ${l}/adminunsub
fi
fi
done
--- end ---
Thank you for your contribution.
This is still somewhat problematic for non-English. The issue is the values of the 'whence' replacement aren't translated. Sometimes the value is a command name like 'bin/add_members' or an IP address which doesn't need translating, but other times it is things like 'admin mass sub', 'admin mass unsub', 'via admin approval', 'via email confirmation' or 'via web confirmation'.
It gets complicated because at the point where those values are defined, the language of the admin notice is not known so they have to be marked but not translated and only translated when they will be inserted in the notice.