[Pkg-mailman-hackers] Pkg-mailman commit - rev 794 - in trunk: Mailman Mailman/Logging messages messages/es/LC_MESSAGES messages/hr/LC_MESSAGES messages/ja/LC_MESSAGES messages/nl/LC_MESSAGES templates

[Thijs Kinkhorst]

Author: thijs
Date: 2016-09-13 16:41:02 +0000 (Tue, 13 Sep 2016)
New Revision: 794

Modified:
   trunk/Mailman/Defaults.py.in
   trunk/Mailman/Logging/Logger.py
   trunk/messages/Makefile.in
   trunk/messages/es/LC_MESSAGES/mailman.po
   trunk/messages/hr/LC_MESSAGES/mailman.po
   trunk/messages/ja/LC_MESSAGES/mailman.po
   trunk/messages/nl/LC_MESSAGES/mailman.po
   trunk/templates/Makefile.in
Log:
Revert accidentally imported changes


Modified: trunk/Mailman/Defaults.py.in
===================================================================
--- trunk/Mailman/Defaults.py.in	2016-09-13 16:35:20 UTC (rev 793)
+++ trunk/Mailman/Defaults.py.in	2016-09-13 16:41:02 UTC (rev 794)
@@ -23,6 +23,9 @@
 # mm_cfg.py instead, in the designated area.  See the comments in that file
 # for details.
 
+import sys
+reload(sys)
+sys.setdefaultencoding('utf-8')
 
 import os
 
@@ -450,7 +453,7 @@
 # is used in MIME to refer to a method of converting a sequence of
 # octets into a sequence of characters.  If you change the default
 # charset, you might need to add it to VERBATIM_ENCODING below.
-DEFAULT_CHARSET = None
+DEFAULT_CHARSET = 'utf-8'
 
 # Most character set encodings require special HTML entity characters to be
 # quoted, otherwise they won't look right in the Pipermail archives.  However
@@ -459,7 +462,7 @@
 # encodings where the octet 0x26 does not always represent the & character.
 # This variable contains a list of such characters sets which are not
 # HTML-quoted in the archives.
-VERBATIM_ENCODING = ['iso-2022-jp']
+VERBATIM_ENCODING = ['utf-8', 'iso-2022-jp']
 
 # When the archive is public, should Mailman also make the raw Unix mbox file
 # publically available?
@@ -1721,7 +1724,7 @@
 LC_DESCRIPTIONS = {}
 
 def add_language(code, description, charset, direction='ltr'):
-    LC_DESCRIPTIONS[code] = (description, charset, direction)
+    LC_DESCRIPTIONS[code] = (description, 'utf-8', direction)
 
 add_language('ar',    _('Arabic'),              'utf-8',       'rtl')
 add_language('ast',   _('Asturian'),            'iso-8859-1',  'ltr')

Modified: trunk/Mailman/Logging/Logger.py
===================================================================
--- trunk/Mailman/Logging/Logger.py	2016-09-13 16:35:20 UTC (rev 793)
+++ trunk/Mailman/Logging/Logger.py	2016-09-13 16:41:02 UTC (rev 794)
@@ -28,7 +28,7 @@
 # Set this to the encoding to be used for your log file output.  If set to
 # None, then it uses your system's default encoding.  Otherwise, it must be an
 # encoding string appropriate for codecs.open().
-LOG_ENCODING = 'iso-8859-1'
+LOG_ENCODING = 'utf-8'
 
 
 

Modified: trunk/messages/Makefile.in
===================================================================
--- trunk/messages/Makefile.in	2016-09-13 16:35:20 UTC (rev 793)
+++ trunk/messages/Makefile.in	2016-09-13 16:41:02 UTC (rev 794)
@@ -68,7 +68,7 @@
 
 .SUFFIXES:	.po .mo
 .po.mo:
-	-$(MSGFMT) -o $@ $<
+	-msgconv -t utf-8 $< | tee $<.utf-8 | msgfmt -o $@ -
 
 # Rules
 
@@ -107,7 +107,7 @@
 	    po=$(srcdir)/$$d/LC_MESSAGES/mailman.po; \
 	    mo=$(srcdir)/$$d/LC_MESSAGES/mailman.mo; \
 	    dir=$(DESTDIR)$(prefix)/messages/$$d/LC_MESSAGES; \
-	    $(INSTALL) -m $(FILEMODE) $$po $$dir; \
+	    $(INSTALL) -m $(FILEMODE) $$po.utf-8 $$dir/mailman.po; \
  	    $(INSTALL) -m $(FILEMODE) $$mo $$dir; \
 	done
 
@@ -117,6 +117,7 @@
 
 clean:
 	-rm -f */LC_MESSAGES/mailman.mo
+	-rm -f */LC_MESSAGES/mailman.po.utf-8
 
 fileclean:
 	-rm -f marked.files docstring.files

Modified: trunk/messages/es/LC_MESSAGES/mailman.po
===================================================================
--- trunk/messages/es/LC_MESSAGES/mailman.po	2016-09-13 16:35:20 UTC (rev 793)
+++ trunk/messages/es/LC_MESSAGES/mailman.po	2016-09-13 16:41:02 UTC (rev 794)
@@ -12056,7 +12056,6 @@
 "\n"
 "This script is provided for convenience purposes only.  It isn't supported.\n"
 msgstr ""
-"\n"
 "Reduce el espacio usado en disco de los archivos de pipermail.\n"
 "\n"
 "Sintaxis: %(PROGRAM)s [opciones] fichero ...\n"
@@ -12082,7 +12081,7 @@
 "guión cuando esté satisfecho con los resultados.\n"
 "\n"
 "Este guión se suministra únicamente por motivos de conveniencia. No\n"
-"está soportado."
+"está soportado.\n"
 
 #: bin/remove_members:20
 #, fuzzy
@@ -12226,7 +12225,7 @@
 "\n"
 "Opciones:\n"
 "    -v / --verbose\n"
-"         Muestra que es lo que está haciendo el guión."
+"         Muestra que es lo que está haciendo el guión.\n"
 
 #: bin/reset_pw.py:77
 msgid "Changing passwords for list: %(listname)s"
@@ -12346,7 +12345,7 @@
 "     -h / --help\n"
 "        Muestra este texto y termina.\n"
 "\n"
-"Ejemplo: show_qfiles qfiles/shunt/*.pck"
+"Ejemplo: show_qfiles qfiles/shunt/*.pck\n"
 
 #: bin/sync_members:19
 msgid ""

Modified: trunk/messages/hr/LC_MESSAGES/mailman.po
===================================================================
--- trunk/messages/hr/LC_MESSAGES/mailman.po	2016-09-13 16:35:20 UTC (rev 793)
+++ trunk/messages/hr/LC_MESSAGES/mailman.po	2016-09-13 16:41:02 UTC (rev 794)
@@ -4835,7 +4835,7 @@
 msgid ""
 "Remove message attachments that have a matching content\n"
 "             type."
-msgstr "Ukloni privitke poruka koji se podudaraju s tipovima sadr¾aja.\n"
+msgstr "Ukloni privitke poruka koji se podudaraju s tipovima sadr¾aja."
 
 #: Mailman/Gui/ContentFilter.py:82
 msgid ""

Modified: trunk/messages/ja/LC_MESSAGES/mailman.po
===================================================================
--- trunk/messages/ja/LC_MESSAGES/mailman.po	2016-09-13 16:35:20 UTC (rev 793)
+++ trunk/messages/ja/LC_MESSAGES/mailman.po	2016-09-13 16:41:02 UTC (rev 794)
@@ -2339,7 +2339,7 @@
 "¤¢¤Ê¤¿¤¬Êݸ¤·¤¿¥Ú¡¼¥¸¤Ë¤Ï, ¥æ¡¼¥¶¤ò¥¯¥í¥¹¥µ¥¤¥È¥¹¥¯¥ê¥×¥È¹¶·â¤Ë\n"
 "¤µ¤é¤¹¤è¤¦¤Êµ¿¤ï¤·¤¤ HTML¥³¡¼¥É¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹.¤½¤Î¤¿¤á, Êѹ¹¤ÏµÑ²¼¤·¤Þ¤·"
 "¤¿. ¤â¤·, ¤É¤¦¤·¤Æ¤âÊѹ¹¤¬É¬ÍפǤ¢¤ì¤Ð, \n"
-"Mailman ¥µ¡¼¥Ð¤Ë¥·¥§¥ë¥¢¥¯¥»¥¹¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó.\n"
+"Mailman ¥µ¡¼¥Ð¤Ë¥·¥§¥ë¥¢¥¯¥»¥¹¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó."
 
 #: Mailman/Cgi/edithtml.py:214
 msgid "See "
@@ -5846,7 +5846,7 @@
 "°ìÊý¤Ç¤¢¤ë¥á¡¼¥ë¥ê¡¼¥À¤Ï¤³¤Î¥Ø¥Ã¥À¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤È´üÂԤϤº¤ì¤ÎÆ°ºî¤ò¤¹¤ë.\n"
 "(Î㤨¤Ð, žÁ÷¤·¤¿¤È¤­¤Ë¥¢¥É¥ì¥¹¤¬¶õÇò¤Ë¤Ê¤ë¤È¤«, ¡ÖÁ´°÷¤ËÊÖ¿®¡×¤·¤¿¤È¤­¤Ë\n"
 "¤³¤Î¥¨¥é¡¼ÄÌÃÎ¥¢¥É¥ì¥¹¤Ë¤âÁ÷¿®¤¹¤ë¤È¤«) ½¾¤Ã¤Æ, ¤³¤³¤Ç̵¸ú¤Ë¤Ç¤­¤ë¤è¤¦¤Ë¤·"
-"¤¿.\n"
+"¤¿."
 
 #: Mailman/Gui/General.py:511
 msgid ""
@@ -5883,7 +5883,7 @@
 "¤¿. ¤â¤·, ¤É¤¦¤·¤Æ¤âÊѹ¹¤¬É¬ÍפǤ¢¤ì¤Ð, \n"
 "Mailman ¥µ¡¼¥Ð¤Ë¥·¥§¥ë¥¢¥¯¥»¥¹¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó.\n"
 "Êѹ¹¤Ë¤Ï bin/withlist Ëô¤Ï bin/config_list ¤ò»È¤Ã¤Æ\n"
-"mlist.info ¤òÀßÄꤷ¤Þ¤¹.\n"
+"mlist.info ¤òÀßÄꤷ¤Þ¤¹."
 
 #: Mailman/Gui/General.py:560
 msgid ""
@@ -9300,7 +9300,7 @@
 "·Ù¹ð: ¸ÂÄê¸ø³«Êݸ½ñ¸Ë¥Ç¥£¥ì¥¯¥È¥ê¤¬ other-executable (o+x) ¤Ë\n"
 "      ¤Ê¤Ã¤Æ¤¤¤Þ¤¹. ¤¢¤Ê¤¿¤Î¥·¥¹¥Æ¥à¤Î¥·¥§¥ë¥æ¡¼¥¶¤¬¤³¤ÎÊݸ½ñ¸Ë\n"
 "      ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹. ¥¤¥ó¥¹¥È¡¼¥ë¥Þ¥Ë¥å¥¢¥ë¤Ë¤Ï, ¤³¤ì¤ò\n"
-"      ¤É¤¦¤·¤¿¤é½¤Àµ¤Ç¤­¤ë¤«½ñ¤¤¤Æ¤¢¤ê¤Þ¤¹¤Î¤Ç, »²¹Í¤Ë¤·¤Æ¤¯¤À¤µ¤¤.\n"
+"      ¤É¤¦¤·¤¿¤é½¤Àµ¤Ç¤­¤ë¤«½ñ¤¤¤Æ¤¢¤ê¤Þ¤¹¤Î¤Ç, »²¹Í¤Ë¤·¤Æ¤¯¤À¤µ¤¤."
 
 #: bin/check_perms:240
 msgid "mbox file must be at least 0660:"

Modified: trunk/messages/nl/LC_MESSAGES/mailman.po
===================================================================
--- trunk/messages/nl/LC_MESSAGES/mailman.po	2016-09-13 16:35:20 UTC (rev 793)
+++ trunk/messages/nl/LC_MESSAGES/mailman.po	2016-09-13 16:41:02 UTC (rev 794)
@@ -2434,6 +2434,7 @@
 "wijziging\n"
 "is daarom geweigerd.  Als u toch deze wijzigingen wilt aanbrengen, heeft u\n"
 "shell access nodig voor uw Mailman server.\n"
+"             "
 
 #: Mailman/Cgi/edithtml.py:214
 msgid "See "
@@ -3962,7 +3963,7 @@
 "        en zonder aanhalingstekens!) uw lidmaatschapsadres. Als u het \n"
 "        wachtwoord van de lijstbeheerder of moderator opgeeft, zullen ook "
 "de\n"
-"        verborgen leden worden vermeld."
+"        verborgen leden worden vermeld.\n"
 
 #: Mailman/Commands/cmd_who.py:46
 msgid ""
@@ -6271,6 +6272,7 @@
 "Deze wijziiging kan gemaakt worden met bin/withlist of met bin/config_list "
 "door het\n"
 "instellen van mlist.info.\n"
+"                        "
 
 #: Mailman/Gui/General.py:560
 msgid ""

Modified: trunk/templates/Makefile.in
===================================================================
--- trunk/templates/Makefile.in	2016-09-13 16:35:20 UTC (rev 793)
+++ trunk/templates/Makefile.in	2016-09-13 16:41:02 UTC (rev 794)
@@ -60,12 +60,61 @@
 all:
 
 install:
+	# charsets taken from Mailman/Defaults.py.in (all calls to add_language)
+	# except gl which pretends to be utf-8 but isn’t (except one file which we patch)
+	CHARSET_ar=utf-8; \
+	CHARSET_ast=iso-8859-1; \
+	CHARSET_ca=utf-8; \
+	CHARSET_cs=iso-8859-2; \
+	CHARSET_da=iso-8859-1; \
+	CHARSET_de=iso-8859-1; \
+	CHARSET_en=us-ascii; \
+	CHARSET_es=iso-8859-1; \
+	CHARSET_et=iso-8859-15; \
+	CHARSET_eu=iso-8859-15; \
+	CHARSET_fa=utf-8; \
+	CHARSET_fi=iso-8859-1; \
+	CHARSET_fr=iso-8859-1; \
+	CHARSET_gl=iso-8859-1; \
+	CHARSET_el=iso-8859-7; \
+	CHARSET_he=utf-8; \
+	CHARSET_hr=iso-8859-2; \
+	CHARSET_hu=iso-8859-2; \
+	CHARSET_ia=iso-8859-15; \
+	CHARSET_it=iso-8859-1; \
+	CHARSET_ja=euc-jp; \
+	CHARSET_ko=euc-kr; \
+	CHARSET_lt=iso-8859-13; \
+	CHARSET_nl=iso-8859-1; \
+	CHARSET_no=iso-8859-1; \
+	CHARSET_pl=iso-8859-2; \
+	CHARSET_pt=iso-8859-1; \
+	CHARSET_pt_BR=iso-8859-1; \
+	CHARSET_ro=iso-8859-2; \
+	CHARSET_ru=koi8-r; \
+	CHARSET_sk=utf-8; \
+	CHARSET_sl=iso-8859-2; \
+	CHARSET_sr=utf-8; \
+	CHARSET_sv=iso-8859-1; \
+	CHARSET_tr=iso-8859-9; \
+	CHARSET_uk=utf-8; \
+	CHARSET_vi=utf-8; \
+	CHARSET_zh_CN=utf-8; \
+	CHARSET_zh_TW=utf-8; \
 	for d in $(LANGUAGES); \
 	do \
+	    eval cs='$$CHARSET_'$$d; \
+	    test -n "$$cs" || cs=cp1252; \
 	    $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \
 	    for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \
 	    do \
-	    	$(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \
+		bn=$$(basename $$f); \
+		if ! iconv -f $$cs -t utf-8 <$$f; then \
+			echo >&2 Warning: broken encoding in $$f; \
+			iconv -c -f cp1252 -t utf-8 <$$f; \
+		fi >$$f.utf-8; \
+	    	$(INSTALL) -m $(FILEMODE) $$f.utf-8 $(DESTDIR)$(TEMPLATEDIR)/$$d/$$bn; \
+		rm -f $$f.utf-8; \
 	    done; \
 	done