summaryrefslogtreecommitdiff
path: root/src/mailman/Utils.py
diff options
context:
space:
mode:
authorBarry Warsaw2009-12-10 22:32:25 -0500
committerBarry Warsaw2009-12-10 22:32:25 -0500
commit8938d65327611dded72c7876ffe52e4d4d12ce76 (patch)
tree7e2d5c354dd53f1d3f8c42b4a11a9b58b2c2fcb1 /src/mailman/Utils.py
parentfbc81f61609ce0504245934d9bed0690fbd331a7 (diff)
downloadmailman-8938d65327611dded72c7876ffe52e4d4d12ce76.tar.gz
mailman-8938d65327611dded72c7876ffe52e4d4d12ce76.tar.zst
mailman-8938d65327611dded72c7876ffe52e4d4d12ce76.zip
Diffstat (limited to 'src/mailman/Utils.py')
-rw-r--r--src/mailman/Utils.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mailman/Utils.py b/src/mailman/Utils.py
index bde703cf4..2ea22cee4 100644
--- a/src/mailman/Utils.py
+++ b/src/mailman/Utils.py
@@ -44,6 +44,7 @@ from email.errors import HeaderParseError
from email.header import decode_header, make_header
from lazr.config import as_boolean
from string import ascii_letters, digits, whitespace
+from zope.component import getUtility
import mailman.templates
@@ -51,6 +52,7 @@ from mailman import passwords
from mailman.config import config
from mailman.core import errors
from mailman.core.i18n import _
+from mailman.interfaces.languages import ILanguageManager
from mailman.utilities.string import expand
@@ -406,7 +408,7 @@ def findtext(templatefile, raw_dict=None, raw=False, lang=None, mlist=None):
else:
template = fp.read()
fp.close()
- charset = config.languages[lang].charset
+ charset = getUtility(ILanguageManager)[lang].charset
template = unicode(template, charset, 'replace')
text = template
if raw_dict is not None:
@@ -431,7 +433,7 @@ def uncanonstr(s, lang=None):
if lang is None:
charset = 'us-ascii'
else:
- charset = config.languages[lang].charset
+ charset = getUtility(ILanguageManager)[lang].charset
# See if the string contains characters only in the desired character
# set. If so, return it unchanged, except for coercing it to a byte
# string.