Changeset 1561 for trunk/gregarius/cls/update.php

Timestamp:

09/09/06 14:52:23 (2 years ago)

Author:

mbonetti

Message:

Yay for gettext localization! This will probably break things big time.
Note that until intl/*.php isn't adapted the the new method, the trunk
won't be localized!

Files:

• trunk/gregarius/cls/update.php (modified) (7 diffs)

trunk/gregarius/cls/update.php

@@ -116 +116 @@
         if ($error & MAGPIE_FEED_ORIGIN_CACHE) {
             if ($error & MAGPIE_FEED_ORIGIN_HTTP_304) {
-                $label = LBL_UPDATE_NOT_MODIFIED;
+                $label = __('OK (304 Not modified)');
                 $cls = ERROR_NOERROR;
             }
             elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_TIMEOUT) {
-                $label = LBL_UPDATE_CACHE_TIMEOUT;
+                $label = __('HTTP Timeout (Local cache)');
                 $cls = ERROR_WARNING;
             }
             elseif ($error & MAGPIE_FEED_ORIGIN_NOT_FETCHED) {
-                $label = LBL_UPDATE_STATUS_CACHED;
+                $label = __('OK (Local cache)');
                 $cls = ERROR_NOERROR;
             }
             elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_404) {
-                $label = LBL_UPDATE_NOT_FOUND;
+                $label = __('404 Not Found (Local cache)');
                 $cls = ERROR_ERROR;
             }
@@ -137 +137 @@
         }
         elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_200) {
-            $label = LBL_UPDATE_STATUS_OK;
+            $label = __('OK (HTTP 200)');
             $cls = ERROR_NOERROR;
         }
         else {
             if (is_numeric($error)) {
-                $label = LBL_UPDATE_STATUS_ERROR;
+                $label = __('ERROR');
                 $cls = ERROR_ERROR;
             } else {
@@ -177 +177 @@
 
         echo
-        "<h2>".sprintf(LBL_UPDATE_H2, count($this -> chans))."</h2>\n"
+        "<h2>".sprintf(__('Updating %d Feeds...'), count($this -> chans))."</h2>\n"
         ."<table id=\"updatetable\">\n"
         ."<tr>\n"
-        ."<th class=\"lc\">".LBL_UPDATE_CHANNEL."</th>\n"
-        ."<th class=\"mc\">".LBL_UPDATE_STATUS."</th>\n"
-        ."<th class=\"rc\">".LBL_UPDATE_UNREAD."</th>\n"
+        ."<th class=\"lc\">".__('Feed')."</th>\n"
+        ."<th class=\"mc\">".__('Status')."</th>\n"
+        ."<th class=\"rc\">".__('New Items')."</th>\n"
         ."</tr>";
 
@@ -239 +239 @@
     function render() {
 
-        echo "<h2 style=\"margin-bottom:1em;\">". sprintf(LBL_UPDATE_H2,count($this -> chans)) ."</h2>\n";
+        echo "<h2 style=\"margin-bottom:1em;\">". sprintf(__('Updating %d Feeds...'),count($this -> chans)) ."</h2>\n";
 
         echo "<table id=\"updatetable\">\n"
         ."<tr>\n"
-        ."<th class=\"lc\">".LBL_UPDATE_CHANNEL."</th>\n"
-        ."<th class=\"mc\">".LBL_UPDATE_STATUS."</th>\n"
-        ."<th class=\"rc\">".LBL_UPDATE_UNREAD."</th>\n"
+        ."<th class=\"lc\">".__('Feed')."</th>\n"
+        ."<th class=\"mc\">".__('Status')."</th>\n"
+        ."<th class=\"rc\">".__('New Items')."</th>\n"
         ."</tr>\n";
 
@@ -296 +296 @@
 
             list($label,$cls) = parent::magpieError($error);
-            echo "\n$label, $unread " . LBL_UPDATE_UNREAD . "\n\n";
+            echo "\n$label, $unread " . __('New Items') . "\n\n";
             flush();
 
@@ -325 +325 @@
             $unread = count($unreadIds);
             list($label,$cls) = parent::magpieError($error);
-            echo "\n$label, $unread " . LBL_UPDATE_UNREAD . "<br />";
+            echo "\n$label, $unread " . __('New Items') . "<br />";
             flush();
     }
@@ -357 +357 @@
                                 echo "$title ...\t";
                                 flush();
-                                echo "\n$label, $unread " . LBL_UPDATE_UNREAD . "\n\n";
+                                echo "\n$label, $unread " . __('New Items') . "\n\n";
                                 flush();
                         }