Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv4914/lib/plugin
Modified Files:
SystemInfo.php
Log Message:
Clean up language/locale setting code.
I'm sure I broke something (sorry), but it really was a mess.
Index: SystemInfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/SystemInfo.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- SystemInfo.php 2 Sep 2002 08:44:49 -0000 1.2
+++ SystemInfo.php 18 Sep 2002 18:34:13 -0000 1.3
@@ -274,12 +274,10 @@ extends WikiPlugin
}
natcasesort($available_languages);
- // keep this only for a short time.
- if (empty($GLOBALS['default_language']))
- $GLOBALS['default_language'] = $GLOBALS['LANG'];
+
return sprintf(_("Total %d languages: "),count($available_languages)) .
implode(', ',$available_languages) . ". " .
sprintf(_("Current language: '%s'"), $GLOBALS['LANG']) .
- (($GLOBALS['default_language'] != $GLOBALS['LANG'])
- ? ". " . sprintf(_("System default: '%s'"), $GLOBALS['default_language'])
+ ((DEFAULT_LANGUAGE != $GLOBALS['LANG'])
+ ? ". " . sprintf(_("System default: '%s'"), DEFAULT_LANGUAGE)
: '');
}
@@ -329,7 +327,7 @@ extends WikiPlugin
'version' => create_function('',"return sprintf('%s',PHPWIKI_VERSION);"),
'LANG' => create_function('','return $GLOBALS["LANG"];'),
- 'LC_ALL' => create_function('','return $GLOBALS["LC_ALL"];'),
+ 'LC_ALL' => create_function('','return setlocale(LC_ALL, 0);'),
'current_language' => create_function('','return $GLOBALS["LANG"];'),
- 'system_language' => create_function('','return $GLOBALS["default_language"];'),
+ 'system_language' => create_function('','return DEFAULT_LANGUAGE;'),
'current_theme' => create_function('','return $GLOBALS["Theme"]->_name;'),
'system_theme' => create_function('','return THEME;'),