valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more I18N work, new option: ENABLE_TRANSLATIONS

This commit is contained in:
Andrew Dolgov 2007-03-05 10:24:13 +01:00
parent 1025ad8763
commit cc17c20574
7 changed files with 64 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.php-dist
View File

@ -138,7 +138,11 @@
// If update daemon and update_feeds should send digests // If update daemon and update_feeds should send digests
// Disable if you prefer querying special URL (see wiki) // Disable if you prefer querying special URL (see wiki)
define('CONFIG_VERSION', 6); define('ENABLE_TRANSLATIONS', false);
// Enable experimental support for interface translations
// based on PHP-Gettext. This is of no much use right now.
define('CONFIG_VERSION', 7);
// Expected config version. Please update this option in config.php // Expected config version. Please update this option in config.php
// if necessary (after migrating all new options from this file). // if necessary (after migrating all new options from this file).

7
functions.php
View File

@ -9,9 +9,12 @@
require_once "accept-to-gettext.php"; require_once "accept-to-gettext.php";
require_once "gettext/gettext.inc"; require_once "gettext/gettext.inc";
startup_gettext();
require_once 'config.php'; require_once 'config.php';
if (ENABLE_TRANSLATIONS == true) {
startup_gettext();
}
require_once 'db-prefs.php'; require_once 'db-prefs.php';
require_once 'compat.php'; require_once 'compat.php';
require_once 'errors.php'; require_once 'errors.php';

92
modules/popup-dialog.php
View File

@ -5,11 +5,11 @@
if ($id == "explainError") { if ($id == "explainError") {
print "<div id=\"infoBoxTitle\">Notice</div>"; print "<div id=\"infoBoxTitle\">".__('Notice')."</div>";
print "<div class=\"infoBoxContents\">"; print "<div class=\"infoBoxContents\">";
if ($param == 1) { if ($param == 1) {
print _("Update daemon is enabled in configuration, but daemon print __("Update daemon is enabled in configuration, but daemon
process is not running, which prevents all feeds from updating. Please process is not running, which prevents all feeds from updating. Please
start the daemon process or contact instance owner."); start the daemon process or contact instance owner.");
} }
@ -18,7 +18,7 @@
$msg = check_for_update($link, false); $msg = check_for_update($link, false);
if (!$msg) { if (!$msg) {
print _("You are running the latest version of Tiny Tiny RSS. The print __("You are running the latest version of Tiny Tiny RSS. The
fact that you are seeing this dialog is probably a bug."); fact that you are seeing this dialog is probably a bug.");
} else { } else {
print $msg; print $msg;
@ -32,7 +32,7 @@
print "<input class=\"button\" print "<input class=\"button\"
type=\"submit\" onclick=\"return closeInfoBox()\" type=\"submit\" onclick=\"return closeInfoBox()\"
value=\"Close this window\">"; value=\"".__('Close this window')."\">";
print "</div>"; print "</div>";
@ -40,7 +40,7 @@
if ($id == "quickAddFeed") { if ($id == "quickAddFeed") {
print "<div id=\"infoBoxTitle\">Subscribe to feed</div>"; print "<div id=\"infoBoxTitle\">".__('Subscribe to feed')."</div>";
print "<div class=\"infoBoxContents\">"; print "<div class=\"infoBoxContents\">";
print "<form id='feed_add_form' onsubmit='return false'>"; print "<form id='feed_add_form' onsubmit='return false'>";
@ -58,7 +58,7 @@
onfocus=\"javascript:disableHotkeys()\" name=\"feed_url\"></td></tr>"; onfocus=\"javascript:disableHotkeys()\" name=\"feed_url\"></td></tr>";
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "<tr><td>Category:</td><td>"; print "<tr><td>".__('Category:')."</td><td>";
print_feed_cat_select($link, "cat_id"); print_feed_cat_select($link, "cat_id");
print "</td></tr>"; print "</td></tr>";
} }
@ -69,15 +69,15 @@
print "<div align='right'> print "<div align='right'>
<input class=\"button\" <input class=\"button\"
id=\"fadd_submit_btn\" disabled=\"true\" id=\"fadd_submit_btn\" disabled=\"true\"
type=\"submit\" onclick=\"return qafAdd()\" value=\"Subscribe\"> type=\"submit\" onclick=\"return qafAdd()\" value=\"".__('Subscribe')."\">
<input class=\"button\" <input class=\"button\"
type=\"submit\" onclick=\"return closeInfoBox()\" type=\"submit\" onclick=\"return closeInfoBox()\"
value=\"Cancel\"></div>"; value=\"".__('Cancel')."\"></div>";
} }
if ($id == "search") { if ($id == "search") {
print "<div id=\"infoBoxTitle\">Search</div>"; print "<div id=\"infoBoxTitle\">".__('Search')."</div>";
print "<div class=\"infoBoxContents\">"; print "<div class=\"infoBoxContents\">";
print "<form id='search_form' onsubmit='return false'>"; print "<form id='search_form' onsubmit='return false'>";
@ -89,7 +89,7 @@
$active_feed_id = sprintf("%d", $params[0]); $active_feed_id = sprintf("%d", $params[0]);
$is_cat = $params[1] == "true"; $is_cat = $params[1] == "true";
print "<table width='100%'><tr><td>Search:</td><td>"; print "<table width='100%'><tr><td>".__('Search:')."</td><td>";
print "<input name=\"query\" class=\"iedit\" print "<input name=\"query\" class=\"iedit\"
onkeypress=\"return filterCR(event, search)\" onkeypress=\"return filterCR(event, search)\"
@ -98,10 +98,10 @@
value=\"\"> value=\"\">
</td></tr>"; </td></tr>";
print "<tr><td>Where:</td><td>"; print "<tr><td>".__('Where:')."</td><td>";
print "<select name=\"search_mode\"> print "<select name=\"search_mode\">
<option value=\"all_feeds\">All feeds</option>"; <option value=\"all_feeds\">".__('All feeds')."</option>";
$feed_title = getFeedTitle($link, $active_feed_id); $feed_title = getFeedTitle($link, $active_feed_id);
@ -112,9 +112,9 @@
} }
if ($active_feed_id && !$is_cat) { if ($active_feed_id && !$is_cat) {
print "<option selected value=\"this_feed\">This feed ($feed_title)</option>"; print "<option selected value=\"this_feed\">$feed_title</option>";
} else { } else {
print "<option disabled>This feed</option>"; print "<option disabled>".__('This feed')."</option>";
} }
if ($is_cat) { if ($is_cat) {
@ -122,19 +122,19 @@
} }
if (get_pref($link, 'ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) { if (get_pref($link, 'ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) {
print "<option $cat_preselected value=\"this_cat\">This category ($feed_cat_title)</option>"; print "<option $cat_preselected value=\"this_cat\">$feed_cat_title</option>";
} else { } else {
print "<option disabled>This category</option>"; print "<option disabled>".__('This category')."</option>";
} }
print "</select></td></tr>"; print "</select></td></tr>";
print "<tr><td>Match on:</td><td>"; print "<tr><td>".__('Match on:')."</td><td>";
$search_fields = array( $search_fields = array(
"title" => "Title", "title" => __("Title"),
"content" => "Content", "content" => __("Content"),
"both" => "Title or content"); "both" => __("Title or content"));
print_select_hash("match_on", 3, $search_fields); print_select_hash("match_on", 3, $search_fields);
@ -146,17 +146,17 @@
<input type=\"submit\" <input type=\"submit\"
class=\"button\" onclick=\"javascript:search()\" class=\"button\" onclick=\"javascript:search()\"
id=\"search_submit_btn\" disabled=\"true\" id=\"search_submit_btn\" disabled=\"true\"
value=\"Search\"> value=\"".__('Search')."\">
<input class=\"button\" <input class=\"button\"
type=\"submit\" onclick=\"javascript:searchCancel()\" type=\"submit\" onclick=\"javascript:searchCancel()\"
value=\"Cancel\"></div>"; value=\"".__('Cancel')."\"></div>";
print "</div>"; print "</div>";
} }
if ($id == "quickAddLabel") { if ($id == "quickAddLabel") {
print "<div id=\"infoBoxTitle\">Create label</div>"; print "<div id=\"infoBoxTitle\">".__('Create label')."</div>";
print "<div class=\"infoBoxContents\">"; print "<div class=\"infoBoxContents\">";
print "<form id=\"label_edit_form\" onsubmit='return false'>"; print "<form id=\"label_edit_form\" onsubmit='return false'>";
@ -166,7 +166,7 @@
print "<table width='100%'>"; print "<table width='100%'>";
print "<tr><td>Caption:</td> print "<tr><td>".__('Caption:')."</td>
<td><input onkeypress=\"return filterCR(event, addLabel)\" <td><input onkeypress=\"return filterCR(event, addLabel)\"
onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\" onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\" onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
@ -175,7 +175,7 @@
print "</td></tr>"; print "</td></tr>";
print "<tr><td colspan=\"2\"> print "<tr><td colspan=\"2\">
<p>SQL Expression:</p>"; <p>".__('SQL Expression:')."</p>";
print "<textarea onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\" print "<textarea onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
rows=\"4\" name=\"sql_exp\" class=\"iedit\"></textarea>"; rows=\"4\" name=\"sql_exp\" class=\"iedit\"></textarea>";
@ -188,25 +188,25 @@
print "<div align='right'>"; print "<div align='right'>";
print "<input type=\"submit\" onclick=\"labelTest()\" value=\"Test\"> print "<input type=\"submit\" onclick=\"labelTest()\" value=\"".__('Test')."\">
"; ";
print "<input type=\"submit\" print "<input type=\"submit\"
id=\"infobox_submit\" id=\"infobox_submit\"
disabled=\"true\" disabled=\"true\"
class=\"button\" onclick=\"return addLabel()\" class=\"button\" onclick=\"return addLabel()\"
value=\"Create\"> "; value=\"".__('Create')."\"> ";
print "<input class=\"button\" print "<input class=\"button\"
type=\"submit\" onclick=\"return labelEditCancel()\" type=\"submit\" onclick=\"return labelEditCancel()\"
value=\"Cancel\">"; value=\"".__('Cancel')."\">";
} }
if ($id == "quickAddFilter") { if ($id == "quickAddFilter") {
$active_feed_id = db_escape_string($_GET["param"]); $active_feed_id = db_escape_string($_GET["param"]);
print "<div id=\"infoBoxTitle\">Create filter</div>"; print "<div id=\"infoBoxTitle\">".__('Create filter')."</div>";
print "<div class=\"infoBoxContents\">"; print "<div class=\"infoBoxContents\">";
print "<form id=\"filter_add_form\" onsubmit='return false'>"; print "<form id=\"filter_add_form\" onsubmit='return false'>";
@ -229,24 +229,24 @@
print "<table width='100%'>"; print "<table width='100%'>";
print "<tr><td>Match:</td> print "<tr><td>".__('Match:')."</td>
<td><input onkeypress=\"return filterCR(event, qaddFilter)\" <td><input onkeypress=\"return filterCR(event, qaddFilter)\"
onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\" onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\" onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
name=\"reg_exp\" class=\"iedit\">"; name=\"reg_exp\" class=\"iedit\">";
print "</td></tr><tr><td>On field:</td><td>"; print "</td></tr><tr><td>".__('On field:')."</td><td>";
print_select_hash("filter_type", 1, $filter_types, "class=\"_iedit\""); print_select_hash("filter_type", 1, $filter_types, "class=\"_iedit\"");
print "</td></tr>"; print "</td></tr>";
print "<tr><td>Feed:</td><td colspan='2'>"; print "<tr><td>".__('Feed:')."</td><td colspan='2'>";
print_feed_select($link, "feed_id", $active_feed_id); print_feed_select($link, "feed_id", $active_feed_id);
print "</td></tr>"; print "</td></tr>";
print "<tr><td>Action:</td>"; print "<tr><td>".__('Action:')."</td>";
print "<td colspan='2'><select name=\"action_id\" print "<td colspan='2'><select name=\"action_id\"
onchange=\"filterDlgCheckAction(this)\">"; onchange=\"filterDlgCheckAction(this)\">";
@ -262,14 +262,14 @@
print "</td></tr>"; print "</td></tr>";
print "<tr><td>Params:</td>"; print "<tr><td>".__('Params:')."</td>";
print "<td><input disabled class='iedit' name='action_param'></td></tr>"; print "<td><input disabled class='iedit' name='action_param'></td></tr>";
print "<tr><td valign='top'>Options:</td><td>"; print "<tr><td valign='top'>".__('Options:')."</td><td>";
print "<input type=\"checkbox\" name=\"inverse\" id=\"inverse\"> print "<input type=\"checkbox\" name=\"inverse\" id=\"inverse\">
<label for=\"inverse\">Inverse match</label></td></tr>"; <label for=\"inverse\">".__('Inverse match')."</label></td></tr>";
print "</table>"; print "</table>";
@ -280,11 +280,11 @@
print "<input type=\"submit\" print "<input type=\"submit\"
id=\"infobox_submit\" id=\"infobox_submit\"
class=\"button\" onclick=\"return qaddFilter()\" class=\"button\" onclick=\"return qaddFilter()\"
disabled=\"true\" value=\"Create\"> "; disabled=\"true\" value=\"".__('Create')."\"> ";
print "<input class=\"button\" print "<input class=\"button\"
type=\"submit\" onclick=\"return closeInfoBox()\" type=\"submit\" onclick=\"return closeInfoBox()\"
value=\"Cancel\">"; value=\"".__('Cancel')."\">";
print "</div>"; print "</div>";
@ -294,10 +294,10 @@
if ($id == "feedUpdateErrors") { if ($id == "feedUpdateErrors") {
print "<div id=\"infoBoxTitle\">Update Errors</div>"; print "<div id=\"infoBoxTitle\">".__('Update Errors')."</div>";
print "<div class=\"infoBoxContents\">"; print "<div class=\"infoBoxContents\">";
print "These feeds have not been updated because of errors:"; print __("These feeds have not been updated because of errors:");
$result = db_query($link, "SELECT id,title,feed_url,last_error $result = db_query($link, "SELECT id,title,feed_url,last_error
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]); FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
@ -316,7 +316,7 @@
print "<input class=\"button\" print "<input class=\"button\"
type=\"submit\" onclick=\"return closeInfoBox()\" type=\"submit\" onclick=\"return closeInfoBox()\"
value=\"Close\">"; value=\"".__('Close')."\">";
print "</div>"; print "</div>";
@ -324,12 +324,12 @@
if ($id == "editArticleTags") { if ($id == "editArticleTags") {
print "<div id=\"infoBoxTitle\">Edit Tags</div>"; print "<div id=\"infoBoxTitle\">".__('Edit Tags')."</div>";
print "<div class=\"infoBoxContents\">"; print "<div class=\"infoBoxContents\">";
print "<form id=\"tag_edit_form\" onsubmit='return false'>"; print "<form id=\"tag_edit_form\" onsubmit='return false'>";
print "Tags for this article (separated by commas):<br>"; print __("Tags for this article (separated by commas):")."<br>";
$tags = get_article_tags($link, $param); $tags = get_article_tags($link, $param);
@ -341,7 +341,7 @@
print "<tr><td colspan='2'><textarea rows='4' class='iedit' name='tags_str'>$tags_str</textarea></td></tr>"; print "<tr><td colspan='2'><textarea rows='4' class='iedit' name='tags_str'>$tags_str</textarea></td></tr>";
print "<tr><td>Add existing tag:</td>"; print "<tr><td>".__('Add existing tag:')."</td>";
$result = db_query($link, "SELECT DISTINCT tag_name FROM ttrss_tags $result = db_query($link, "SELECT DISTINCT tag_name FROM ttrss_tags
WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY tag_name"); WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY tag_name");
@ -370,11 +370,11 @@
print "<input class=\"button\" print "<input class=\"button\"
type=\"submit\" onclick=\"return editTagsSave()\" type=\"submit\" onclick=\"return editTagsSave()\"
value=\"Save\"> "; value=\"".__('Save')."\"> ";
print "<input class=\"button\" print "<input class=\"button\"
type=\"submit\" onclick=\"return closeInfoBox()\" type=\"submit\" onclick=\"return closeInfoBox()\"
value=\"Cancel\">"; value=\"".__('Cancel')."\">";
print "</div>"; print "</div>";

2
prefs.php
View File

@ -87,7 +87,7 @@ window.onload = init;
<?php if (!SINGLE_USER_MODE) { ?> <?php if (!SINGLE_USER_MODE) { ?>
<div style="float : right"> <div style="float : right">
<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b>
(<a href="logout.php">Logout</a>) (<a href="logout.php"><?= __('Logout') ?></a>)
</div> </div>
<?php } ?> <?php } ?>
<img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/> <img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/>

4
sanity_check.php
View File

@ -1,7 +1,7 @@
<?php <?php
require_once "functions.php"; require_once "functions.php";
define('EXPECTED_CONFIG_VERSION', 5); define('EXPECTED_CONFIG_VERSION', 7);
if (!file_exists("config.php")) { if (!file_exists("config.php")) {
print __("<b>Fatal Error</b>: You forgot to copy print __("<b>Fatal Error</b>: You forgot to copy
@ -12,7 +12,7 @@
require_once "config.php"; require_once "config.php";
if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) { if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
return __("config: your config file version is incorrect. See config.php-dist.\n"); $err_msg = __("config: your config file version is incorrect. See config.php-dist.\n");
} }
if (defined('RSS_BACKEND_TYPE')) { if (defined('RSS_BACKEND_TYPE')) {

4
tt-rss.css
View File

@ -1499,3 +1499,7 @@ ul.headlineDropdownMenu ul li:hover {
a.helpLinkPic { a.helpLinkPic {
float : right; float : right;
} }
a.helpLinkPic img {
border-width : 0px;
}

2
tt-rss.php
View File

@ -105,7 +105,7 @@ window.onload = init;
<div style="float : right"> <div style="float : right">
<?php if (!SINGLE_USER_MODE) { ?> <?php if (!SINGLE_USER_MODE) { ?>
<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b>
(<a href="logout.php">Logout</a>) (<a href="logout.php"><?= __('Logout') ?></a>)
<?php } ?> <?php } ?>
<img id="newVersionIcon" onclick="javascript:explainError(2)" <img id="newVersionIcon" onclick="javascript:explainError(2)"
src="images/new_version.png" title="New version is available!" src="images/new_version.png" title="New version is available!"