more I18N

master
Andrew Dolgov 18 years ago
parent 22e007324c
commit 865cde4eaa

@ -2064,9 +2064,9 @@
function getFeedCatTitle($link, $id) { function getFeedCatTitle($link, $id) {
if ($id == -1) { if ($id == -1) {
return "Special"; return _("Special");
} else if ($id < -10) { } else if ($id < -10) {
return "Labels"; return _("Labels");
} else if ($id > 0) { } else if ($id > 0) {
$result = db_query($link, "SELECT ttrss_feed_categories.title $result = db_query($link, "SELECT ttrss_feed_categories.title
FROM ttrss_feeds, ttrss_feed_categories WHERE ttrss_feeds.id = '$id' AND FROM ttrss_feeds, ttrss_feed_categories WHERE ttrss_feeds.id = '$id' AND
@ -2074,7 +2074,7 @@
if (db_num_rows($result) == 1) { if (db_num_rows($result) == 1) {
return db_fetch_result($result, 0, "title"); return db_fetch_result($result, 0, "title");
} else { } else {
return "Uncategorized"; return _("Uncategorized");
} }
} else { } else {
return "getFeedCatTitle($id) failed"; return "getFeedCatTitle($id) failed";
@ -2084,7 +2084,7 @@
function getFeedTitle($link, $id) { function getFeedTitle($link, $id) {
if ($id == -1) { if ($id == -1) {
return "Starred articles"; return _("Starred articles");
} else if ($id < -10) { } else if ($id < -10) {
$label_id = -10 - $id; $label_id = -10 - $id;
$result = db_query($link, "SELECT description FROM ttrss_labels WHERE id = '$label_id'"); $result = db_query($link, "SELECT description FROM ttrss_labels WHERE id = '$label_id'");
@ -2352,12 +2352,12 @@
$last_error = db_fetch_result($result, 0, "last_error"); $last_error = db_fetch_result($result, 0, "last_error");
if ($search) { if ($search) {
$feed_title = "Feed search results ($search, $feed_title)"; $feed_title = _("Feed search results") . " ($search, $feed_title)";
} }
} }
} else if ($feed == -1) { } else if ($feed == -1) {
$feed_title = "Starred articles"; $feed_title = _("Starred articles");
} else if ($feed < -10) { } else if ($feed < -10) {
$label_id = -$feed - 11; $label_id = -$feed - 11;
$result = db_query($link, "SELECT description FROM ttrss_labels $result = db_query($link, "SELECT description FROM ttrss_labels
@ -2365,7 +2365,7 @@
$feed_title = db_fetch_result($result, 0, "description"); $feed_title = db_fetch_result($result, 0, "description");
if ($search) { if ($search) {
$feed_title = "Label search results ($search, $feed_title)"; $feed_title = _("Label search results") . " ($search, $feed_title)";
} }
} else { } else {
$feed_title = "?"; $feed_title = "?";
@ -2556,7 +2556,7 @@
} }
function prepare_headlines_digest($link, $user_id, $days = 1, $limit = 100) { function prepare_headlines_digest($link, $user_id, $days = 1, $limit = 100) {
$tmp = "New headlines for last 24 hours, as of " . date("Y/m/d H:m") . "\n"; $tmp = _("New headlines for last 24 hours, as of ") . date("Y/m/d H:m") . "\n";
$tmp .= "=======================================================\n\n"; $tmp .= "=======================================================\n\n";
if (DB_TYPE == "pgsql") { if (DB_TYPE == "pgsql") {
@ -2600,9 +2600,9 @@
} }
$tmp .= "--- \n"; $tmp .= "--- \n";
$tmp .= "You have been sent this email because you have enabled daily digests in Tiny Tiny RSS at " . $tmp .= _("You have been sent this email because you have enabled daily digests in Tiny Tiny RSS at ") .
DIGEST_HOSTNAME . "\n". DIGEST_HOSTNAME . "\n".
"To unsubscribe, visit your configuration options or contact instance owner.\n"; _("To unsubscribe, visit your configuration options or contact instance owner.\n");
return array($tmp, $headlines_count); return array($tmp, $headlines_count);
@ -2806,7 +2806,7 @@
/* virtual feeds */ /* virtual feeds */
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "<li class=\"feedCat\">Special</li>"; print "<li class=\"feedCat\">"._('Special')."</li>";
print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">"; print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">";
} }
@ -2816,7 +2816,7 @@
if ($num_starred > 0) $class .= "Unread"; if ($num_starred > 0) $class .= "Unread";
printFeedEntry(-1, $class, "Starred articles", $num_starred, printFeedEntry(-1, $class, _("Starred articles"), $num_starred,
"images/mark_set.png", $link); "images/mark_set.png", $link);
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
@ -2832,7 +2832,7 @@
if (db_num_rows($result) > 0) { if (db_num_rows($result) > 0) {
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "<li class=\"feedCat\">Labels</li>"; print "<li class=\"feedCat\">"._('Labels')."</li>";
print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">"; print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">";
} else { } else {
print "<li><hr></li>"; print "<li><hr></li>";
@ -2955,7 +2955,7 @@
$tmp_category = $line["category"]; $tmp_category = $line["category"];
if (!$tmp_category) { if (!$tmp_category) {
$tmp_category = "Uncategorized"; $tmp_category = _("Uncategorized");
} }
// $class = ($lnum % 2) ? "even" : "odd"; // $class = ($lnum % 2) ? "even" : "odd";
@ -2985,7 +2985,7 @@
$collapsed = $line["collapsed"]; $collapsed = $line["collapsed"];
// workaround for NULL category // workaround for NULL category
if ($category == "Uncategorized") { if ($category == _("Uncategorized")) {
if ($_COOKIE["ttrss_vf_uclps"] == 1) { if ($_COOKIE["ttrss_vf_uclps"] == 1) {
$collapsed = "t"; $collapsed = "t";
} }
@ -3025,7 +3025,7 @@
} }
if (db_num_rows($result) == 0) { if (db_num_rows($result) == 0) {
print "<li>No feeds to display.</li>"; print "<li>"._('No feeds to display.')."</li>";
} }
} else { } else {
@ -3042,7 +3042,7 @@
ORDER BY tag_name"); */ ORDER BY tag_name"); */
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "<li class=\"feedCat\">Tags</li>"; print "<li class=\"feedCat\">"._('Tags')."</li>";
print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">"; print "<li id=\"feedCatHolder\"><ul class=\"feedCatList\">";
} }

@ -27,14 +27,14 @@
<body class="logoutBody"> <body class="logoutBody">
<div class="logoutContent"> <div class="logoutContent">
<h1>You have been logged out.</h1> <h1><?php echo _('You have been logged out.') ?></h1>
<p><span class="logoutWarning">Warning:</span> <p><?php echo _('<span class="logoutWarning">Warning:</span>
As there is no way to reliably clear HTTP Authentication As there is no way to reliably clear HTTP Authentication
credentials from your browser, it is recommended for you to close credentials from your browser, it is recommended for you to close
this browser window, otherwise your browser could automatically this browser window, otherwise your browser could automatically
authenticate again using previously supplied credentials, which authenticate again using previously supplied credentials, which
is a security risk.</p> is a security risk.') ?></p>
</div> </div>
</body> </body>

Loading…
Cancel
Save