Changeset 664

Timestamp:

10/22/06 21:59:41 (2 years ago)

Author:

misja

Message:

More gettext bugfixes.

Files:

• devel/mod/gettext/lib.php (modified) (1 diff)
• devel/units/gettext/gettext_userdetails_edit_details.php (modified) (1 diff)
• devel/units/gettext/library.php (modified) (12 diffs)

devel/mod/gettext/lib.php

@@ -23 +23 @@
-            $selected = '';
-//$USER->locale
-user
+
-            {
-                $selected = 'selected="selected"';

devel/units/gettext/gettext_userdetails_edit_details.php

@@ -2 +2 @@
-
-    // Function is in module's lib.php
-$page_owner
+
-
-?>

devel/units/gettext/library.php

@@ -45 +45 @@
-        global $CFG, $USER, $l10n;
-
+        if (!isset($USER->locale))
+        {
+            $USER->locale = $CFG->defaultlocale;
+        }
+
-        if (!isset($l10n[$domain]))
-        {
@@ -56 +61 @@
-        else
-        {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -207 +220 @@
-        global $CFG, $USER;
-
+        // Clean up the (possible) flaw created by the first svn commit
+        // TODO can be removed with next package release
+        delete_records('user_flags','flag','language','user_id',0);
+
-        // Load default language path
-        parse_installed_languages($CFG->dirroot);
@@ -246 +263 @@
-
-        // set initial session variable
-user
-
-user
+
+
+
-        }
-
-        // Now, grab user preference
-
-
+
+
+
+
+
+
-        {
-            // User is logged in and has a session
-            
-            if ($result = get_record('user_flags','flag','language','user_id',$USER->ident))
-            {
-user
+
-                $USER->locale = $result->value;
-            }
@@ -289 +309 @@
-                insert_record('user_flags',$flag);
-
-user
+
-                $USER->locale = $setting;
-            }
@@ -305 +325 @@
-            // selection widget. Should perhaps get stored in a cookie.
-
-userlocale']) && $_SESSION['user
-
-user
+locale']) && $_SESSION['
+
+
-            }
-            else
@@ -318 +338 @@
-        // else it will get called too late to set the user language.
-        $params = explode('?',$_SERVER['REQUEST_URI']);
-
+
+
-        {
-            $lang = explode('=', $params[1]);
@@ -334 +355 @@
-
-            // Store it in the user preferences
-
+
+
-            {
-                // Have to replicate flag setting because of including order
@@ -349 +371 @@
-
-            // Set session variable
-user
-
-
-
-$userid
-
-
+
+
+
+
+
+
+, $USER
-
-        $title = __gettext("Language selection").":";
@@ -364 +386 @@
-            <p>$blurb</p>    
-END;
+
+        $tmp = "";
-
-        if ($CFG->languages_installed == null)
@@ -400 +424 @@
-    function gettext_userdetails_actions()
-    {
-
+USER, $
-        
-        $action = optional_param('action');
-        $id = optional_param('id',0,PARAM_INT);
-T
+PARAM_ALPHA
-        $lang_db = user_flag_get('language', $id);
-
@@ -415 +439 @@
-                    if (user_flag_set('language', $lang, $id))
-                    {
-user
+
-                        $USER->locale = $lang;
+
-                        $messages[] .= __gettext("Preferred language") . " " . __gettext("saved") .".";
-                    }