From 2a52d96fe6365b1516241180e88df3492ae54e2f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 25 Jan 2009 18:19:09 +0100 Subject: localization fixes --- functions.js | 1 - modules/help.php | 2 +- modules/pref-feeds.php | 7 ++++--- modules/pref-prefs.php | 2 +- modules/pref-users.php | 18 ++---------------- register.php | 2 +- 6 files changed, 9 insertions(+), 23 deletions(-) diff --git a/functions.js b/functions.js index 229303c42..e9cbed91b 100644 --- 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 3f6968db7..415870d45 100644 --- a/modules/help.php +++ b/modules/help.php @@ -3,7 +3,7 @@ if (!$_GET["noheaders"]) { print " - Tiny Tiny RSS : Help + ".__('Help')." "; diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index bcd79e74a..fae1fbe2f 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -1316,7 +1316,8 @@ } if ($hidden) { - $edit_title = "$edit_title (Hidden)"; + $edit_title = "$edit_title ". + __('(Hidden)').""; $last_updated = "$last_updated"; $last_article = "$last_article"; } @@ -1329,8 +1330,8 @@ $parent_title = $line["parent_title"]; if ($parent_title) { - $parent_title = "(linked to - $parent_title)"; + $linked_to = sprintf(__("(linked to %s)"), $parent_title); + $parent_title = "$linked_to"; } print "" . "$edit_title $parent_title" . ""; diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php index a09c7f20c..3cd557d97 100644 --- 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 386c428b1..73313a8ad 100644 --- a/modules/pref-users.php +++ b/modules/pref-users.php @@ -14,7 +14,7 @@ $uid = sprintf("%d", $_GET["id"]); - print "
User details
"; + print "
".__('User details')."
"; print "
"; @@ -28,7 +28,7 @@ WHERE id = '$uid'"); if (db_num_rows($result) == 0) { - print "

User not found

"; + print "

".__('User not found')."

"; return; } @@ -36,8 +36,6 @@ $login = db_fetch_result($result, 0, "login"); - // print "

$login

"; - print ""; $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 ""; - // print ""; print ""; print ""; -/* $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 ""; */ - $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 15caf7d38..bb868beb4 100644 --- a/register.php +++ b/register.php @@ -190,7 +190,7 @@
Username$login
Access level$access_level
".__('Registered')."$created
".__('Last logged in')."$last_login
".__('Stored articles'). - "$stored_articles (${db_size}K)
- " +
-- cgit v1.2.3