From b91bc867b33379c7a2d31393e718c45b6db460e7 Mon Sep 17 00:00:00 2001 From: rurban Date: Sun, 26 Dec 2004 17:23:24 +0000 Subject: [PATCH] Change DEFAULT_LANGUAGE = '' for auto-detection japanase is euc-jp again, but utf-8 experimentally also provided. (expect pcre problems though) git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4347 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- config/config-default.ini | 3 +-- config/config-dist.ini | 13 ++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/config/config-default.ini b/config/config-default.ini index 7fe02c121..481c946b2 100644 --- a/config/config-default.ini +++ b/config/config-default.ini @@ -1,4 +1,4 @@ -; $Id: config-default.ini,v 1.24 2004-12-06 19:51:06 rurban Exp $ +; $Id: config-default.ini,v 1.25 2004-12-26 17:23:24 rurban Exp $ ; This is the default PhpWiki configuration for undefined config.ini entries. ; recent development and debugging features: @@ -90,7 +90,6 @@ ALLOW_IMAP_LOGIN = false THEME = default CHARSET = iso-8859-1 -DEFAULT_LANGUAGE = en WIKI_PGSRC = pgsrc DEFAULT_WIKI_PGSRC = pgsrc ; untranslated pgsrc pages to always include diff --git a/config/config-dist.ini b/config/config-dist.ini index 3affb9320..53d170c7e 100644 --- a/config/config-dist.ini +++ b/config/config-dist.ini @@ -724,9 +724,9 @@ THEME = default ; properly and will require modifications in all existing pages. ; At the very least you will have to convert the files in pgsrc ; or locale/xx/pgsrc to match! -; Currently we support utf-8 for zh, euc-jp for ja and iso-8859-1 -; for all other langs. Changing languages (UserPreferences) from one -; charset to another will not work! +; 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) +; 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 @@ -735,8 +735,8 @@ THEME = default ; flexibility in this area in the future). CHARSET = iso-8859-1 -; Select your language/locale - default language is "en" for English. -; Other languages available: +; Select your language/locale - Default language is "" for auto-detected. +; Available languages: ; English "en" (English - HomePage) ; Dutch "nl" (Nederlands - ThuisPagina) ; Spanish "es" (Español - PáginaPrincipal) @@ -750,8 +750,7 @@ CHARSET = iso-8859-1 ; If you set DEFAULT_LANGUAGE to the empty string, your system's ; default language (as determined by the applicable environment ; variables) will be used. -; Japanese requires euc-jp, Chinese utf-8 -; +; Japanese requires euc-jp or utf-8, Chinese utf-8 DEFAULT_LANGUAGE = en ; WIKI_PGSRC -- specifies the source for the initial page contents of -- 2.45.0