[Pkg-mailman-hackers] Pkg-mailman commit - rev 354 - trunk/debian

[Thijs Kinkhorst]

Author: thijs
Date: 2006-09-18 13:19:03 +0000 (Mon, 18 Sep 2006)
New Revision: 354

Modified:
   trunk/debian/changelog
   trunk/debian/config
   trunk/debian/postinst
   trunk/debian/templates
Log:
* Name languages together with their ISO code in the debconf question
  (Closes: #276505).


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-09-17 11:53:02 UTC (rev 353)
+++ trunk/debian/changelog	2006-09-18 13:19:03 UTC (rev 354)
@@ -12,6 +12,8 @@
   * Only use ucf on purge when it's available.
   * Update debconf templates, eliminates two, changes some, introduces
     new line numbering from debconf-updatepo.
+  * Name languages together with their ISO code in the debconf question
+    (Closes: #276505).
 
   [ Matej Vela ]
   * Rearrange find options in debian/postinst to prevent warnings.
@@ -22,7 +24,7 @@
     Python; Mailman is incompatible with the one in Python 2.4
     (closes: #384016)
 
- --
+ -- Thijs Kinkhorst <thijs at debian.org>  Mon, 18 Sep 2006 15:16:16 +0200
 
 mailman (1:2.1.8-2) unstable; urgency=low
 

Modified: trunk/debian/config
===================================================================
--- trunk/debian/config	2006-09-17 11:53:02 UTC (rev 353)
+++ trunk/debian/config	2006-09-18 13:19:03 UTC (rev 354)
@@ -64,7 +64,7 @@
   # Install only languages selected by the administrator
   # forcing used languages to be always available.
   db_get mailman/site_languages
-  site_languages="$(echo $RET | sed -e 's/, */ /g')"
+  site_languages="$(echo $RET | sed -e 's/, */ /g' | sed -r 's/ \([^\)]*\)//g')"
   need_languages="${site_languages}"
   for lang in ${used_languages} ; do
     if echo " ${site_languages} " | grep -v -q " ${lang} " ; then

Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst	2006-09-17 11:53:02 UTC (rev 353)
+++ trunk/debian/postinst	2006-09-18 13:19:03 UTC (rev 354)
@@ -30,7 +30,7 @@
     # Install only languages selected by the administrator
     # forcing used languages to be always available.
     db_get mailman/site_languages
-    site_languages="$(echo $RET | sed -e 's/, */ /g')"
+    site_languages="$(echo $RET | sed -e 's/, */ /g' | sed -r 's/ \([^\)]*\)//g')"
     need_languages="${site_languages}"
     db_get  mailman/used_languages
     db_fset mailman/used_languages seen true

Modified: trunk/debian/templates
===================================================================
--- trunk/debian/templates	2006-09-17 11:53:02 UTC (rev 353)
+++ trunk/debian/templates	2006-09-18 13:19:03 UTC (rev 354)
@@ -2,13 +2,13 @@
 # $Id$
 Template: mailman/site_languages
 Type: multiselect
-__Choices: big5, ca, cs, da, de, en, es, et, eu, fi, fr, hr, hu, it, ja, ko, lt, nl, no, pl, pt, pt_BR, ro, ru, sl, sr, sv, uk
+__Choices: big5 (Chinese big5), ca (Catalan), cs (Czech), da (Danish), de (German), en (English), es (Spanish), et (Estonian), eu (Basque), fi (Finnish), fr (French), hr (Croatian), hu (Hungarian), it (Italian), ja (Japanese), ko (Korean), lt (Lithuanian), nl (Dutch), no (Norwegian), pl (Polish), pt (Portuguese), pt_BR (Brasilian Portuguese), ro (Romanian), ru (Russian), sl (Slovenian), sr (Serbian), sv (Swedish), uk (Ukrainian)
 #  You must NOT translate this string, but you can change its value.
 #  The comment between brackets is used to distinguish this msgid
 #  from the one in the Choices list; you do not have to worry about
 #  them, and have to simply choose a msgstr among the English values
-#  listed in the Choices field above, e.g. msgstr "nl".
-_Default: en [ default language ]
+#  listed in the Choices field above, e.g. msgstr "nl (Dutch)".
+_DefaultChoice: en (English)[ default language ]
 _Description: Languages to support:
  For each supported language, Mailman stores default language
  specific texts in /etc/mailman/LANG/ giving them conffile like