Mercurial > p > roundup > code
diff roundup/cgi/TranslationService.py @ 5416:56c9bcdea47f
Python 3 preparation: unicode.
This patch introduces roundup/anypy/strings.py, which has a comment
explaining the string representations generally used and common
functions to handle the required conversions. Places in the code that
explicitly reference the "unicode" type / built-in function are
generally changed to use the new functions (or, in a few places where
those new functions don't seem to fit well, other approaches such as
references to type(u'') or use of the codecs module). This patch does
not generally attempt to address text conversions in any places not
currently referencing the "unicode" type (although
scripts/import_sf.py is made to use binary I/O in places as fixing the
"unicode" reference didn't seem coherent otherwise).
| author | Joseph Myers <jsm@polyomino.org.uk> |
|---|---|
| date | Wed, 25 Jul 2018 09:05:58 +0000 |
| parents | 6e3e4f24c753 |
| children | 214f34e18678 |
line wrap: on
line diff
--- a/roundup/cgi/TranslationService.py Wed Jul 25 00:40:26 2018 +0000 +++ b/roundup/cgi/TranslationService.py Wed Jul 25 09:05:58 2018 +0000 @@ -16,13 +16,12 @@ from roundup import i18n from roundup.cgi.PageTemplates import Expressions, PathIterator, TALES from roundup.cgi.TAL import TALInterpreter +from roundup.anypy.strings import us2u, u2s ### Translation classes class TranslationServiceMixin: - OUTPUT_ENCODING = "utf-8" - def translate(self, domain, msgid, mapping=None, context=None, target_language=None, default=None ): @@ -32,18 +31,15 @@ return _msg def gettext(self, msgid): - if not isinstance(msgid, unicode): - msgid = unicode(msgid, 'utf8') + msgid = us2u(msgid) msgtrans=self.ugettext(msgid) - return msgtrans.encode(self.OUTPUT_ENCODING) + return u2s(msgtrans) def ngettext(self, singular, plural, number): - if not isinstance(singular, unicode): - singular = unicode(singular, 'utf8') - if not isinstance(plural, unicode): - plural = unicode(plural, 'utf8') + singular = us2u(singular) + plural = us2u(plural) msgtrans=self.ungettext(singular, plural, number) - return msgtrans.encode(self.OUTPUT_ENCODING) + return u2s(msgtrans) class TranslationService(TranslationServiceMixin, i18n.RoundupTranslations): pass @@ -55,8 +51,7 @@ return self._fallback.ugettext(message) # Sometimes the untranslatable message is a UTF-8 encoded string # (thanks to PageTemplate's internals). - if not isinstance(message, unicode): - return unicode(message, 'utf8') + message = us2u(message) return message ### TAL patching