Merge branch 'defaultlangs' into 'master'

The default languages from Mailman 2.1 have been ported over.

Given by Aurélien Bompard.

https://code.launchpad.net/~abompard/mailman/default_languages/+merge/216401

See merge request !8

6 files changed, 230 insertions, 14 deletions

diff --git a/src/mailman/app/tests/test_templates.py b/src/mailman/app/tests/test_templates.py
index 7aab8f1f9..33b728325 100644
--- a/src/mailman/app/tests/test_templates.py
+++ b/src/mailman/app/tests/test_templates.py
@@ -29,7 +29,6 @@ import unittest
 
 from mailman.app.lifecycle import create_list
 from mailman.config import config
-from mailman.interfaces.languages import ILanguageManager
 from mailman.interfaces.templates import ITemplateLoader
 from mailman.testing.layers import ConfigLayer
 from urllib.error import URLError
@@ -54,7 +53,6 @@ class TestTemplateLoader(unittest.TestCase):
         with open(os.path.join(path, 'demo.txt'), 'w') as fp:
             print('Test content', end='', file=fp)
         self._loader = getUtility(ITemplateLoader)
-        getUtility(ILanguageManager).add('it', 'utf-8', 'Italian')
         self._mlist = create_list('test@example.com')
 
     def tearDown(self):
diff --git a/src/mailman/config/schema.cfg b/src/mailman/config/schema.cfg
index f8c3a117e..af13beb52 100644
--- a/src/mailman/config/schema.cfg
+++ b/src/mailman/config/schema.cfg
@@ -341,6 +341,194 @@ charset: us-ascii
 # Whether the language is enabled or not.
 enabled: yes
 
+# Language charsets as imported from Mailman 2.1 defaults
+# Ref: http://www.lingoes.net/en/translator/langcode.htm
+[language.ar]
+description: Arabic
+charset: utf-8
+enabled: yes
+
+[language.ast]
+description: Asturian
+charset: iso-8859-1
+enabled: yes
+
+[language.ca]
+description: Catalan
+charset: utf-8
+enabled: yes
+
+[language.cs]
+description: Czech
+charset: iso-8859-2
+enabled: yes
+
+[language.da]
+description: Danish
+charset: iso-8859-1
+enabled: yes
+
+[language.de]
+description: German
+charset: iso-8859-1
+enabled: yes
+
+[language.el]
+description: Greek
+charset: iso-8859-7
+enabled: yes
+
+[language.es]
+description: Spanish
+charset: iso-8859-1
+enabled: yes
+
+[language.et]
+description: Estonian
+charset: iso-8859-15
+enabled: yes
+
+[language.eu]
+# Basque
+description: Euskara
+charset: iso-8859-15
+enabled: yes
+
+[language.fi]
+description: Finnish
+charset: iso-8859-1
+enabled: yes
+
+[language.fr]
+description: French
+charset: iso-8859-1
+enabled: yes
+
+[language.gl]
+description: Galician
+charset: utf-8
+enabled: yes
+
+[language.he]
+description: Hebrew
+charset: utf-8
+enabled: yes
+
+[language.hr]
+description: Croatian
+charset: iso-8859-2
+enabled: yes
+
+[language.hu]
+description: Hungarian
+charset: iso-8859-2
+enabled: yes
+
+[language.ia]
+description: Interlingua
+charset: iso-8859-15
+enabled: yes
+
+[language.it]
+description: Italian
+charset: iso-8859-1
+enabled: yes
+
+[language.ja]
+description: Japanese
+charset: euc-jp
+enabled: yes
+
+[language.ko]
+description: Korean
+charset: euc-kr
+enabled: yes
+
+[language.lt]
+description: Lithuanian
+charset: iso-8859-13
+enabled: yes
+
+[language.nl]
+description: Dutch
+charset: iso-8859-1
+enabled: yes
+
+[language.no]
+description: Norwegian
+charset: iso-8859-1
+enabled: yes
+
+[language.pl]
+description: Polish
+charset: iso-8859-2
+enabled: yes
+
+[language.pt]
+description: Protuguese
+charset: iso-8859-1
+enabled: yes
+
+[language.pt_BR]
+description: Protuguese (Brazil)
+charset: iso-8859-1
+enabled: yes
+
+[language.ro]
+description: Romanian
+charset: iso-8859-2
+enabled: yes
+
+[language.ru]
+description: Russian
+charset: koi8-r
+enabled: yes
+
+[language.sk]
+description: Slovak
+charset: utf-8
+enabled: yes
+
+[language.sl]
+description: Slovenian
+charset: iso-8859-2
+enabled: yes
+
+[language.sr]
+description: Serbian
+charset: utf-8
+enabled: yes
+
+[language.sv]
+description: Swedish
+charset: iso-8859-1
+enabled: yes
+
+[language.tr]
+description: Turkish
+charset: iso-8859-9
+enabled: yes
+
+[language.uk]
+description: Ukrainian
+charset: utf-8
+enabled: yes
+
+[language.vi]
+description: Vietnamese
+charset: utf-8
+enabled: yes
+
+[language.zh_CN]
+description: Chinese
+charset: utf-8
+enabled: yes
+
+[language.zh_TW]
+description: Chinese (Taiwan)
+charset: utf-8
+enabled: yes
+
 
 [antispam]
 # This section defines basic antispam detection settings.
diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst
index 8ea80633d..95663d5ee 100644
--- a/src/mailman/docs/NEWS.rst
+++ b/src/mailman/docs/NEWS.rst
@@ -17,6 +17,11 @@ Bugs
  * When the mailing list's `admin_notify_mchanges` is True, the list owners
    now get the subscription notification.  (Closes: #1)
 
+Configuration
+-------------
+ * The default languages from Mailman 2.1 have been ported over.  Given by
+   Aurélien Bompard.
+
 
 3.0.0 -- "Show Don't Tell"
 ==========================
diff --git a/src/mailman/model/docs/users.rst b/src/mailman/model/docs/users.rst
index 0d6a0f368..ed532fda7 100644
--- a/src/mailman/model/docs/users.rst
+++ b/src/mailman/model/docs/users.rst
@@ -223,11 +223,6 @@ Users have preferences, but these preferences have no default settings.
 
 Some of these preferences are booleans and they can be set to ``True`` or
 ``False``.
-::
-
-    >>> from mailman.interfaces.languages import ILanguageManager
-    >>> getUtility(ILanguageManager).add('it', 'iso-8859-1', 'Italian')
-    <Language [it] Italian>
 
     >>> from mailman.core.constants import DeliveryMode
     >>> prefs = user_1.preferences
diff --git a/src/mailman/rest/tests/test_systemconf.py b/src/mailman/rest/tests/test_systemconf.py
index d7d0fe9a2..b8f14125b 100644
--- a/src/mailman/rest/tests/test_systemconf.py
+++ b/src/mailman/rest/tests/test_systemconf.py
@@ -104,9 +104,44 @@ class TestSystemConfiguration(unittest.TestCase):
             'database',
             'devmode',
             'digests',
+            'language.ar',
+            'language.ast',
+            'language.ca',
+            'language.cs',
+            'language.da',
+            'language.de',
+            'language.el',
             'language.en',
+            'language.es',
+            'language.et',
+            'language.eu',
+            'language.fi',
             'language.fr',
+            'language.gl',
+            'language.he',
+            'language.hr',
+            'language.hu',
+            'language.ia',
+            'language.it',
             'language.ja',
+            'language.ko',
+            'language.lt',
+            'language.nl',
+            'language.no',
+            'language.pl',
+            'language.pt',
+            'language.pt_BR',
+            'language.ro',
+            'language.ru',
+            'language.sk',
+            'language.sl',
+            'language.sr',
+            'language.sv',
+            'language.tr',
+            'language.uk',
+            'language.vi',
+            'language.zh_CN',
+            'language.zh_TW',
             'logging.archiver',
             'logging.bounce',
             'logging.config',
diff --git a/src/mailman/utilities/tests/test_templates.py b/src/mailman/utilities/tests/test_templates.py
index cbb803e26..3b40cb716 100644
--- a/src/mailman/utilities/tests/test_templates.py
+++ b/src/mailman/utilities/tests/test_templates.py
@@ -46,22 +46,17 @@ class TestSearchOrder(unittest.TestCase):
 
     def setUp(self):
         self.var_dir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, self.var_dir)
         config.push('no template dir', """\
         [mailman]
         default_language: fr
         [paths.testing]
         var_dir: {0}
         """.format(self.var_dir))
-        language_manager = getUtility(ILanguageManager)
-        language_manager.add('de', 'utf-8', 'German')
-        language_manager.add('it', 'utf-8', 'Italian')
+        self.addCleanup(config.pop, 'no template dir')
         self.mlist = create_list('l@example.com')
         self.mlist.preferred_language = 'de'
 
-    def tearDown(self):
-        config.pop('no template dir')
-        shutil.rmtree(self.var_dir)
-
     def _stripped_search_order(self, template_file,
                                mailing_list=None, language=None):
         # Return the search path order for a given template, possibly using