From a3c159c45a26a47aebfa64f04f49867010c8255b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 5 Mar 2007 12:02:18 +0100 Subject: [PATCH] i18n: filters, users, prefs --- modules/pref-feeds.php | 55 ++++++++++++++++------------------------ modules/pref-filters.php | 46 ++++++++++++++++----------------- modules/pref-labels.php | 18 ++++++------- modules/pref-users.php | 21 ++++----------- 4 files changed, 57 insertions(+), 83 deletions(-) diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 5a3f84517..1f5a9d9da 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -747,7 +747,7 @@ + onclick=\"javascript:updateFeedList()\" value=\"".__('Search')."\"> "; print "
@@ -761,7 +761,7 @@ if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) { print " "; + onclick=\"javascript:browseFeeds()\" value=\"".__('Top 25')."\">"; } print "
"; @@ -953,42 +953,31 @@ print "

"; - if ($subop == "edit") { - print "Edit feed:  - - "; - } else { - - print " - Selection:  - - "; - - if (get_pref($link, 'ENABLE_FEED_CATS')) { + print " + "; - print " | "; + if (get_pref($link, 'ENABLE_FEED_CATS')) { - print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled"); + print " | "; - print " "; + print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled"); - } + print " "; + } - print ""; + print ""; - if (get_pref($link, 'ENABLE_FEED_CATS')) { - - print " "; + if (get_pref($link, 'ENABLE_FEED_CATS')) { -# print " | "; + print " "; - } +# print " | "; } } else { @@ -997,20 +986,20 @@ } - print "

OPML

+ print "

".__('OPML')."

File:   + type=\"submit\" value=\"".__('Import')."\">
"; print "  or  "; print ""; + value=\"".__('Export OPML')."\">"; } ?> diff --git a/modules/pref-filters.php b/modules/pref-filters.php index a126a595b..e3447c1ab 100644 --- 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 "
Filter editor
"; + print "
".__('Filter editor')."
"; print "
"; print "
"; @@ -48,18 +48,18 @@ onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\" name=\"reg_exp\" class=\"iedit\" value=\"$reg_exp\">"; - print "On field:"; + print "".__('On field:').""; print_select_hash("filter_type", $filter_type, $filter_types, "class=\"_iedit\""); print ""; - print "Feed:"; + print "".__('Feed:').""; print_feed_select($link, "feed_id", $feed_id); print ""; - print "Action:"; + print "".__('Action:').""; print " -
"; +
"; if ($inverse) { $checked = "checked"; @@ -100,7 +100,7 @@ } print " - "; + "; print ""; @@ -111,11 +111,11 @@ print " "; + value=\"".__('Save')."\"> "; print ""; + value=\"".__('Cancel')."\">"; print "
"; @@ -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 "   - Filter expression - Feed - Match - Action"; + ".__('Filter expression')." + ".__('Feed')." + ".__('Match')." + ".__('Action').""; $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"] = "" . - $line["reg_exp"] . " (Disabled)"; + $line["reg_exp"] . " " . __("(Disabled)").""; $line["feed_title"] = "" . $line["feed_title"] . ""; $line["filter_type_descr"] = "" . @@ -308,7 +308,7 @@ $inverse_label = ""; if ($inverse) { - $inverse_label = " (Inverse)"; + $inverse_label = " ".__('(Inverse)').""; } print "" . @@ -323,19 +323,17 @@ } if ($lnum == 0) { - print "No filters defined."; + print "".__('No filters defined.').""; } print ""; print "

"; - print " - Selection: + print " - "; + onclick=\"return removeSelectedFilters()\" value=\"".__('Remove')."\">"; print "

"; @@ -346,7 +344,7 @@ } else { - print "

No filters defined.

"; + print "

".__('No filters defined.')."

"; } } diff --git a/modules/pref-labels.php b/modules/pref-labels.php index 71d4d1cc8..ccd669fc2 100644 --- a/modules/pref-labels.php +++ b/modules/pref-labels.php @@ -198,7 +198,7 @@ print""; + value=\"".__('Create label')."\">"; $result = db_query($link, "SELECT id,sql_exp,description @@ -223,8 +223,8 @@ print "   -
Caption - SQL Expression + ".__('Caption')." + ".__('SQL Expression')." "; @@ -267,22 +267,20 @@ } if ($lnum == 0) { - print "No labels defined."; + print "".__('No labels defined.').""; } print ""; print "

"; - print " - Selection: + print " - "; + onclick=\"javascript:removeSelectedLabels()\" value=\"".__('Remove')."\">"; } else { - print "

No labels defined.

"; + print "

".__('No labels defined.')."

"; } } ?> diff --git a/modules/pref-users.php b/modules/pref-users.php index 1e0b1dd38..be9660a34 100644 --- a/modules/pref-users.php +++ b/modules/pref-users.php @@ -311,26 +311,15 @@ print "

"; -/* if ($subop == "edit") { - print "Edit user: - - "; - - } else { */ - - print " - Selection: + print " + onclick=\"javascript:selectedUserDetails()\" value=\"".__('User details')."\"> + onclick=\"javascript:editSelectedUser()\" value=\"".__('Edit')."\"> + onclick=\"javascript:removeSelectedUsers()\" value=\"".__('Remove')."\"> "; + onclick=\"javascript:resetSelectedUserPass()\" value=\"".__('Reset password')."\">"; -// } } ?>