diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2017-01-18 15:49:29 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2017-01-18 15:49:29 +0900 |
| commit | ee5b57e4bc8fdca687cbc04a1338941941f29b1d (patch) | |
| tree | 9a9c2754e7c7d20aef90802c20a8928ba2f9f4d4 /Mailman | |
| parent | 009533eb39a5d7f0562124b8a3d756360be33c57 (diff) | |
| parent | 5bd8d721b205a4b0d6ac3ef02f85353a32c678aa (diff) | |
| download | mailman2-ee5b57e4bc8fdca687cbc04a1338941941f29b1d.tar.gz mailman2-ee5b57e4bc8fdca687cbc04a1338941941f29b1d.tar.xz mailman2-ee5b57e4bc8fdca687cbc04a1338941941f29b1d.zip | |
Merge lp:mailman/2.1 rev 1688
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/i18n.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Mailman/i18n.py b/Mailman/i18n.py index b8b527e0..605d4e76 100644 --- a/Mailman/i18n.py +++ b/Mailman/i18n.py @@ -35,6 +35,8 @@ def _get_ctype_charset(): if not mm_cfg.DISABLE_COMMAND_LOCALE_CSET: _ctype_charset = _get_ctype_charset() +else: + _ctype_charset = None @@ -108,7 +110,7 @@ def _(s, frame=1): def tolocale(s): global _ctype_charset - if isinstance(s, UnicodeType): + if isinstance(s, UnicodeType) or _ctype_charset is None: return s source = _translation.charset () if not source: |