Show More
@@ -100,6 +100,7 b' i18n/hg.pot: $(PYTHON_FILES) mercurial/h' | |||||
100 | --copyright-holder "Matt Mackall <mpm@selenic.com> and others" \ |
|
100 | --copyright-holder "Matt Mackall <mpm@selenic.com> and others" \ | |
101 | --from-code ISO-8859-1 --join --sort-by-file \ |
|
101 | --from-code ISO-8859-1 --join --sort-by-file \ | |
102 | -d hg -p i18n -o hg.pot |
|
102 | -d hg -p i18n -o hg.pot | |
|
103 | $(PYTHON) i18n/posplit i18n/hg.pot | |||
103 |
|
104 | |||
104 | %.po: i18n/hg.pot |
|
105 | %.po: i18n/hg.pot | |
105 | msgmerge --no-location --update $@ $^ |
|
106 | msgmerge --no-location --update $@ $^ |
@@ -36,7 +36,7 b' def gettext(message):' | |||||
36 | if message is None: |
|
36 | if message is None: | |
37 | return message |
|
37 | return message | |
38 |
|
38 | |||
39 | u = t.ugettext(message) |
|
39 | u = u'\n\n'.join([t.ugettext(m) for m in message.split('\n\n')]) | |
40 | try: |
|
40 | try: | |
41 | # encoding.tolocal cannot be used since it will first try to |
|
41 | # encoding.tolocal cannot be used since it will first try to | |
42 | # decode the Unicode string. Calling u.decode(enc) really |
|
42 | # decode the Unicode string. Calling u.decode(enc) really |
General Comments 0
You need to be logged in to leave comments.
Login now