GNU Mailman

Merge lp:~abompard/mailman/default_languages into lp:mailman

  1. default_languages
  2. Merge into 3.0
Proposed by Aurélien Bompard
Status: Merged
Approved by: Barry Warsaw
Approved revision: 7248
Merge reported by: Barry Warsaw
Merged at revision: not available
Proposed branch: lp:~abompard/mailman/default_languages
Merge into: lp:mailman
Diff against target: 252 lines (+191/-8)
5 files modified
src/mailman/app/tests/test_templates.py (+0/-1)
src/mailman/commands/docs/conf.rst (+2/-0)
src/mailman/config/schema.cfg (+189/-0)
src/mailman/model/docs/users.rst (+0/-4)
src/mailman/utilities/tests/test_templates.py (+0/-3)
To merge this branch: bzr merge lp:~abompard/mailman/default_languages
Reviewer Review Type Date Requested Status
Mailman Coders Pending
Review via email: mp+216401@code.launchpad.net

Description of the change

This branch adds the default languages that were defined in Mailman 2.1.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/mailman/app/tests/test_templates.py'
--- src/mailman/app/tests/test_templates.py 2014-04-14 16:14:13 +0000
+++ src/mailman/app/tests/test_templates.py 2014-04-17 21:36:46 +0000
@@ -58,7 +58,6 @@
58 with open(os.path.join(path, 'demo.txt'), 'w') as fp:58 with open(os.path.join(path, 'demo.txt'), 'w') as fp:
59 print('Test content', end='', file=fp)59 print('Test content', end='', file=fp)
60 self._loader = getUtility(ITemplateLoader)60 self._loader = getUtility(ITemplateLoader)
61 getUtility(ILanguageManager).add('it', 'utf-8', 'Italian')
62 self._mlist = create_list('test@example.com')61 self._mlist = create_list('test@example.com')
6362
64 def tearDown(self):63 def tearDown(self):
6564
=== modified file 'src/mailman/commands/docs/conf.rst'
--- src/mailman/commands/docs/conf.rst 2013-09-01 15:08:46 +0000
+++ src/mailman/commands/docs/conf.rst 2014-04-17 21:36:46 +0000
@@ -22,6 +22,8 @@
22command without any options.22command without any options.
2323
24 >>> command.process(FakeArgs)24 >>> command.process(FakeArgs)
25 [language.pt] charset: iso-8859-1
26 ...
25 [logging.archiver] path: mailman.log27 [logging.archiver] path: mailman.log
26 ...28 ...
27 [passwords] password_length: 829 [passwords] password_length: 8
2830
=== modified file 'src/mailman/config/schema.cfg'
--- src/mailman/config/schema.cfg 2014-01-01 14:59:42 +0000
+++ src/mailman/config/schema.cfg 2014-04-17 21:36:46 +0000
@@ -340,6 +340,195 @@
340# Whether the language is enabled or not.340# Whether the language is enabled or not.
341enabled: yes341enabled: yes
342342
343# Language charsets as imported from Mailman 2.1 defaults
344# Ref: http://www.lingoes.net/en/translator/langcode.htm
345
346[language.ar]
347description: Arabic
348charset: utf-8
349enabled: yes
350
351[language.ast]
352description: Asturian
353charset: iso-8859-1
354enabled: yes
355
356[language.ca]
357description: Catalan
358charset: utf-8
359enabled: yes
360
361[language.cs]
362description: Czech
363charset: iso-8859-2
364enabled: yes
365
366[language.da]
367description: Danish
368charset: iso-8859-1
369enabled: yes
370
371[language.de]
372description: German
373charset: iso-8859-1
374enabled: yes
375
376[language.el]
377description: Greek
378charset: iso-8859-7
379enabled: yes
380
381[language.es]
382description: Spanish
383charset: iso-8859-1
384enabled: yes
385
386[language.et]
387description: Estonian
388charset: iso-8859-15
389enabled: yes
390
391[language.eu]
392# Basque
393description: Euskara
394charset: iso-8859-15
395enabled: yes
396
397[language.fi]
398description: Finnish
399charset: iso-8859-1
400enabled: yes
401
402[language.fr]
403description: French
404charset: iso-8859-1
405enabled: yes
406
407[language.gl]
408description: Galician
409charset: utf-8
410enabled: yes
411
412[language.he]
413description: Hebrew
414charset: utf-8
415enabled: yes
416
417[language.hr]
418description: Croatian
419charset: iso-8859-2
420enabled: yes
421
422[language.hu]
423description: Hungarian
424charset: iso-8859-2
425enabled: yes
426
427[language.ia]
428description: Interlingua
429charset: iso-8859-15
430enabled: yes
431
432[language.it]
433description: Italian
434charset: iso-8859-1
435enabled: yes
436
437[language.ja]
438description: Japanese
439charset: euc-jp
440enabled: yes
441
442[language.ko]
443description: Korean
444charset: euc-kr
445enabled: yes
446
447[language.lt]
448description: Lithuanian
449charset: iso-8859-13
450enabled: yes
451
452[language.nl]
453description: Dutch
454charset: iso-8859-1
455enabled: yes
456
457[language.no]
458description: Norwegian
459charset: iso-8859-1
460enabled: yes
461
462[language.pl]
463description: Polish
464charset: iso-8859-2
465enabled: yes
466
467[language.pt]
468description: Protuguese
469charset: iso-8859-1
470enabled: yes
471
472[language.pt_BR]
473description: Protuguese (Brazil)
474charset: iso-8859-1
475enabled: yes
476
477[language.ro]
478description: Romanian
479charset: iso-8859-2
480enabled: yes
481
482[language.ru]
483description: Russian
484charset: koi8-r
485enabled: yes
486
487[language.sk]
488description: Slovak
489charset: utf-8
490enabled: yes
491
492[language.sl]
493description: Slovenian
494charset: iso-8859-2
495enabled: yes
496
497[language.sr]
498description: Serbian
499charset: utf-8
500enabled: yes
501
502[language.sv]
503description: Swedish
504charset: iso-8859-1
505enabled: yes
506
507[language.tr]
508description: Turkish
509charset: iso-8859-9
510enabled: yes
511
512[language.uk]
513description: Ukrainian
514charset: utf-8
515enabled: yes
516
517[language.vi]
518description: Vietnamese
519charset: utf-8
520enabled: yes
521
522[language.zh_CN]
523description: Chinese
524charset: utf-8
525enabled: yes
526
527[language.zh_TW]
528description: Chinese (Taiwan)
529charset: utf-8
530enabled: yes
531
343532
344[antispam]533[antispam]
345# This section defines basic antispam detection settings.534# This section defines basic antispam detection settings.
346535
=== modified file 'src/mailman/model/docs/users.rst'
--- src/mailman/model/docs/users.rst 2013-06-19 02:43:40 +0000
+++ src/mailman/model/docs/users.rst 2014-04-17 21:36:46 +0000
@@ -272,10 +272,6 @@
272``False``.272``False``.
273::273::
274274
275 >>> from mailman.interfaces.languages import ILanguageManager
276 >>> getUtility(ILanguageManager).add('it', 'iso-8859-1', 'Italian')
277 <Language [it] Italian>
278
279 >>> from mailman.core.constants import DeliveryMode275 >>> from mailman.core.constants import DeliveryMode
280 >>> prefs = user_1.preferences276 >>> prefs = user_1.preferences
281 >>> prefs.acknowledge_posts = True277 >>> prefs.acknowledge_posts = True
282278
=== modified file 'src/mailman/utilities/tests/test_templates.py'
--- src/mailman/utilities/tests/test_templates.py 2014-01-01 14:59:42 +0000
+++ src/mailman/utilities/tests/test_templates.py 2014-04-17 21:36:46 +0000
@@ -53,9 +53,6 @@
53 [paths.testing]53 [paths.testing]
54 var_dir: {0}54 var_dir: {0}
55 """.format(self.var_dir))55 """.format(self.var_dir))
56 language_manager = getUtility(ILanguageManager)
57 language_manager.add('de', 'utf-8', 'German')
58 language_manager.add('it', 'utf-8', 'Italian')
59 self.mlist = create_list('l@example.com')56 self.mlist = create_list('l@example.com')
60 self.mlist.preferred_language = 'de'57 self.mlist.preferred_language = 'de'
6158