Changeset 2433

Timestamp:

09/02/08 16:19:23 (3 months ago)

Author:

moeffju

Message:

Add an option to set the system locale to use.
This is preliminary and should probably be replaced by a setting in the chosen language file.

Location:

trunk/htdocs

Files:

• index.php (modified) (1 diff)
• system/classes/adminhandler.php (modified) (1 diff)
• system/classes/locale.php (modified) (1 diff)

trunk/htdocs/index.php

@@ -170 +170 @@
 }
 
+if ( @ Options::get( 'system_locale' ) ) {
+    Locale::set_system_locale( Options::get( 'system_locale' ) );
+}
+
 // Verify if the database has to be upgraded.
 if ( Version::requires_upgrade() ) {

trunk/htdocs/system/classes/adminhandler.php

@@ -210 +210 @@
                 'selectarray' => array_merge( array( '' => 'default' ), array_combine( Locale::list_all(), Locale::list_all() ) ),
                 'helptext' => 'International language code',
-            )
+            ),
+            'system_locale' => array(
+                'label' => _t('System Locale'),
+                'type' => 'text',
+                'helptext' => 'The appropriate locale code for your server',
+            ),
         );
 

trunk/htdocs/system/classes/locale.php

@@ -28 +28 @@
         self::$locale= strtolower( $locale );
         self::$uselocale= self::load_domain( 'habari' );
+    }
+    
+    /**
+     * Set system locale.
+     *
+     * The problem is that every platform has its own way to designate a locale,
+     * so for German you could have 'de', 'de_DE', 'de_DE.UTF-8', 'de_DE.UTF-8@euro'
+     * (Linux) or 'DEU' (Windows), etc.
+     *
+     * @todo: This setting should probably be stored in the language files.
+     *
+     * @param string... $locale The locale(s) to set. They will be tried in order.
+     * @return string the locale that was picked, or FALSE if an error occurred
+     */
+    public static function set_system_locale()
+    {
+        if ( func_num_args() == 0 ) return;
+        $args= func_get_args();
+        array_unshift( $args, LC_ALL );
+        
+        return call_user_func_array( 'setlocale', $args );
     }