BugTrack/579 Move language settings into language resources together

diff --git a/en.lng b/en.lng
index 9c65d76..6db6d54 100644 (file)
--- a/en.lng
+++ b/en.lng
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: en.lng,v 1.28 2004/10/16 05:45:13 henoheno Exp $
+// $Id: en.lng,v 1.29 2004/10/16 05:56:24 henoheno Exp $
 //
 // PukiWiki message file (english)
 
@@ -11,10 +11,13 @@
 // NOTE: Encoding of this file, must equal to this setting
 
 // Internal content encoding = Output content charset (for skin)
-define('CONTENT_CHARSET', 'iso-8859-1'); // 'UTF-8' or 'iso-8859-1' or 'EUC-JP' or ...
+define('CONTENT_CHARSET', 'iso-8859-1'); // 'UTF-8', 'iso-8859-1', 'EUC-JP' or ...
 
-// Internal content encoding (for mbstring)
-define('SOURCE_ENCODING', 'ASCII'); // 'UTF-8' or 'ASCII' or 'EUC-JP'
+// mb_language (for mbstring extension)
+define('MB_LANGUAGE', 'English');   // 'uni'(means UTF-8), 'English', or 'Japanese'
+
+// Internal content encoding (for mbstring extension)
+define('SOURCE_ENCODING', 'ASCII'); // 'UTF-8', 'ASCII', or 'EUC-JP'
 
 ///////////////////////////////////////
 // page titles

diff --git a/ja.lng b/ja.lng
index 01ab8c1..e21ba1a 100644 (file)
--- a/ja.lng
+++ b/ja.lng
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: ja.lng,v 1.27 2004/10/16 05:45:13 henoheno Exp $
+// $Id: ja.lng,v 1.28 2004/10/16 05:56:24 henoheno Exp $
 //
 // PukiWiki message file (japanese)
 
@@ -16,7 +16,10 @@ $encode = 'EUC-JP';
 // Internal content encoding = Output content charset (for skin)
 define('CONTENT_CHARSET', $encode); // 'UTF-8' or 'iso-8859-1' or 'EUC-JP' or ...
 
-// Internal content encoding (for mbstring)
+// mb_language (for mbstring extension)
+define('MB_LANGUAGE', 'Japanese');   // 'uni'(means UTF-8), 'English', or 'Japanese'
+
+// Internal content encoding (for mbstring extension)
 define('SOURCE_ENCODING', $encode); // 'UTF-8' or 'ASCII' or 'EUC-JP'
 
 unset($encode);

diff --git a/lib/init.php b/lib/init.php
index 6224b0d..c150560 100644 (file)
--- a/lib/init.php
+++ b/lib/init.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: init.php,v 1.13 2004/10/16 05:48:53 henoheno Exp $
+// $Id: init.php,v 1.14 2004/10/16 05:56:24 henoheno Exp $
 //
 
 /////////////////////////////////////////////////
@@ -64,9 +64,9 @@ if (! file_exists(LANG_FILE) || ! is_readable(LANG_FILE)) {
 if ($die) die_message(nl2br("\n\n" . $die));
 
 /////////////////////////////////////////////////
-// INI_FILE / LANG_FILE: mbstring extension ´ØÏ¢
+// LANG_FILE: mbstring extension ´ØÏ¢
 
-mb_language('Japanese');
+mb_language(MB_LANGUAGE);
 mb_internal_encoding(SOURCE_ENCODING);
 ini_set('mbstring.http_input', 'pass');
 mb_http_output('pass');