Changeset 1604 for branches/multiuser/plugins

Timestamp:

10/16/06 06:31:35 (2 years ago)

Author:

mdodoo

Message:

Sync with trunk up to (but not including changeset [1585]). I should *definitely* do this more often, because this was really annoying.

Location:

branches/multiuser/plugins

Files:

• delicious.php (modified) (2 diffs)
• markallread.php (modified) (6 diffs)
• stickyflag/stickyflag.php (modified) (2 diffs)

branches/multiuser/plugins/delicious.php

@@ -62 +62 @@
  }
  if (html == '') {
-  html = '<?php echo  LBL_TAG_SUGGESTIONS_NONE ?>';
+  html = '<?php echo  __('no suggestions') ?>';
  }
  span.innerHTML = '(' + html + ')';
@@ -106 +106 @@
         newspan.setAttribute("id","dt" + id);
         newspan.style.margin="0 0 0 0.5em";
-        newspan.innerHTML = "<?php echo  LBL_TAG_SUGGESTIONS ?>: (...) ]";
+        newspan.innerHTML = "<?php echo  __('suggestions') ?>: (...) ]";
         actionSpan.appendChild(newspan);
         get_from_delicious(id);

branches/multiuser/plugins/markallread.php

@@ -29 +29 @@
 /// Author: Keith D. Zimmerman
 /// Description: Display "Mark All Read" buttons and links in many places
-/// Version: 0.4
+/// Version: 0.5
 /// Configuration: __markallread_config
 
@@ -39 +39 @@
  * 0.3  support for i18n
  * 0.4  Fixed a couple validation issues
+ * 0.5  Adapted for new l10n method
  */
 
@@ -61 +62 @@
     $options = rss_plugins_get_option( MARKALLREAD_CONFIG_OPTIONS );
     if( $options & MARKALLREAD_OPTION_LINK_CATEGORY )
-        return "<a title='".LBL_MARK_CATEGORY_READ_ALL."' href='". getPath() ."feed.php?metaaction=LBL_MARK_VFOLDER_READ&vfolder=" . rss_feeds_folder_id() . "' onclick='javascript: return _markallread(this,\"category\",\"" . rss_feeds_folder_name() . "\");'>" . $existingText . '</a>';
+        return "<a title='".__('Mark This Category as Read')."' href='". getPath() ."feed.php?metaaction=ACT_MARK_VFOLDER_READ&vfolder=" . rss_feeds_folder_id() . "' onclick='javascript: return _markallread(this,\"category\",\"" . rss_feeds_folder_name() . "\");'>" . $existingText . '</a>';
     else
         return $existingText;
@@ -72 +73 @@
     $options = rss_plugins_get_option( MARKALLREAD_CONFIG_OPTIONS );
     if( $options & MARKALLREAD_OPTION_LINK_FOLDER )
-        return "<a title='".LBL_MARK_FOLDER_READ_ALL."' href='". getPath() ."feed.php?metaaction=LBL_MARK_FOLDER_READ&amp;folder=" . rss_feeds_folder_id() . "' onclick='javascript: return _markallread(this,\"folder\",\"" . rss_feeds_folder_name() . "\");'>" . $existingText . '</a>';
+        return "<a title='".__('Mark This Folder as Read')."' href='". getPath() ."feed.php?metaaction=ACT_MARK_FOLDER_READ&amp;folder=" . rss_feeds_folder_id() . "' onclick='javascript: return _markallread(this,\"folder\",\"" . rss_feeds_folder_name() . "\");'>" . $existingText . '</a>';
     else
         return $existingText;
@@ -83 +84 @@
     $options = rss_plugins_get_option( MARKALLREAD_CONFIG_OPTIONS );
     if( $options & MARKALLREAD_OPTION_LINK_FEED )
-        return "<a title='".LBL_MARK_CHANNEL_READ_ALL."' href='". getPath() ."feed.php?metaaction=LBL_MARK_CHANNEL_READ&amp;channel=" . $GLOBALS['rss']->currentFeedsFeed-> id . "' onclick='javascript: return _markallread(this,\"feed\",\"" . rss_feeds_feed_title() . "\");'>" . $existingText . '</a>';
+        return "<a title='".__('Mark This Feed as Read')."' href='". getPath() ."feed.php?metaaction=ACT_MARK_CHANNEL_READ&amp;channel=" . $GLOBALS['rss']->currentFeedsFeed-> id . "' onclick='javascript: return _markallread(this,\"feed\",\"" . rss_feeds_feed_title() . "\");'>" . $existingText . '</a>';
     else
         return $existingText;
@@ -93 +94 @@
 
     if(defined('MARK_READ_FEED_FORM')) {
-            $metaaction = "LBL_MARK_CHANNEL_READ";
+            $metaaction = "ACT_MARK_CHANNEL_READ";
             $id = 'name="channel" value="' . MARK_READ_FEED_FORM . '"';
-            $text = LBL_MARK_CHANNEL_READ_ALL;
+            $text = __('Mark This Feed as Read');
             if( $options & MARKALLREAD_OPTION_CONFIIRM )
                 $safety = ' onclick=\'javascript: return _confirmmarkallread("feed", "");\'';
     } elseif(defined('MARK_READ_FOLDER_FORM')) {
-            $metaaction = "LBL_MARK_FOLDER_READ";
+            $metaaction = "ACT_MARK_FOLDER_READ";
             $id = 'name="folder" value="' . MARK_READ_FOLDER_FORM . '"';
-            $text = LBL_MARK_FOLDER_READ_ALL;
+            $text = __('Mark This Folder as Read');
             if( $options & MARKALLREAD_OPTION_CONFIIRM )
                 $safety = ' onclick=\'javascript: return _confirmmarkallread("folder", "");\'';
     } elseif(defined('MARK_READ_VFOLDER_FORM')){
-            $metaaction = "LBL_MARK_VFOLDER_READ";
+            $metaaction = "ACT_MARK_VFOLDER_READ";
             $id = 'name="vfolder" value="' . MARK_READ_VFOLDER_FORM . '"';
-            $text = LBL_MARK_CATEGORY_READ_ALL;
+            $text = __('Mark This Category as Read');
             if( $options & MARKALLREAD_OPTION_CONFIIRM )
                 $safety = ' onclick=\'javascript: return _confirmmarkallread("category", "");\'';

branches/multiuser/plugins/stickyflag/stickyflag.php

@@ -90 +90 @@
 
     print ("<fieldset>\n");
-    print ("  <legend>" . LBL_STICKY . " " . LBL_ITEMS . "</legend>\n");
+    print ("  <legend>" . __('Sticky') . " " . __('items') . "</legend>\n");
     print ("   <p><input id='ui_sm' type='checkbox' value='1' name='ui_sm'" . ($options & STICKYFLAG_ENABLE_STICKY_MENU ? "checked='1'" : "") . ">" 
                . "<label for='ui_sm'>Show Menu Item</label></br></p>\n");
@@ -98 +98 @@
     print ("</fieldset>\n");
     print ("<fieldset>\n");
-    print ("  <legend>" . LBL_FLAG . " " . LBL_ITEMS . "</legend>\n");
+    print ("  <legend>" . __('Flagged') . " " . __('items') . "</legend>\n");
     print ("    <p><input id='ui_fm' type='checkbox' value='1' name='ui_fm'" . ($options & STICKYFLAG_ENABLE_FLAG_MENU ? "checked='1'" : "") . ">"
                 . "<label for='ui_fm'>Show Menu Item</label></br></p>\n");