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

config: remove ENABLE_TRANSLATIONS

This commit is contained in:
Andrew Dolgov 2011-03-18 19:25:06 +03:00
parent 565ca5653c
commit 7b26a148b0
7 changed files with 49 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend.php
View File

@ -24,9 +24,7 @@
no_cache_incantation(); no_cache_incantation();
if (ENABLE_TRANSLATIONS == true) { startup_gettext();
startup_gettext();
}
$script_started = getmicrotime(); $script_started = getmicrotime();

3
config.php-dist
View File

@ -82,9 +82,6 @@
// 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('ENABLE_TRANSLATIONS', true);
// Enable support for interface translations
define('MYSQL_CHARSET', 'UTF8'); define('MYSQL_CHARSET', 'UTF8');
// Connection charset for MySQL. If you have a legacy database and/or experience // Connection charset for MySQL. If you have a legacy database and/or experience
// garbage unicode characters with this option, try setting it to a blank string. // garbage unicode characters with this option, try setting it to a blank string.

79
functions.php
View File

@ -42,60 +42,47 @@
return $tr; return $tr;
} }
if (ENABLE_TRANSLATIONS == true) { // If translations are enabled. require_once "lib/accept-to-gettext.php";
require_once "lib/accept-to-gettext.php"; require_once "lib/gettext/gettext.inc";
require_once "lib/gettext/gettext.inc";
function startup_gettext() { function startup_gettext() {
# Get locale from Accept-Language header # Get locale from Accept-Language header
$lang = al2gt(array_keys(get_translations()), "text/html"); $lang = al2gt(array_keys(get_translations()), "text/html");
if (defined('_TRANSLATION_OVERRIDE_DEFAULT')) { if (defined('_TRANSLATION_OVERRIDE_DEFAULT')) {
$lang = _TRANSLATION_OVERRIDE_DEFAULT; $lang = _TRANSLATION_OVERRIDE_DEFAULT;
}
if ($_COOKIE["ttrss_lang"] && $_COOKIE["ttrss_lang"] != "auto") {
$lang = $_COOKIE["ttrss_lang"];
}
/* In login action of mobile version */
if ($_POST["language"] && defined('MOBILE_VERSION')) {
$lang = $_POST["language"];
$_COOKIE["ttrss_lang"] = $lang;
}
if ($lang) {
if (defined('LC_MESSAGES')) {
_setlocale(LC_MESSAGES, $lang);
} else if (defined('LC_ALL')) {
_setlocale(LC_ALL, $lang);
} else {
die("can't setlocale(): please set ENABLE_TRANSLATIONS to false in config.php");
}
if (defined('MOBILE_VERSION')) {
_bindtextdomain("messages", "../locale");
} else {
_bindtextdomain("messages", "locale");
}
_textdomain("messages");
_bind_textdomain_codeset("messages", "UTF-8");
}
} }
startup_gettext(); if ($_COOKIE["ttrss_lang"] && $_COOKIE["ttrss_lang"] != "auto") {
$lang = $_COOKIE["ttrss_lang"];
}
} else { // If translations are enabled. /* In login action of mobile version */
function __($msg) { if ($_POST["language"] && defined('MOBILE_VERSION')) {
return $msg; $lang = $_POST["language"];
$_COOKIE["ttrss_lang"] = $lang;
} }
function startup_gettext() {
// no-op if ($lang) {
return true; if (defined('LC_MESSAGES')) {
_setlocale(LC_MESSAGES, $lang);
} else if (defined('LC_ALL')) {
_setlocale(LC_ALL, $lang);
}
if (defined('MOBILE_VERSION')) {
_bindtextdomain("messages", "../locale");
} else {
_bindtextdomain("messages", "locale");
}
_textdomain("messages");
_bind_textdomain_codeset("messages", "UTF-8");
} }
} // If translations are enabled. }
startup_gettext();
if (defined('MEMCACHE_SERVER')) { if (defined('MEMCACHE_SERVER')) {
$memcache = new Memcache; $memcache = new Memcache;

17
localized_js.php
View File

@ -3,7 +3,7 @@
require "functions.php"; require "functions.php";
header("Content-Type: text/plain; charset=UTF-8"); header("Content-Type: text/plain; charset=UTF-8");
function T_js_decl($s1, $s2) { function T_js_decl($s1, $s2) {
if ($s1 && $s2) { if ($s1 && $s2) {
$s1 = preg_replace("/\n/", "", $s1); $s1 = preg_replace("/\n/", "", $s1);
@ -28,17 +28,12 @@ function __(msg) {
} }
<?php <?php
$l10n = _get_reader();
if (ENABLE_TRANSLATIONS) { for ($i = 0; $i < $l10n->total; $i++) {
$orig = $l10n->get_original_string($i);
$translation = __($orig);
$l10n = _get_reader(); print T_js_decl($orig, $translation);
for ($i = 0; $i < $l10n->total; $i++) {
$orig = $l10n->get_original_string($i);
$translation = __($orig);
print T_js_decl($orig, $translation);
}
} }
?> ?>

2
localized_schema.php
View File

@ -1,4 +1,4 @@
<?php # This file has been generated at: Fri Mar 18 18:25:12 MSK 2011 <?php # This file has been generated at: Fri Mar 18 19:23:17 MSK 2011
__("Title"); __("Title");
__("Title or Content"); __("Title or Content");

14
login_form.php
View File

@ -38,7 +38,7 @@ function fetchProfiles() {
try { try {
var params = Form.serialize('loginForm'); var params = Form.serialize('loginForm');
var query = "?op=getProfiles&" + params; var query = "?op=getProfiles&" + params;
if (query) { if (query) {
new Ajax.Request("backend.php", { new Ajax.Request("backend.php", {
parameters: query, parameters: query,
@ -58,7 +58,7 @@ function fetchProfiles() {
function languageChange(elem) { function languageChange(elem) {
try { try {
document.forms['loginForm']['click'].disabled = true; document.forms['loginForm']['click'].disabled = true;
var lang = elem[elem.selectedIndex].value; var lang = elem[elem.selectedIndex].value;
setCookie("ttrss_lang", lang, <?php print SESSION_COOKIE_LIFETIME ?>); setCookie("ttrss_lang", lang, <?php print SESSION_COOKIE_LIFETIME ?>);
window.location.reload(); window.location.reload();
@ -76,7 +76,7 @@ function bwLimitChange(elem) {
try { try {
var limit_set = elem.checked; var limit_set = elem.checked;
setCookie("ttrss_bwlimit", limit_set, setCookie("ttrss_bwlimit", limit_set,
<?php print SESSION_COOKIE_LIFETIME ?>); <?php print SESSION_COOKIE_LIFETIME ?>);
} catch (e) { } catch (e) {
@ -129,14 +129,13 @@ function validateLoginForm(f) {
<?php } ?> <?php } ?>
<table> <table>
<tr><td align="right"><?php echo __("Login:") ?></td> <tr><td align="right"><?php echo __("Login:") ?></td>
<td align="right"><input name="login" <td align="right"><input name="login"
onchange="fetchProfiles()" onfocus="fetchProfiles()" onchange="fetchProfiles()" onfocus="fetchProfiles()"
value="<?php echo $_SERVER["REMOTE_USER"] ?>"></td></tr> value="<?php echo $_SERVER["REMOTE_USER"] ?>"></td></tr>
<tr><td align="right"><?php echo __("Password:") ?></td> <tr><td align="right"><?php echo __("Password:") ?></td>
<td align="right"><input type="password" name="password" <td align="right"><input type="password" name="password"
onchange="fetchProfiles()" onfocus="fetchProfiles()" onchange="fetchProfiles()" onfocus="fetchProfiles()"
value="<?php echo $_SERVER["REMOTE_USER"] ?>"></td></tr> value="<?php echo $_SERVER["REMOTE_USER"] ?>"></td></tr>
<?php if (ENABLE_TRANSLATIONS) { ?>
<tr><td align="right"><?php echo __("Language:") ?></td> <tr><td align="right"><?php echo __("Language:") ?></td>
<td align="right"> <td align="right">
<?php <?php
@ -145,7 +144,6 @@ function validateLoginForm(f) {
?> ?>
</td></tr> </td></tr>
<?php } ?>
<tr><td align="right"><?php echo __("Profile:") ?></td> <tr><td align="right"><?php echo __("Profile:") ?></td>
<td align="right" id="profile_box"> <td align="right" id="profile_box">
@ -167,7 +165,7 @@ function validateLoginForm(f) {
<?php } ?> <?php } ?>
<input type="hidden" name="action" value="login"> <input type="hidden" name="action" value="login">
<input type="hidden" name="rt" <input type="hidden" name="rt"
value="<?php if ($return_to != 'none') { echo $return_to; } ?>"> value="<?php if ($return_to != 'none') { echo $return_to; } ?>">
</td></tr> </td></tr>
@ -188,7 +186,7 @@ function validateLoginForm(f) {
<td align="center" class="loginBottom"> <td align="center" class="loginBottom">
<a href="http://tt-rss.org/">Tiny Tiny RSS</a> <a href="http://tt-rss.org/">Tiny Tiny RSS</a>
<?php if (!defined('HIDE_VERSION')) { ?> <?php if (!defined('HIDE_VERSION')) { ?>
v<?php echo VERSION ?> v<?php echo VERSION ?>
<?php } ?> <?php } ?>
&copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a> &copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
</td> </td>

4
sanity_config.php
View File

@ -1,3 +1,3 @@
<?php # This file has been generated at: Fri Mar 18 18:21:15 MSK 2011 <?php # This file has been generated at: Fri Mar 18 19:24:44 MSK 2011
define('GENERATED_CONFIG_CHECK', 21); define('GENERATED_CONFIG_CHECK', 21);
$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MAGPIE_FETCH_TIME_OUT', 'MAGPIE_CACHE_DIR', 'MAGPIE_CACHE_AGE', 'ICONS_DIR', 'ICONS_URL', 'SINGLE_USER_MODE', 'TMP_DIRECTORY', 'ENABLE_UPDATE_DAEMON', 'DAEMON_SLEEP_INTERVAL', 'DATABASE_BACKED_SESSIONS', 'SESSION_CHECK_ADDRESS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'DAEMON_UPDATE_LOGIN_LIMIT', 'CHECK_FOR_NEW_VERSION', 'DIGEST_ENABLE', 'DIGEST_EMAIL_LIMIT', 'DAEMON_SENDS_DIGESTS', 'ENABLE_TRANSLATIONS', 'MYSQL_CHARSET', 'DEFAULT_UPDATE_METHOD', 'SIMPLEPIE_CACHE_DIR', 'SIMPLEPIE_CACHE_IMAGES', 'COUNTERS_MAX_AGE', 'DIGEST_FROM_NAME', 'DIGEST_FROM_ADDRESS', 'DIGEST_SUBJECT', 'DIGEST_SMTP_HOST', 'DIGEST_SMTP_LOGIN', 'DIGEST_SMTP_PASSWORD', 'DAEMON_FEED_LIMIT', 'ALLOW_REMOTE_USER_AUTH', 'AUTO_LOGIN', 'LOCK_DIRECTORY', 'ENABLE_GZIP_OUTPUT', 'PHP_EXECUTABLE', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'FEEDBACK_URL', 'FORCE_ARTICLE_PURGE', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_TWEET_BUTTON', 'CONSUMER_KEY', 'CONSUMER_SECRET', 'ISCONFIGURED', 'CONFIG_VERSION'); ?> $requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MAGPIE_FETCH_TIME_OUT', 'MAGPIE_CACHE_DIR', 'MAGPIE_CACHE_AGE', 'ICONS_DIR', 'ICONS_URL', 'SINGLE_USER_MODE', 'TMP_DIRECTORY', 'ENABLE_UPDATE_DAEMON', 'DAEMON_SLEEP_INTERVAL', 'DATABASE_BACKED_SESSIONS', 'SESSION_CHECK_ADDRESS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'DAEMON_UPDATE_LOGIN_LIMIT', 'CHECK_FOR_NEW_VERSION', 'DIGEST_ENABLE', 'DIGEST_EMAIL_LIMIT', 'DAEMON_SENDS_DIGESTS', 'MYSQL_CHARSET', 'DEFAULT_UPDATE_METHOD', 'SIMPLEPIE_CACHE_DIR', 'SIMPLEPIE_CACHE_IMAGES', 'COUNTERS_MAX_AGE', 'DIGEST_FROM_NAME', 'DIGEST_FROM_ADDRESS', 'DIGEST_SUBJECT', 'DIGEST_SMTP_HOST', 'DIGEST_SMTP_LOGIN', 'DIGEST_SMTP_PASSWORD', 'DAEMON_FEED_LIMIT', 'ALLOW_REMOTE_USER_AUTH', 'AUTO_LOGIN', 'LOCK_DIRECTORY', 'ENABLE_GZIP_OUTPUT', 'PHP_EXECUTABLE', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'FEEDBACK_URL', 'FORCE_ARTICLE_PURGE', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_TWEET_BUTTON', 'CONSUMER_KEY', 'CONSUMER_SECRET', 'ISCONFIGURED', 'CONFIG_VERSION'); ?>