From 89cb787edd1c9d3c2fa2616c98986b130fcaf930 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Fri, 10 Aug 2007 17:16:43 +0100
Subject: more translation work

---
 modules/popup-dialog.php      | 12 ++++++------
 modules/pref-feed-browser.php |  8 ++++----
 modules/pref-filters.php      |  4 ++--
 modules/pref-prefs.php        | 19 ++++++++++---------
 4 files changed, 22 insertions(+), 21 deletions(-)

(limited to 'modules')

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 2805f7653..498514b08 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -59,7 +59,7 @@
 			print "<input type=\"hidden\" name=\"from\" value=\"tt-rss\">"; 
 
 			print "<table width='100%'>
-			<tr><td>Feed URL:</td><td>
+			<tr><td>".__('Feed URL:')."</td><td>
 				<input class=\"iedit\" onblur=\"javascript:enableHotkeys()\" 
 					onkeypress=\"return filterCR(event, qaddFeed)\"
 					onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\"
@@ -83,12 +83,12 @@
 
 			print "<div id='fadd_login_prompt'><br/>
 				<a href='javascript:showBlockElement(\"fadd_login_container\", 
-					\"fadd_login_prompt\")'>Click here if this feed requires authentication.</a></div>";
+					\"fadd_login_prompt\")'>".__('Click here if this feed requires authentication.')."</a></div>";
 
 			print "<div id='fadd_login_container'>
 				<table width='100%'>
-					<tr><td>Login:</td><td><input name='auth_login' class='iedit'></td></tr>
-					<tr><td>Password:</td><td><input type='password'
+					<tr><td>".__('Login:')."</td><td><input name='auth_login' class='iedit'></td></tr>
+					<tr><td>".__('Password:')."</td><td><input type='password'
 						name='auth_pass' class='iedit'></td></tr>
 				</table>
 				</div>";
@@ -259,7 +259,7 @@
 	
 			while ($line = db_fetch_assoc($result)) {
 				//array_push($filter_types, $line["description"]);
-				$filter_types[$line["id"]] = $line["description"];
+				$filter_types[$line["id"]] = __($line["description"]);
 			}
 
 			print "<table width='100%'>";
@@ -290,7 +290,7 @@
 				ORDER BY name");
 
 			while ($line = db_fetch_assoc($result)) {
-				printf("<option value='%d'>%s</option>", $line["id"], $line["description"]);
+				printf("<option value='%d'>%s</option>", $line["id"], __($line["description"]));
 			}
 	
 			print "</select>";
diff --git a/modules/pref-feed-browser.php b/modules/pref-feed-browser.php
index 104dd93f5..4759a5f6a 100644
--- a/modules/pref-feed-browser.php
+++ b/modules/pref-feed-browser.php
@@ -2,7 +2,7 @@
 	function module_pref_feed_browser($link) {
 
 		if (!ENABLE_FEED_BROWSER) {
-			print "Feed browser is administratively disabled.";
+			print __("Feed browser is administratively disabled.");
 			return;
 		}
 
@@ -12,7 +12,7 @@
 			$id = db_escape_string($_GET["id"]);
 
 			print "<div class=\"browserFeedInfo\">";
-			print "<b>Feed information:</b>";
+			print "<b>".__('Feed information:')."</b>";
 			print "<div class=\"detailsPart\">";
 
 			$result = db_query($link, "SELECT 
@@ -48,7 +48,7 @@
 
 			if (db_num_rows($result) > 0) {
 				
-				print "<b>Last headlines:</b><br>";
+				print "<b>".__('Last headlines:')."</b><br>";
 				
 				print "<div class=\"detailsPart\">";
 				print "<ul class=\"compact\">";
@@ -149,7 +149,7 @@
 		}
 
 		if ($feedctr == 0) {
-			print "<li>No feeds found to subscribe.</li>";
+			print "<li>".__('No feeds found to subscribe.')."</li>";
 		}
 
 		print "</ul>";
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 3c0f6129c..e043323e0 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -37,7 +37,7 @@
 	
 			while ($line = db_fetch_assoc($result)) {
 				//array_push($filter_types, $line["description"]);
-				$filter_types[$line["id"]] = $line["description"];
+				$filter_types[$line["id"]] = __($line["description"]);
 			}
 
 			print "<table width='100%'>";
@@ -69,7 +69,7 @@
 
 			while ($line = db_fetch_assoc($result)) {
 				$is_sel = ($line["id"] == $action_id) ? "selected" : "";			
-				printf("<option value='%d' $is_sel>%s</option>", $line["id"], $line["description"]);
+				printf("<option value='%d' $is_sel>%s</option>", $line["id"], __($line["description"]));
 			}
 	
 			print "</select>";
diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index 036a7607f..7ade0391b 100644
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -56,7 +56,7 @@
 
 			return;
 
-		} else if ($subop == "Save configuration") {
+		} else if ($subop == __("Save configuration")) {
 
 			$_SESSION["prefs_op_result"] = "save-config";
 
@@ -124,7 +124,7 @@
 		
 			return;
 
-		} else if ($subop == "Reset to defaults") {
+		} else if ($subop == __("Reset to defaults")) {
 
 			$_SESSION["prefs_op_result"] = "reset-to-defaults";
 
@@ -282,7 +282,7 @@
 	 			print "<tr><td colspan='3'><h3>".__("Themes")."</h3></tr></td>";
 				print "<tr><td width=\"40%\">".__("Select theme")."</td>";
 				print "<td><select name=\"theme\">";
-				print "<option>Default</option>";
+				print "<option value='Default'>".__('Default')."</option>";
 				print "<option disabled>--------</option>";				
 				
 				while ($line = db_fetch_assoc($result)) {	
@@ -296,8 +296,9 @@
 				print "</select></td></tr>";
 				print "</table>";
 				print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
+				print "<input type=\"hidden\" name=\"subop\" value=\"Change theme\">";
 				print "<p><input class=\"button\" type=\"submit\" 
-					value=\"Change theme\" name=\"subop\">";
+					value=\"".__('Change theme')."\">";
 				print "</form>";
 			}
 
@@ -332,7 +333,7 @@
 				
 					$active_section = $line["section_name"];				
 					
-					print "<tr><td colspan=\"3\"><h3>$active_section</h3></td></tr>";
+					print "<tr><td colspan=\"3\"><h3>".__($active_section)."</h3></td></tr>";
 //					print "<tr class=\"title\">
 //						<td width=\"25%\">Option</td><td>Value</td></tr>";
 
@@ -349,9 +350,9 @@
 				$def_value = $line["def_value"];
 				$help_text = $line["help_text"];
 
-				print "<td width=\"40%\" id=\"$pref_name\">" . $line["short_desc"];
+				print "<td width=\"40%\" id=\"$pref_name\">" . __($line["short_desc"]);
 
-				if ($help_text) print "<div class=\"prefHelp\">$help_text</div>";
+				if ($help_text) print "<div class=\"prefHelp\">".__($help_text)."</div>";
 				
 				print "</td>";
 
@@ -384,11 +385,11 @@
 			print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
 
 			print "<p><input class=\"button\" type=\"submit\" 
-				name=\"subop\" value=\"Save configuration\">";
+				name=\"subop\" value=\"".__('Save configuration')."\">";
 				
 			print "&nbsp;<input class=\"button\" type=\"submit\" 
 				name=\"subop\" onclick=\"return validatePrefsReset()\" 
-				value=\"Reset to defaults\"></p>";
+				value=\"".__('Reset to defaults')."\"></p>";
 
 			print "</form>";
 
-- 
cgit v1.2.3-54-g00ecf