summaryrefslogtreecommitdiff
path: root/Mailman/Cgi
diff options
context:
space:
mode:
Diffstat (limited to 'Mailman/Cgi')
-rw-r--r--Mailman/Cgi/admin.py10
-rw-r--r--Mailman/Cgi/confirm.py4
-rw-r--r--Mailman/Cgi/create.py6
-rw-r--r--Mailman/Cgi/listinfo.py2
-rw-r--r--Mailman/Cgi/options.py4
-rw-r--r--Mailman/Cgi/rmlist.py2
-rw-r--r--Mailman/Cgi/roster.py2
-rw-r--r--Mailman/Cgi/subscribe.py2
8 files changed, 19 insertions, 13 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index cb001317e..fb0ab1a56 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -625,7 +625,8 @@ def get_item_gui_value(mlist, category, kind, varname, params, extra):
values, legend, selected = params
else:
codes = mlist.language_codes
- legend = [Utils.GetLanguageDescr(code) for code in codes]
+ legend = [config.languages.get_language_data(code)[0]
+ for code in codes]
selected = codes.index(mlist.preferred_language)
return SelectOptions(varname, values, legend, selected)
elif kind == config.Topics:
@@ -986,7 +987,8 @@ def membership_options(mlist, subcat, cgidata, doc, form):
# User's preferred language
langpref = mlist.getMemberLanguage(addr)
langs = mlist.language_codes
- langdescs = [_(Utils.GetLanguageDescr(lang)) for lang in langs]
+ langdescs = [_(config.languges.get_language_data(code)[0])
+ for code in langs]
try:
selected = langs.index(langpref)
except ValueError:
@@ -1402,7 +1404,9 @@ def change_options(mlist, category, subcat, cgidata, doc):
newlang = cgidata.getvalue(user+'_language')
oldlang = mlist.getMemberLanguage(user)
- if Utils.IsLanguage(newlang) and newlang <> oldlang:
+ if (newlang not in config.languages.enabled_codes
+ and newlang <> oldlang):
+ # Then
mlist.setMemberLanguage(user, newlang)
moderate = not not cgidata.getvalue(user+'_mod')
diff --git a/Mailman/Cgi/confirm.py b/Mailman/Cgi/confirm.py
index d2bc3b0aa..aee6df46b 100644
--- a/Mailman/Cgi/confirm.py
+++ b/Mailman/Cgi/confirm.py
@@ -286,7 +286,7 @@ def subscription_prompt(mlist, doc, cookie, userdesc):
RadioButtonArray('digests', (_('No'), _('Yes')),
checked=digest, values=(0, 1))])
langs = mlist.language_codes
- values = [_(Utils.GetLanguageDescr(l)) for l in langs]
+ values = [_(config.languages.get_language_data(code)[0]) for code in langs]
try:
selected = langs.index(lang)
except ValueError:
@@ -332,7 +332,7 @@ def subscription_confirm(mlist, doc, cookie, cgidata):
# Some pending values may be overridden in the form. email of
# course is hardcoded. ;)
lang = cgidata.getvalue('language')
- if not Utils.IsLanguage(lang):
+ if lang not in config.languages.enabled_codes:
lang = mlist.preferred_language
i18n.set_language(lang)
doc.set_language(lang)
diff --git a/Mailman/Cgi/create.py b/Mailman/Cgi/create.py
index 0ca51bd65..978f1b9ac 100644
--- a/Mailman/Cgi/create.py
+++ b/Mailman/Cgi/create.py
@@ -361,13 +361,15 @@ def request_creation(doc, cgidata=dummy, errmsg=None):
# invocations.
checked = [0] * len(langs)
checked[langi] = 1
- deflang = _(Utils.GetLanguageDescr(config.DEFAULT_SERVER_LANGUAGE))
+ deflang = _(config.languages.get_language_data(
+ config.DEFAULT_SERVER_LANGUAGE)[0])
ftable.AddRow([Label(_(
"""Initial list of supported languages. <p>Note that if you do not
select at least one initial language, the list will use the server
default language of $deflang""")),
CheckBoxArray('langs',
- [_(Utils.GetLanguageDescr(L)) for L in langs],
+ [_(config.languges.get_language_data(code)[0])
+ for code in langs],
checked=checked,
values=langs)])
ftable.AddCellInfo(ftable.GetCurrentRowIndex(), 0, bgcolor=GREY)
diff --git a/Mailman/Cgi/listinfo.py b/Mailman/Cgi/listinfo.py
index 72ef6bfa9..9861e2496 100644
--- a/Mailman/Cgi/listinfo.py
+++ b/Mailman/Cgi/listinfo.py
@@ -57,7 +57,7 @@ def main():
# See if the user want to see this page in other language
cgidata = cgi.FieldStorage()
language = cgidata.getvalue('language')
- if not Utils.IsLanguage(language):
+ if language not in config.languages.enabled_codes:
language = mlist.preferred_language
i18n.set_language(language)
list_listinfo(mlist, language)
diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py
index e7e7264a1..faa813489 100644
--- a/Mailman/Cgi/options.py
+++ b/Mailman/Cgi/options.py
@@ -88,7 +88,7 @@ def main():
# preference to view the page in, so we should honor that here. If that's
# not available, use the list's default language.
language = cgidata.getvalue('language')
- if not Utils.IsLanguage(language):
+ if language not in config.languages.enabled_codes:
language = mlist.preferred_language
i18n.set_language(language)
doc.set_language(language)
@@ -138,7 +138,7 @@ def main():
# user's stored preferred language, overridden by any form settings for
# their new language preference.
userlang = cgidata.getvalue('language')
- if not Utils.IsLanguage(userlang):
+ if userlang not in config.languages.enabled_codes:
userlang = mlist.getMemberLanguage(user)
doc.set_language(userlang)
i18n.set_language(userlang)
diff --git a/Mailman/Cgi/rmlist.py b/Mailman/Cgi/rmlist.py
index 080d3b492..534d06131 100644
--- a/Mailman/Cgi/rmlist.py
+++ b/Mailman/Cgi/rmlist.py
@@ -141,7 +141,7 @@ def process_request(doc, cgidata, mlist):
problems = 0
listname = mlist.internal_name()
for dirtmpl in REMOVABLES:
- dir = os.path.join(config.VAR_PREFIX, dirtmpl % listname)
+ dir = os.path.join(config.VAR_DIR, dirtmpl % listname)
if os.path.islink(dir):
try:
os.unlink(dir)
diff --git a/Mailman/Cgi/roster.py b/Mailman/Cgi/roster.py
index fdeb83d31..4eb3174cd 100644
--- a/Mailman/Cgi/roster.py
+++ b/Mailman/Cgi/roster.py
@@ -64,7 +64,7 @@ def main():
# messages in form should go in selected language (if any...)
lang = cgidata.getvalue('language')
- if not Utils.IsLanguage(lang):
+ if lang not in config.languages.enabled_codes:
lang = mlist.preferred_language
i18n.set_language(lang)
diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py
index 3d66cac42..512cd3195 100644
--- a/Mailman/Cgi/subscribe.py
+++ b/Mailman/Cgi/subscribe.py
@@ -70,7 +70,7 @@ def main():
# for the results. If not, use the list's preferred language.
cgidata = cgi.FieldStorage()
language = cgidata.getvalue('language')
- if not Utils.IsLanguage(language):
+ if language not in config.languages.enabled_codes:
language = mlist.preferred_language
i18n.set_language(language)
doc.set_language(language)
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2026-01-16 06:01:20 +0000