Changeset 1580

Timestamp:

09/14/06 18:51:23 (2 years ago)

Author:

mbonetti

Message:

l10n of some error strings

Location:

trunk/gregarius

Files:

• admin/config.php (modified) (6 diffs)
• admin/tags.php (modified) (2 diffs)
• cls/l10n.php (modified) (1 diff)
• schema.php (modified) (1 diff)

trunk/gregarius/admin/config.php

@@ -188 +188 @@
     case 'CST_ADMIN_DEFAULT_ACTION':
         if (!array_key_exists('key',$_REQUEST)) {
-            rss_error('Invalid config key specified.', RSS_ERROR_ERROR,true);
+            rss_error(__('Invalid config key specified.'), RSS_ERROR_ERROR,true);
             break;
         }
@@ -198 +198 @@
 
         if ($value == $default) {
-            rss_error("The value for '$key' is the same as its default value!", RSS_ERROR_ERROR,true);
+            rss_error(__("The value for '$key' is the same as its default value!"), RSS_ERROR_ERROR,true);
             break;
         }
@@ -324 +324 @@
             case 'num':
                 if (!is_numeric($value)) {
-                    rss_error("Oops, I was expecting a numeric value, got '$value' instead!", RSS_ERROR_ERROR,true);
+                    rss_error(__("Oops, I was expecting a numeric value, got '$value' instead!"), RSS_ERROR_ERROR,true);
                     break;
                 }
@@ -331 +331 @@
             case 'boolean':
                 if ($value != __('True') && $value != __('False')) {
-                    rss_error('Oops, invalid value for ' . $key .": " . $value, RSS_ERROR_ERROR,true);
+                    rss_error(__("Oops, invalid value for $key : $value"), RSS_ERROR_ERROR,true);
                     break;
                 }
@@ -343 +343 @@
 
                 if (strstr($oldvalue,$value) === FALSE) {
-                    rss_error("Oops, invalid value '$value' for this config key", RSS_ERROR_ERROR,true);
+                    rss_error(__("Oops, invalid value '$value' for this config key"), RSS_ERROR_ERROR,true);
                     break;
                 }
@@ -362 +362 @@
                            ." where key_='$key'";
                 } else {
-                    rss_error("Oops, invalid value '$value' for this config key", RSS_ERROR_ERROR,true);
+                    rss_error(__("Oops, invalid value '$value' for this config key"), RSS_ERROR_ERROR,true);
                 }
                 break;
             default:
-                rss_error('Ooops, unknown config type: ' . $type, RSS_ERROR_ERROR,true);
+                rss_error(__('Ooops, unknown config type: ') . $type, RSS_ERROR_ERROR,true);
                 //var_dump($_REQUEST);
                 break;

trunk/gregarius/admin/tags.php

@@ -160 +160 @@
     echo "</table>\n";
     echo "<fieldset>\n"
-    ."<legend>Selected...</legend>\n"
+    ."<legend>".__('Selected')."...</legend>\n"
     ."<p>\n"
     ."<input type=\"submit\" id=\"me_delete\" name=\"me_delete\" value=\"".__('Delete')."\" />\n"
@@ -178 +178 @@
 
     echo "<div>\n"
-    ."<h2>Edit '$tag'</h2>\n"
+    ."<h2>".ucfirst(__('edit'))." '$tag'</h2>\n"
     ."<form method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\" id=\"tagedit\">\n"
 

trunk/gregarius/cls/l10n.php

@@ -74 +74 @@
     function __detectUserLang() {
        if (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_[A-Z]{2}$#',$_REQUEST['lang']) && file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang'])) {
+            setcookie(RSS_LOCALE_COOKIE,$_REQUEST['lang'],time()+3600*6,getPath());
             return  $_REQUEST['lang'];
         } elseif (isset($_COOKIE[RSS_LOCALE_COOKIE])) {

trunk/gregarius/schema.php

@@ -65 +65 @@
         
         if ($updated == count($missing_tables)) {
-            rss_error("Successfully created $updated of $updated database tables!", RSS_ERROR_NOTICE);
+            rss_error(__("Successfully created $updated of $updated database tables!"), RSS_ERROR_NOTICE);
         } else {
             rss_error(