Thread: [phpwiki-checkins] CVS: phpwiki/lib IniConfig.php,1.68,1.69

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14914
Modified Files:
	IniConfig.php 
Log Message:
fix default language detection if DEFAULT_LANGUAGE=, collapse to 2char lang code, fix typo in @bindtextdomain
Index: IniConfig.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/IniConfig.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -2 -b -p -d -r1.68 -r1.69
--- IniConfig.php	14 Dec 2004 21:35:15 -0000	1.68
+++ IniConfig.php	23 Dec 2004 14:07:34 -0000	1.69
@@ -131,5 +131,5 @@ function IniConfig($file) {
 'GROUP_METHOD',
 'EDITING_POLICY', 'THEME', 'CHARSET',
- 'DEFAULT_LANGUAGE', 'WIKI_PGSRC', 'DEFAULT_WIKI_PGSRC',
+ 'WIKI_PGSRC', 'DEFAULT_WIKI_PGSRC',
 'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', 'SUBPAGE_SEPARATOR', /*'KEYWORDS',*/
 // extra logic:
@@ -149,5 +149,5 @@ function IniConfig($file) {
 $_IC_OPTIONAL_VALUE = array
 ( 
- 'DEBUG', 'TEMP_DIR',
+ 'DEBUG', 'TEMP_DIR', 'DEFAULT_LANGUAGE', 
 'LDAP_AUTH_HOST','LDAP_SET_OPTION','LDAP_BASE_DN', 'LDAP_AUTH_USER',
 'LDAP_AUTH_PASSWORD','LDAP_SEARCH_FIELD','LDAP_OU_GROUP','LDAP_OU_USERS',
@@ -485,7 +485,4 @@ function fixup_static_configs() {
 $FieldSeparator = "\x81";
 
- if (!defined('DEFAULT_LANGUAGE')) // not needed anymore
- define('DEFAULT_LANGUAGE', 'en');
-
 $AllActionPages = explode(':',
 'AllPages:BackLinks:CreatePage:DebugInfo:EditMetaData:FindPage:'
@@ -586,5 +583,5 @@ function fixup_dynamic_configs() {
 ini_set('session.save_path', SESSION_SAVE_PATH);
 if (!defined('DEFAULT_LANGUAGE')) // not needed anymore
- define('DEFAULT_LANGUAGE', 'en');
+ define('DEFAULT_LANGUAGE', ''); // detect from client
 
 update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE);
@@ -615,11 +612,11 @@ function fixup_dynamic_configs() {
 $chback = 0;
 if (isWindows())
- $bindtextdomain_path = str_replace("/","\\",$bindtextdomain_path);
- $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain);
+ $bindtextdomain_path = str_replace("/", "\\", $bindtextdomain_path);
+ $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain_path);
 if ($bindtextdomain_real != $bindtextdomain_path) {
 // this will happen with virtual_paths. chdir and try again.
 chdir($bindtextdomain_path);
 $chback = 1;
- $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain);
+ $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain_path);
 }
 textdomain("phpwiki");
@@ -763,4 +760,7 @@ function fixup_dynamic_configs() {
 
 // $Log$
+// Revision 1.69 2004年12月23日 14:07:34 rurban
+// fix default language detection if DEFAULT_LANGUAGE=, collapse to 2char lang code, fix typo in @bindtextdomain
+//
 // Revision 1.68 2004年12月14日 21:35:15 rurban
 // support new BLOG_EMPTY_DEFAULT_PREFIX