]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3c374d6)
localization fixes
authorAndrew Dolgov <fox@bah.spb.su>
Sun, 25 Jan 2009 17:19:09 +0000 (18:19 +0100)
committerAndrew Dolgov <fox@bah.spb.su>
Sun, 25 Jan 2009 17:19:09 +0000 (18:19 +0100)
functions.js patch | blob | blame | history
modules/help.php patch | blob | blame | history
modules/pref-feeds.php patch | blob | blame | history
modules/pref-prefs.php patch | blob | blame | history
modules/pref-users.php patch | blob | blame | history
register.php patch | blob | blame | history

diff --git a/functions.js b/functions.js
index 229303c42fe5485347e61ca193d637bf46d58af5..e9cbed91b8fb996f3daf046104af8340bb6c74c8 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -1852,7 +1852,6 @@ function displayHelpInfobox(topic_id) {
        var w = window.open(url, "ttrss_help", 
                "status=0,toolbar=0,location=0,width=450,height=500,scrollbars=1,menubar=0");
 
-       return false;
 }
 
 function focus_element(id) {
diff --git a/modules/help.php b/modules/help.php
index 3f6968db7ef15906768f72c2726f59bb916b1144..415870d4597a4c98d8ea900d1b6eadbe3149f1e5 100644 (file)
--- a/modules/help.php
+++ b/modules/help.php
@@ -3,7 +3,7 @@
 
                if (!$_GET["noheaders"]) {
                        print "<html><head>
-                               <title>Tiny Tiny RSS : Help</title>
+                               <title>".__('Help')."</title>
                                <link rel=\"stylesheet\" href=\"utility.css\" type=\"text/css\">
                                <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
                                </head><body>";
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index bcd79e74a51b5f49a9ac302e7226357e50428626..fae1fbe2fd2a4fc3caeae2165a443803f94f3b5e 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1316,7 +1316,8 @@
                                }
 
                                if ($hidden) {
-                                       $edit_title = "<span class=\"insensitive\">$edit_title (Hidden)</span>";
+                                       $edit_title = "<span class=\"insensitive\">$edit_title ".
+                                               __('(Hidden)')."</span>";
                                        $last_updated = "<span class=\"insensitive\">$last_updated</span>";
                                        $last_article = "<span class=\"insensitive\">$last_article</span>";
                                }
@@ -1329,8 +1330,8 @@
 
                                $parent_title = $line["parent_title"];
                                if ($parent_title) {
-                                       $parent_title = "<span class='groupPrompt'>(linked to 
-                                               $parent_title)</span>";
+                                       $linked_to = sprintf(__("(linked to %s)"), $parent_title);
+                                       $parent_title = "<span class='groupPrompt'>$linked_to</span>";
                                }
 
                                print "<td $onclick>" . "$edit_title $parent_title" . "</td>";
diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index a09c7f20c34fc5ed4029b2bc1472e61eb50af929..3cd557d977564c9eba0f2c39579f3b01240f3f24 100644 (file)
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -129,7 +129,7 @@
                                $help_text = db_fetch_result($result, 0, "help_text");
                                print $help_text;
                        } else {
-                               print "Unknown option: $pref_name";
+                               printf(__("Unknown option: %s"), $pref_name);
                        }
 
                } else if ($subop == "change-email") {
diff --git a/modules/pref-users.php b/modules/pref-users.php
index 386c428b187005f430748fd984fff6b6d035440a..73313a8ad4eb3205819d8aef4929c790c817e991 100644 (file)
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -14,7 +14,7 @@
 
                        $uid = sprintf("%d", $_GET["id"]);
 
-                       print "<div id=\"infoBoxTitle\">User details</div>";
+                       print "<div id=\"infoBoxTitle\">".__('User details')."</div>";
 
                        print "<div class='infoBoxContents'>";
 
@@ -28,7 +28,7 @@
                                WHERE id = '$uid'");
                                
                        if (db_num_rows($result) == 0) {
-                               print "<h1>User not found</h1>";
+                               print "<h1>".__('User not found')."</h1>";
                                return;
                        }
                        
@@ -36,8 +36,6 @@
 
                        $login = db_fetch_result($result, 0, "login");
 
-                       // print "<h1>$login</h1>";
-
                        print "<table width='100%'>";
 
                        $last_login = date(get_pref($link, 'LONG_DATE_FORMAT'),
@@ -49,21 +47,9 @@
                        $access_level = db_fetch_result($result, 0, "access_level");
                        $stored_articles = db_fetch_result($result, 0, "stored_articles");
 
-                       // print "<tr><td>Username</td><td>$login</td></tr>";
-                       // print "<tr><td>Access level</td><td>$access_level</td></tr>";
                        print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
                        print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
 
-/*                     $result = db_query($link, "SELECT 
-                               SUM(LENGTH(content)) AS db_size 
-                               FROM ttrss_user_entries,ttrss_entries 
-                                       WHERE owner_uid = '$uid' AND ref_id = id");
-
-                       $db_size = round(db_fetch_result($result, 0, "db_size") / 1024);
-
-                       print "<tr><td>".__('Stored articles').
-                               "</td><td>$stored_articles (${db_size}K)</td></tr>"; */
-
                        $result = db_query($link, "SELECT COUNT(id) as num_feeds FROM ttrss_feeds
                                WHERE owner_uid = '$uid'");
 
diff --git a/register.php b/register.php
index 15caf7d3838d1536e7c139574cb172dddfe4c9b2..bb868beb4ba9a37e1562ef4e6ee141187c3f4ffe 100644 (file)
--- a/register.php
+++ b/register.php
@@ -190,7 +190,7 @@
        <td><?php echo __('How much is two plus two:') ?></td><td>
                <input name="turing_test"></td></tr>
        <tr><td colspan="2" align="right">
-       <input type="submit" name="sub_btn" value="<?php echo __('Submit registration"') ?>"
+       <input type="submit" name="sub_btn" value="<?php echo __('Submit registration') ?>"
                        disabled="true" onclick='return validateRegForm()'>
        </td></tr>
        </table>
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/