LC_DESCRIPTIONS: Rewrite this stanza for clarity. Use add_language()

    to add each language so that it looks the same here as in a user's
    mm_cfg.py file.  Add the French and Japanese entries.

1 files changed, 10 insertions, 5 deletions

diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 81171c020..d350eab97 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -754,15 +754,20 @@ from Version import *
 def _(s):
     return s
 
-LC_DESCRIPTIONS = {'es': (_("Spanish (Spain)"),      'iso-8859-1'),
-                   'it': (_("Italian"),              'iso-8859-1'),
-                   'en': (_("English (USA)"),        'us-ascii'),
-                   }
-del _                                   
+LC_DESCRIPTIONS = {}
 
 def add_language(code, description, charset):
     LC_DESCRIPTIONS[code] = (description, charset)
 
+add_language('en', _('English (USA)'),   'us-ascii')
+add_language('es', _('Spanish (Spain)'), 'iso-8859-1')
+add_language('fr', _('French'),          'iso-8859-1')
+add_language('it', _('Italian'),         'iso-8859-1')
+add_language('ja', _('Japanese'),        'iso-2022-jp')
+
+del _                                   
+
+
 
 # BAW: Another hack to get Python's site-packages directory on the path.  This
 # should go away in favor of distributing required non-standard packages like