i18n: filters, users, prefs

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 5a3f84517d0fd3e978e526ef183e720732933d10..1f5a9d9dad79e1674e94e253a4162dc1f0c372f5 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -747,7 +747,7 @@
                        <input id=\"feed_search\" size=\"20\"  
                                onchange=\"javascript:updateFeedList()\" value=\"$feed_search\">
                        <input type=\"submit\" class=\"button\" 
-                               onclick=\"javascript:updateFeedList()\" value=\"Search\">
+                               onclick=\"javascript:updateFeedList()\" value=\"".__('Search')."\">
                        </div>";
 
                print "<div class=\"prefGenericAddBox\">
@@ -761,7 +761,7 @@
 
                if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
                        print " <input type=\"submit\" class=\"button\"
-                               onclick=\"javascript:browseFeeds()\" value=\"Top 25\">";
+                               onclick=\"javascript:browseFeeds()\" value=\"".__('Top 25')."\">";
                }
 
                print "</div>";
@@ -953,42 +953,31 @@
 
                        print "<p><span id=\"feedOpToolbar\">";
        
-                       if ($subop == "edit") {
-                               print "Edit feed:&nbsp;
-                                       <input type=\"submit\" class=\"button\" 
-                                               onclick=\"javascript:feedEditCancel()\" value=\"Cancel\">
-                                       <input type=\"submit\" class=\"button\" 
-                                               onclick=\"javascript:feedEditSave()\" value=\"Save\">";
-                       } else {
-       
-                               print "
-                                       Selection:&nbsp;
-                               <input type=\"submit\" class=\"button\" disabled=\"true\"
-                                       onclick=\"javascript:editSelectedFeed()\" value=\"Edit\">
-                               <input type=\"submit\" class=\"button\" disabled=\"true\"
-                                       onclick=\"javascript:removeSelectedFeeds()\" value=\"Unsubscribe\">";
-
-                               if (get_pref($link, 'ENABLE_FEED_CATS')) {
+                       print "<input type=\"submit\" class=\"button\" disabled=\"true\"
+                               onclick=\"javascript:editSelectedFeed()\" value=\"".__('Edit')."\">
+                       <input type=\"submit\" class=\"button\" disabled=\"true\"
+                               onclick=\"javascript:removeSelectedFeeds()\" 
+                               value=\"".__('Unsubscribe')."\">";
 
-                                       print "&nbsp;|&nbsp;";                          
+                       if (get_pref($link, 'ENABLE_FEED_CATS')) {
 
-                                       print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled");
+                               print "&nbsp;|&nbsp;";                          
 
-                                       print " <input type=\"submit\" class=\"button\" disabled=\"true\"
-                                       onclick=\"javascript:categorizeSelectedFeeds()\" value=\"Recategorize\">";
+                               print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled");
 
-                               }
+                               print " <input type=\"submit\" class=\"button\" disabled=\"true\"
+                                       onclick=\"javascript:categorizeSelectedFeeds()\" value=\"".
+                                       __('Recategorize')."\">";
+                       }
                                
-                               print "</span>";
+                       print "</span>";
 
-                               if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
-                                       print " <input type=\"submit\" class=\"button\"
-                                               onclick=\"javascript:editFeedCats()\" value=\"Edit categories\">";
+                       if (get_pref($link, 'ENABLE_FEED_CATS')) {
 
-#                                      print "&nbsp;|&nbsp;";                          
+                               print " <input type=\"submit\" class=\"button\"
+                                       onclick=\"javascript:editFeedCats()\" value=\"".__('Edit categories')."\">";
 
-                               }
+#                              print "&nbsp;|&nbsp;";                          
 
                                }
                } else {
@@ -997,20 +986,20 @@
 
                }
 
-               print "<h3>OPML</h3>
+               print "<h3>".__('OPML')."</h3>
 
                <div style='float : left'>
                <form   enctype=\"multipart/form-data\" method=\"POST\" action=\"opml.php\">
                        File: <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
                        <input class=\"button\" name=\"op\" onclick=\"return validateOpmlImport();\"
-                               type=\"submit\" value=\"Import\">
+                               type=\"submit\" value=\"".__('Import')."\">
                                </form></div>";
 
                print "&nbsp; or &nbsp;";                               
 
                print "<input type=\"submit\" 
                        class=\"button\" onclick=\"gotoExportOpml()\" 
-                               value=\"Export OPML\">";                        
+                               value=\"".__('Export OPML')."\">";                      
 
        }
 ?>

diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index a126a595b3b839c4ffaf6969a27659ca15868523..e3447c1abc7286e978e4fb27f822a3045210cd89 100644 (file)
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -19,7 +19,7 @@
                        $enabled = sql_bool_to_bool(db_fetch_result($result, 0, "enabled"));
                        $inverse = sql_bool_to_bool(db_fetch_result($result, 0, "inverse"));
 
-                       print "<div id=\"infoBoxTitle\">Filter editor</div>";
+                       print "<div id=\"infoBoxTitle\">".__('Filter editor')."</div>";
                        print "<div class=\"infoBoxContents\">";
 
                        print "<form id=\"filter_edit_form\" onsubmit='return false'>";
@@ -48,18 +48,18 @@
                                         onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
                                         name=\"reg_exp\" class=\"iedit\" value=\"$reg_exp\">";
                        
-                       print "</td></tr><tr><td>On field:</td><td>";
+                       print "</td></tr><tr><td>".__('On field:')."</td><td>";
                        
                        print_select_hash("filter_type", $filter_type, $filter_types, "class=\"_iedit\"");      
        
                        print "</td></tr>";
-                       print "<tr><td>Feed:</td><td colspan='2'>";
+                       print "<tr><td>".__('Feed:')."</td><td colspan='2'>";
 
                        print_feed_select($link, "feed_id", $feed_id);
                        
                        print "</td></tr>";
        
-                       print "<tr><td>Action:</td>";
+                       print "<tr><td>".__('Action:')."</td>";
        
                        print "<td colspan='2'><select name=\"action_id\"
                                onchange=\"filterDlgCheckAction(this)\">";
@@ -76,7 +76,7 @@
 
                        print "</td></tr>";
 
-                       print "<tr><td>Params:</td>";
+                       print "<tr><td>".__('Params:')."</td>";
 
                        $param_disabled = ($action_id == 4) ? "" : "disabled";
 
@@ -91,7 +91,7 @@
 
                        print "<tr><td valign='top'>Options:</td><td>
                                        <input type=\"checkbox\" name=\"enabled\" id=\"enabled\" $checked>
-                                       <label for=\"enabled\">Enabled</label><br/>";
+                                       <label for=\"enabled\">".__('Enabled')."</label><br/>";
 
                        if ($inverse) {
                                $checked = "checked";
@@ -100,7 +100,7 @@
                        }
 
                        print "<input type=\"checkbox\" name=\"inverse\" id=\"inverse\" $checked>
-                               <label for=\"inverse\">Inverse match</label>";
+                               <label for=\"inverse\">".__('Inverse match')."</label>";
 
                        print "</td></tr></table>";
 
@@ -111,11 +111,11 @@
                        print "<input type=\"submit\" 
                                id=\"infobox_submit\"
                                class=\"button\" onclick=\"return filterEditSave()\" 
-                               value=\"Save\"> ";
+                               value=\"".__('Save')."\"> ";
 
                        print "<input class=\"button\"
                                type=\"submit\" onclick=\"return filterEditCancel()\" 
-                               value=\"Cancel\">";
+                               value=\"".__('Cancel')."\">";
 
                        print "</div>";
 
@@ -220,7 +220,7 @@
                        class=\"button\" 
                        onclick=\"return displayDlg('quickAddFilter', false)\" 
                        id=\"create_filter_btn\"
-                       value=\"Create filter\">"; 
+                       value=\"".__('Create filter')."\">"; 
 
                $result = db_query($link, "SELECT 
                                ttrss_filters.id AS id,reg_exp,
@@ -253,10 +253,10 @@
 
                        print "<tr class=\"title\">
                                                <td align='center' width=\"5%\">&nbsp;</td>
-                                               <td width=\"20%\"><a href=\"javascript:updateFilterList('reg_exp')\">Filter expression</a></td>
-                                               <td width=\"20%\"><a href=\"javascript:updateFilterList('feed_title')\">Feed</a></td>
-                                               <td width=\"15%\"><a href=\"javascript:updateFilterList('filter_type')\">Match</a></td>
-                                               <td width=\"15%\"><a href=\"javascript:updateFilterList('action_description')\">Action</a></td>";
+                                               <td width=\"20%\"><a href=\"javascript:updateFilterList('reg_exp')\">".__('Filter expression')."</a></td>
+                                               <td width=\"20%\"><a href=\"javascript:updateFilterList('feed_title')\">".__('Feed')."</a></td>
+                                               <td width=\"15%\"><a href=\"javascript:updateFilterList('filter_type')\">".__('Match')."</a></td>
+                                               <td width=\"15%\"><a href=\"javascript:updateFilterList('action_description')\">".__('Action')."</a></td>";
 
                        $lnum = 0;
                        
@@ -281,7 +281,7 @@
        
                                $line["reg_exp"] = htmlspecialchars(db_unescape_string($line["reg_exp"]));
        
-                               if (!$line["feed_title"]) $line["feed_title"] = "All feeds";
+                               if (!$line["feed_title"]) $line["feed_title"] = __("All feeds");
 
                                $line["feed_title"] = htmlspecialchars(db_unescape_string($line["feed_title"]));
 
@@ -290,7 +290,7 @@
 
                                if (!$enabled) {
                                        $line["reg_exp"] = "<span class=\"insensitive\">" . 
-                                               $line["reg_exp"] . " (Disabled)</span>";
+                                               $line["reg_exp"] . " " .  __("(Disabled)")."</span>";
                                        $line["feed_title"] = "<span class=\"insensitive\">" . 
                                                $line["feed_title"] . "</span>";
                                        $line["filter_type_descr"] = "<span class=\"insensitive\">" . 
@@ -308,7 +308,7 @@
                                $inverse_label = "";
 
                                if ($inverse) {
-                                       $inverse_label = " <span class='insensitive'>(Inverse)</span>";
+                                       $inverse_label = " <span class='insensitive'>".__('(Inverse)')."</span>";
                                }
        
                                print "<td><a href=\"javascript:editFilter($filter_id);\">" . 
@@ -323,19 +323,17 @@
                        }
        
                        if ($lnum == 0) {
-                               print "<tr><td colspan=\"4\" align=\"center\">No filters defined.</td></tr>";
+                               print "<tr><td colspan=\"4\" align=\"center\">".__('No filters defined.')."</td></tr>";
                        }
        
                        print "</table>";
 
                        print "<p id=\"filterOpToolbar\">";
 
-                       print "
-                                       Selection:
+                       print "<input type=\"submit\" class=\"button\" disabled=\"true\"
+                                       onclick=\"return editSelectedFilter()\" value=\"".__('Edit')."\">
                                <input type=\"submit\" class=\"button\" disabled=\"true\"
-                                       onclick=\"return editSelectedFilter()\" value=\"Edit\">
-                               <input type=\"submit\" class=\"button\" disabled=\"true\"
-                                       onclick=\"return removeSelectedFilters()\" value=\"Remove\">";
+                                       onclick=\"return removeSelectedFilters()\" value=\"".__('Remove')."\">";
 
                        print "</p>";
 
@@ -346,7 +344,7 @@
 
                } else {
 
-                       print "<p>No filters defined.</p>";
+                       print "<p>".__('No filters defined.')."</p>";
 
                }
        }

diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index 71d4d1cc8e2d43b5fdfa46924b84945d0415b388..ccd669fc296c55b466a79e9e84bdead05c7d4411 100644 (file)
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -198,7 +198,7 @@
                print"<input type=\"submit\" class=\"button\" 
                        id=\"label_create_btn\"
                        onclick=\"return displayDlg('quickAddLabel', false)\" 
-                       value=\"Create label\"></div>";
+                       value=\"".__('Create label')."\"></div>";
 
                $result = db_query($link, "SELECT 
                                id,sql_exp,description
@@ -223,8 +223,8 @@
 
                        print "<tr class=\"title\">
                                                <td width=\"5%\">&nbsp;</td>
-                                               <td width=\"30%\"><a href=\"javascript:updateLabelList('description')\">Caption</a></td>
-                                               <td width=\"50%\"><a href=\"javascript:updateLabelList('sql_exp')\">SQL Expression</a>
+                                               <td width=\"30%\"><a href=\"javascript:updateLabelList('description')\">".__('Caption')."</a></td>
+                                               <td width=\"50%\"><a href=\"javascript:updateLabelList('sql_exp')\">".__('SQL Expression')."</a>
                                                </td>
                                                </tr>";
                        
@@ -267,22 +267,20 @@
                        }
        
                        if ($lnum == 0) {
-                               print "<tr><td colspan=\"4\" align=\"center\">No labels defined.</td></tr>";
+                               print "<tr><td colspan=\"4\" align=\"center\">".__('No labels defined.')."</td></tr>";
                        }
        
                        print "</table>";
        
                        print "<p id=\"labelOpToolbar\">";
        
-                       print "
-                                       Selection:
+                       print "<input type=\"submit\" class=\"button\" disabled=\"true\"
+                                       onclick=\"javascript:editSelectedLabel()\" value=\"".__('Edit')."\">
                                <input type=\"submit\" class=\"button\" disabled=\"true\"
-                                       onclick=\"javascript:editSelectedLabel()\" value=\"Edit\">
-                               <input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:removeSelectedLabels()\" value=\"Remove\">";
+                               onclick=\"javascript:removeSelectedLabels()\" value=\"".__('Remove')."\">";
 
                } else {
-                       print "<p>No labels defined.</p>";
+                       print "<p>".__('No labels defined.')."</p>";
                }
        }
 ?>

diff --git a/modules/pref-users.php b/modules/pref-users.php
index 1e0b1dd381c1ec4b2a60e1221030e1571e0d2b61..be9660a345c078cb2d27dd6ddb8cd86d7014d487 100644 (file)
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -311,26 +311,15 @@
 
                print "<p id='userOpToolbar'>";
 
-/*             if ($subop == "edit") {
-                       print "Edit user:
-                               <input type=\"submit\" class=\"button\" 
-                                       onclick=\"javascript:userEditSave()\" value=\"Save\">
-                               <input type=\"submit\" class=\"button\" 
-                                       onclick=\"javascript:userEditCancel()\" value=\"Cancel\">";
-                                       
-               } else { */
-
-                       print "
-                               Selection:
+               print "                         
                        <input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:selectedUserDetails()\" value=\"User details\">
+                               onclick=\"javascript:selectedUserDetails()\" value=\"".__('User details')."\">
                        <input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:editSelectedUser()\" value=\"Edit\">
+                               onclick=\"javascript:editSelectedUser()\" value=\"".__('Edit')."\">
                        <input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:removeSelectedUsers()\" value=\"Remove\">
+                               onclick=\"javascript:removeSelectedUsers()\" value=\"".__('Remove')."\">
                        <input type=\"submit\" class=\"button\" disabled=\"true\"
-                               onclick=\"javascript:resetSelectedUserPass()\" value=\"Reset password\">";
+                               onclick=\"javascript:resetSelectedUserPass()\" value=\"".__('Reset password')."\">";
 
-//             }
        }
 ?>