Changeset 1561 for trunk/gregarius/cls

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!

Location:

trunk/gregarius/cls

Files:

• categories.php (modified) (2 diffs)
• channels.php (modified) (3 diffs)
• header.php (modified) (2 diffs)
• items.php (modified) (2 diffs)
• nav.php (modified) (1 diff)
• search.php (modified) (1 diff)
• taglist.php (modified) (2 diffs)
• update.php (modified) (7 diffs)
• wrappers/feeds.php (modified) (2 diffs)
• wrappers/header.php (modified) (2 diffs)
• wrappers/item.php (modified) (3 diffs)
• wrappers/searchform.php (modified) (3 diffs)
• wrappers/toolkit.php (modified) (3 diffs)

trunk/gregarius/cls/categories.php

@@ -58 +58 @@
         $this->loadCollapsedState();
         $this -> populate();
-        $this ->    columnTitle = LBL_TAG_FOLDERS;
+        $this ->    columnTitle = __('Categories');
         $GLOBALS['rss']-> feedList = $this;
     }
@@ -85 +85 @@
     
     function getStats() {
-        return sprintf(LBL_CATCNT_PF, $this -> taggedFeedCnt, $this -> tagCnt, 0);
+        return sprintf(__('<strong>%d</strong> feeds in <strong>%d</strong> categories'), $this -> taggedFeedCnt, $this -> tagCnt, 0);
     }
     

trunk/gregarius/cls/channels.php

@@ -97 +97 @@
 
         if ($unreadCount > 0) {
-            $this->rdLbl= sprintf(LBL_UNREAD_PF, "cid$id","",$unreadCount);
+            $this->rdLbl= sprintf(__('<strong id="%s" style="%s">(%d unread)</strong>'), "cid$id","",$unreadCount);
             $this->class_= "feed title unread";
         } else {
@@ -151 +151 @@
     var $activeId;
     var $feedCount = 0;
-    var $columnTitle = LBL_H2_CHANNELS;
+    var $columnTitle;
     var $stats;
     
     function FeedList($activeId) {
         _pf('FeedList() ctor');
+        $this ->columnTitle= __('Feeds');
         $this->activeId = $activeId;
         $this->loadCollapsedState();
@@ -191 +192 @@
         _pf(' ... done: feedsCount');               
         
-        $this ->stats = sprintf(LBL_ITEMCOUNT_PF, $total, $unread, $channelcount);
+        $this ->stats = sprintf(__('<strong>%d</strong> items (<strong id="fucnt">%d</strong> unread) in <strong>%d</strong> feeds'), $total, $unread, $channelcount);
         _pf('done: getStats()');
         return $this -> stats;

trunk/gregarius/cls/header.php

@@ -60 +60 @@
             is_array($cidfid) && 
             ($uc = getUnreadCount($cidfid['cid'], $cidfid['fid']))) {
-            $this->docTitle .= " ($uc ".LBL_UNREAD.")";
+            $this->docTitle .= " ($uc ".__('unread').")";
         }
 
@@ -95 +95 @@
         
         $GLOBALS['rss'] -> sideMenu = new SideMenu();
-        $GLOBALS['rss'] -> sideMenu -> addMenu(LBL_H2_CHANNELS,'FeedList' , "_side('FeedList')");
-        $GLOBALS['rss'] -> sideMenu -> addMenu(LBL_TAG_FOLDERS, 'CatList', "_side('CatList')");
-        $GLOBALS['rss'] -> sideMenu -> addMenu(LBL_TAG_TAGS, 'TagList', "_side('TagList')");
+        $GLOBALS['rss'] -> sideMenu -> addMenu(__('Feeds'),'FeedList' , "_side('FeedList')");
+        $GLOBALS['rss'] -> sideMenu -> addMenu(__('Categories'), 'CatList', "_side('CatList')");
+        $GLOBALS['rss'] -> sideMenu -> addMenu(__('Tags'), 'TagList', "_side('TagList')");
     }
 

trunk/gregarius/cls/items.php

@@ -485 +485 @@
     var $_parent;
     var $pages;
-    function ItemListNavigation($il) {
+    function ItemListNavigation(&$il) {
         $this -> _parent = $il;
         $this -> pages = array();
@@ -535 +535 @@
             . $this -> _sqlActualWhere;
         list($this -> numItems) = rss_fetch_row(rss_query($sql));
-        $this -> navigation = new ItemListNavigation(& $this);
+        $this -> navigation = new ItemListNavigation($this);
     }
 }

trunk/gregarius/cls/nav.php

@@ -60 +60 @@
     function Navigation() {
     
-        $this->appendNavItem(getPath(),LBL_NAV_HOME,LOCATION_HOME);
-        $this->appendNavItem(getPath().'update.php',LBL_NAV_UPDATE,LOCATION_UPDATE);
-        $this->appendNavItem(getPath().'search.php',LBL_NAV_SEARCH,LOCATION_SEARCH);
-        $this->appendNavItem(getPath().'admin/',LBL_NAV_CHANNEL_ADMIN,LOCATION_ADMIN);
+        $this->appendNavItem(getPath(),__('<span>H</span>ome'),LOCATION_HOME);
+        $this->appendNavItem(getPath().'update.php',__('<span>R</span>efresh'),LOCATION_UPDATE);
+        $this->appendNavItem(getPath().'search.php',__('<span>S</span>earch'),LOCATION_SEARCH);
+        $this->appendNavItem(getPath().'admin/',__('A<span>d</span>min'),LOCATION_ADMIN);
         
         if (($an = rss_plugin_hook('rss.plugins.afternav', null)) != null) {

trunk/gregarius/cls/search.php

@@ -211 +211 @@
         if ($this->resultsPerPage != INFINE_RESULTS && $this->itemCount >  $this->resultsPerPage) {
             $nav .= "<div class=\"readmore\">";
-            $nav .= LBL_SEARCH_RESULTS;
+            $nav .= __('Results: ');
 
             // first page

trunk/gregarius/cls/taglist.php

@@ -67 +67 @@
     function TagList() {
         $this -> populate();
-        $this ->    columnTitle = LBL_TAG_TAGS;
+        $this ->    columnTitle = __('Tags');
         $GLOBALS['rss']-> feedList = $this;
     }
@@ -84 +84 @@
     
     function getStats() {
-        return sprintf(LBL_TAGCOUNT_PF, $this -> countTaggedItems, $this->tagCount);
+        return sprintf(__('<strong>%d</strong> tagged items, in <strong>%d</strong> tags'), $this -> countTaggedItems, $this->tagCount);
     }
     

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();
                         }

trunk/gregarius/cls/wrappers/feeds.php

@@ -60 +60 @@
 }
 
-function rss_feeds_folders_unread_count($label=LBL_UNREAD_PF) {
+function rss_feeds_folders_unread_count($label=null) {
+    if ($label === null) {
+        $label=__('<strong id="%s" style="%s">(%d unread)</strong>');
+    }
     if (array_key_exists($GLOBALS['rss']->currentFeedsFolder->id,$GLOBALS['rss']->feedList->collapsed_folders)) { 
         $sCls = ($GLOBALS['rss']->currentFeedsFolder->isCollapsed?"display:inline":"display:none");
@@ -68 +71 @@
 
         switch( $GLOBALS['rss']->feedList -> columnTitle ) {
-            case LBL_TAG_FOLDERS:
+            case __('Categories'):
                 $ret = rss_plugin_hook("rss.plugins.sidemenu.categoryunreadlabel", $ret);
                 break;
-            case LBL_H2_CHANNELS:
+            case __('Feeds'):
                 $ret = rss_plugin_hook("rss.plugins.sidemenu.folderunreadlabel", $ret);
                 break;

trunk/gregarius/cls/wrappers/header.php

@@ -132 +132 @@
 function rss_footer_last_modif() {
     $ts = getLastModif();
-    return ($ts ? rss_locale_date ("%c", $ts) : LBL_FOOTER_LAST_MODIF_NEVER);
+    return ($ts ? rss_locale_date ("%c", $ts) : __('Never'));
 }
 
@@ -140 +140 @@
     
     if (rss_user_level() > RSS_USER_LEVEL_NOLEVEL) {
-        $ret .= sprintf(LBL_LOGGED_IN_AS, rss_user_name())
-                ."&nbsp;|&nbsp;<a href=\"".getPath()."?logout\">".LBL_LOG_OUT."</a>\n";
+        $ret .= sprintf(__('Logged in as <strong>%s</strong>'), rss_user_name())
+                ."&nbsp;|&nbsp;<a href=\"".getPath()."?logout\">".__('Logout')."</a>\n";
     } else {
-        $ret .= LBL_NOT_LOGGED_IN
-                ."&nbsp;|&nbsp;<a href=\"#\" onclick=\"miniloginform(); return false;\">".LBL_LOG_IN."</a>";
+        $ret .= __('Not logged in')
+                ."&nbsp;|&nbsp;<a href=\"#\" onclick=\"miniloginform(); return false;\">".__('Login')."</a>";
         $ret .= "<div style=\"display:none\" id=\"loginformcontainer\">"
                          . '<form ' . 'onsubmit="return loginHandler();" ' . 'method="post" action="'.getPath().'">'
                          . '<div style="display:inline"><input style=" width:50px;" name="username" id="username" type="text" /></div>'
                          . '<div style="display:inline"><input style=" width:50px;" name="password" id="password"  type="password" /></div>'
-                         . '<div style="display:inline"><input type="submit" value="'.LBL_LOG_IN.'" /></div>'
+                         . '<div style="display:inline"><input type="submit" value="'.__('Login').'" /></div>'
                          . '</form>'
                  ."</div>\n";

trunk/gregarius/cls/wrappers/item.php

@@ -41 +41 @@
 }
 
-function rss_item_pl_title($label=LBL_PL_FOR) {
-    
+function rss_item_pl_title($label=null){
+    if (null === $label) {
+        $label = __('Permalink for ');
+    }
     if (getConfig('rss.output.usepermalinks')) {
         list ($ply, $plm, $pld) = explode(":", rss_date("Y:m:d", $GLOBALS['rss'] -> currentItem -> date, false));
@@ -197 +199 @@
         }       
 */
-        return (($GLOBALS['rss']->currentItem->isPubDate?LBL_POSTED:LBL_FETCHED). $date_lbl);           
+        return (($GLOBALS['rss']->currentItem->isPubDate?__('Posted: '):__('Fetched: ')). $date_lbl);           
     }
 }
@@ -218 +220 @@
             $a = "<a href=\"".getPath() ."author.php?author=$ea\">$a</a>";
         }
-    return LBL_BY . $a;
+    return __(' by ') . $a;
   }
 }

trunk/gregarius/cls/wrappers/searchform.php

@@ -85 +85 @@
     ."\t\t\t<option value=\"".INFINE_RESULTS."\""
     .((array_key_exists(QUERY_RESULTS,$_REQUEST) && $_REQUEST[QUERY_RESULTS] == INFINE_RESULTS?" selected=\"selected\"":""))
-    .">".LBL_ALL."</option>\n"
+    .">".__('All')."</option>\n"
     ."\t\t</select>";
 }
@@ -94 +94 @@
       ."\t\t\t<option value=\"". ALL_CHANNELS_ID ."\""
       .((!array_key_exists(QUERY_CHANNEL,$_REQUEST) || $_REQUEST[QUERY_CHANNEL] == ALL_CHANNELS_ID)?" selected=\"selected\"":"")
-      .">" . LBL_ALL  . "</option>\n";
+      .">" . __('All')  . "</option>\n";
 
     $sql = "select "
@@ -120 +120 @@
             }
             if ($parent_ == "") {
-                $parent_ = LBL_HOME_FOLDER;
+                $parent_ = __('Root');
             }
             $ret .= "\t\t\t<optgroup label=\"$parent_ /\">\n";

trunk/gregarius/cls/wrappers/toolkit.php

@@ -40 +40 @@
         $ret .= "\t<option value=\"$id\""
         .($selected > -1 && $selected == $id ? " selected=\"selected\"":"")
-        .">" .  (($name == "")?LBL_HOME_FOLDER:$name)  ."</option>\n";
+        .">" .  (($name == "")?__('Root'):$name)  ."</option>\n";
     }
     $ret .= "</select>\n";
@@ -51 +51 @@
       ."\t\t\t<option value=\"". $all_channels_id ."\""
       .(0 == $selected?" selected=\"selected\"":"")
-    .">" . LBL_ALL  . "</option>\n";
+    .">" . __('All')  . "</option>\n";
 
   $sql = "select "
@@ -79 +79 @@
       }
       if ($parent_ == "") {
-        $parent_ = LBL_HOME_FOLDER;
+        $parent_ = __('Root');
       }
       $ret .= "\t\t\t<optgroup label=\"$parent_ /\">\n";