aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mailman/i18n.py4
-rw-r--r--NEWS3
2 files changed, 6 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:
diff --git a/NEWS b/NEWS
index 2e89898e..4e4ac191 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,9 @@ Here is a history of user visible changes to Mailman.
Bug fixes and other patches
+ - Fixed a NameError issue in bin/add_members with
+ DISABLE_COMMAND_LOCALE_CSET = yes. (LP: #1647450)
+
- The CleanseDKIM handler has been removed from OWNER_PIPELINE. It isn't
needed there and has adverse DMARC implications for messages to -owner
of an anonymous list. (LP: #1645901)