Changeset 1078

Timestamp:

04/23/07 13:16:47 (2 years ago)

Author:

ben

Message:

gettext change by Diego Ramirez; plugins can now supply their own translations.

Files:

• devel/units/gettext/library.php (modified) (20 diffs)

devel/units/gettext/library.php

@@ -5 +5 @@
-    {
-        global $CFG;
-
+
-        if ($domain == 'none')
-        {
@@ -16 +16 @@
-        if ($i18n != null)
-        {
-
+
+
+
+
+
+
+
-        }
-        else
@@ -63 +69 @@
-            if (array_key_exists($USER->locale, $CFG->languages_domain_paths[$domain]))
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
@@ -106 +109 @@
-
-        foreach ($langs as $lang) {
- 
+
-            // 2_digit_code[-longer_code][;q=coefficient]
-            ereg('([a-z]{1,2})(-([a-z0-9]+))?(;q=([0-9\.]+))?', $lang, $found);
@@ -144 +147 @@
-    {
-        global $CFG, $messages;
-
+
-        // Load known language codes
-        parse_languages_available();
-
+
-        // Array to hold domain files, available in $CFG->languages_installed
-        // E.g. $CFG->languages_installed['elgg']['nl'] = '/path/to/nl/LC_MESSAGES/elgg.mo'
@@ -189 +192 @@
-                while(false !== ($file = readdir($langdir)))
-                {
+                  $firstchar = substr($file, 0, 1);
+
+                  if ($firstchar == '.' or $file == 'CVS' or $file == '_vti_cnf' or $file == '.svn')
+                  {
+                      continue;
+                  }
-                    // Grab the .mo file
-                    eregi("([a-zA-Z].*)\.mo", $file, $match);
-                    
-                    if ($match)
-                    {
-
+[]
-                    }
+                    $match = null;
-                }
-            }
@@ -209 +218 @@
-    {
-        global $CFG;
-
+
-        // Only load once
-        if (!isset($CFG->languages_available))
@@ -233 +242 @@
-        // Load default language path
-        parse_installed_languages($CFG->dirroot);
-
+
-        // Load plugin language paths
-        $plugindir = opendir($CFG->dirroot . 'mod/');
@@ -249 +258 @@
-            }
-        }
-
+
-        // Store the browser setting
-        $USER->languages_browser = parse_http_accept_language();
@@ -257 +266 @@
-        {
-            $bad = $CFG->defaultlocale;
-
+
-            // Empty it, and send a message to the screen
-            $CFG->defaultlocale = '';
-
+
-            global $messages;
-
+
-            $messages[] = "Unknown language code: ".$bad.". Please ask the system administrator to properly configure \$CFG->defaultlocale in the main configuration file.";
-        }
-
+
-        // Setup variables to hold the user language
-        $USER->locale = $CFG->defaultlocale;
@@ -278 +287 @@
-
-
- 
- 
+
+
-        // TODO Implement better check!
-        if ($USER->ident != 0)
@@ -305 +314 @@
-                {
-                    $keys = array_keys($USER->languages_browser);
-
+
-                    if ($browser = $USER->languages_browser[$keys[0]])
-                    {
@@ -316 +325 @@
-                    $setting = $CFG->defaultlocale;
-                }
-
+
-                // Store the value
-                $flag = new StdClass;
@@ -331 +340 @@
-        {
-            // User is logged out
-
+
-            // TODO special actions? For now language will be set
-            // to $CFG-defaultlocale for non logged in users or via
@@ -374 +383 @@
-            {
-                // Have to replicate flag setting because of including order
-
+
-                // unset first
-                delete_records('user_flags','flag','language','user_id',$USER->ident);
@@ -396 +405 @@
-        // from Elgg locales
-        $time_locale = $USER->locale;
-
+
-        if (!substr($USER->locale, 2, 1) == "_") {
-            $time_locale = $USER->locale . "_" . strtoupper($USER->locale);
@@ -413 +422 @@
-        $body = <<< END
-            <h2>$title</h2>
-    
+
-END;
-
@@ -427 +436 @@
-            $tmp .= '<select name="lang">';
-            $tmp .= '<option value="default">'.__gettext('default')."</option>\n";
-
+
-            ksort($CFG->languages_installed);
-
+
-            foreach ($CFG->languages_installed as $key => $description)
-            {
@@ -439 +448 @@
-                $tmp .= '<option value="'.$key.'" '.$selected.'>'.$description."</option>\n";
-            }
-
+
-            $tmp .= '</select>';
-        }
@@ -456 +465 @@
-    {
-        global $CFG, $USER, $messages;
-
+
-        $action = optional_param('action');
-        $id = optional_param('id',0,PARAM_INT);