[phpwiki-checkins] SF.net SVN: phpwiki:[7000] trunk

[<var...@us...>]

Revision: 7000
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7000&view=rev
Author:   vargenau
Date:     2009-07-06 14:16:22 +0000 (Mon, 06 Jul 2009)

Log Message:
-----------
Default for Japanese is UTF-8

Modified Paths:
--------------
    trunk/config/config-dist.ini
    trunk/locale/Makefile
    trunk/locale/cvt-utf8.sh
    trunk/pgsrc/Help%2FTextFormattingRules

Removed Paths:
-------------
    trunk/locale/ja.euc-jp/

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2009-07-06 13:55:26 UTC (rev 6999)
+++ trunk/config/config-dist.ini	2009-07-06 14:16:22 UTC (rev 7000)
@@ -887,21 +887,21 @@
 ; and to reference links to the stylesheets (css). For more info see:
 ; http://www.iana.org/assignments/character-sets. Note that PhpWiki
 ; has been extensively tested only with the latin1 (iso-8859-1)
-; character set.
+; and utf-8 character sets.
 ;
-; If you change the default from iso-8859-1 with existing pages, 
+; If you change the default with existing pages, 
 ; PhpWiki may not work properly and will require modifications in all existing pages. 
 ; You'll have to dump the old pages with the old charset
 ; and import it into the new one after having changed the charset.
-; Currently we support utf-8 for zh and ja, euc-jp for ja (not enabled)
-; and iso-8859-1 for all other langs. Changing languages (UserPreferences) 
+; Currently we support utf-8 for all languages, euc-jp for ja
+; and iso-8859-1 for all langs except ja and zh. Changing languages (UserPreferences) 
 ; from one charset to another will not work!
 ;
 ; Character sets similar to iso-8859-1 may work with little or no
 ; modification depending on your setup. The database must also
 ; support the same charset, and of course the same is true for the
 ; web browser. euc-jp and utf-8 works ok, but only is mbstring is used.
-CHARSET = iso-8859-1
+CHARSET = utf-8
 
 ; Most exotic charsets are not supported by htmlspecialchars, which prints a warning:
 ; "charset `bla' not supported, assuming iso-8859-1"

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2009-07-06 13:55:26 UTC (rev 6999)
+++ trunk/locale/Makefile	2009-07-06 14:16:22 UTC (rev 7000)
@@ -27,12 +27,6 @@
 	cp -f $@ $@~
 	msgmerge -o $@.new $@~ $^ && mv -f $@.new $@
 
-# work on ja.euc-jp.po and create utf-8 from this. changes in utf-8 will get lost!
-po/ja.utf-8.po: po/ja.po
-	@echo "# Autogenerated file from ja.po" > $@
-	@echo "# Any changes here will be lost! Edit ja.po instead" >> $@
-	iconv -f euc-jp -t utf-8 $^ |sed -e's,; charset=euc-jp,; charset=utf-8,' >> $@
-
 %/LC_MESSAGES/phpwiki.mo : po/%.po
 	mkdir -p $*/LC_MESSAGES
 	msgfmt -o $@ $<

Modified: trunk/locale/cvt-utf8.sh
===================================================================
--- trunk/locale/cvt-utf8.sh	2009-07-06 13:55:26 UTC (rev 6999)
+++ trunk/locale/cvt-utf8.sh	2009-07-06 14:16:22 UTC (rev 7000)
@@ -4,7 +4,7 @@
 for po in po/??.po; do
   to="`echo $po|sed -e's/\.po/.utf8.po/'`"
   from=iso-8859-1
-  if [ "$po" = "po/ja.po" ]; then from=euc-jp; fi
+  if [ "$po" = "po/ja.po" ]; then from=utf-8; fi
   if [ "$po" = "po/zh.po" ]
   then 
     from=utf-8
@@ -19,7 +19,7 @@
 for po in ??; do
   to="$po.utf8"
   from=iso-8859-1
-  if [ "$po" = "ja" ]; then from=euc-jp; fi
+  if [ "$po" = "ja" ]; then from=utf-8; fi
   if [ "$po" = "zh" ]
   then 
     from=utf-8

Modified: trunk/pgsrc/Help%FTextFormattingRules
===================================================================
--- trunk/pgsrc/Help%2FTextFormattingRules	2009-07-06 13:55:26 UTC (rev 6999)
+++ trunk/pgsrc/Help%2FTextFormattingRules	2009-07-06 14:16:22 UTC (rev 7000)
@@ -151,7 +151,7 @@
 Special non-ASCII or non-latin characters are printed as-is only if supported
 by the native wiki CHARSET. Add such characters on a non-supported CHARSET with the [[Help:RawHtmlPlugin]] if it is enabled by the Admin and e.g. the ##&#num;## syntax.
 
-E.g. These japanese euc-jp chars '&#12363;&#12425; &#26032;&#35215;&#12506;&#12540;&#12472;' 
+E.g. These Japanese chars '&#12363;&#12425; &#26032;&#35215;&#12506;&#12540;&#12472;' 
 on this <<SystemInfo CHARSET>> wiki.
 
 And with the plugin: <<RawHtml &#12363;&#12425; &#26032;&#35215;&#12506;&#12540;&#12472;>>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.