remove localized_js.php; integrate with other startup JS stuff

This commit is contained in:
Andrew Dolgov 2013-03-25 12:45:27 +04:00
parent 90856743c3
commit bcbb2ec792
4 changed files with 40 additions and 47 deletions

View file

@ -4090,4 +4090,42 @@
return $max_ts;
}
function T_js_decl($s1, $s2) {
if ($s1 && $s2) {
$s1 = preg_replace("/\n/", "", $s1);
$s2 = preg_replace("/\n/", "", $s2);
$s1 = preg_replace("/\"/", "\\\"", $s1);
$s2 = preg_replace("/\"/", "\\\"", $s2);
return "T_messages[\"$s1\"] = \"$s2\";\n";
}
}
function init_js_translations() {
print 'var T_messages = new Object();
function __(msg) {
if (T_messages[msg]) {
return T_messages[msg];
} else {
return msg;
}
}
function ngettext(msg1, msg2, n) {
return (parseInt(n) > 1) ? msg2 : msg1;
}';
$l10n = _get_reader();
for ($i = 0; $i < $l10n->total; $i++) {
$orig = $l10n->get_original_string($i);
$translation = __($orig);
print T_js_decl($orig, $translation);
}
}
?>

View file

@ -77,7 +77,6 @@
"lib/dojo/dojo.js",
"lib/dijit/dijit.js",
"lib/dojo/tt-rss-layer.js",
"localized_js.php",
"errors.php?mode=js") as $jsfile) {
echo javascript_tag($jsfile);
@ -99,6 +98,7 @@
print get_minified_js(array("tt-rss",
"functions", "feedlist", "viewfeed", "FeedTree"));
init_js_translations();
?>
</script>

View file

@ -1,45 +0,0 @@
<?php
set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
get_include_path());
require_once "sessions.php";
require_once "functions.php";
header("Content-Type: text/plain; charset=UTF-8");
function T_js_decl($s1, $s2) {
if ($s1 && $s2) {
$s1 = preg_replace("/\n/", "", $s1);
$s2 = preg_replace("/\n/", "", $s2);
$s1 = preg_replace("/\"/", "\\\"", $s1);
$s2 = preg_replace("/\"/", "\\\"", $s2);
return "T_messages[\"$s1\"] = \"$s2\";\n";
}
}
?>
var T_messages = new Object();
function __(msg) {
if (T_messages[msg]) {
return T_messages[msg];
} else {
return msg;
}
}
function ngettext(msg1, msg2, n) {
return (parseInt(n) > 1) ? msg2 : msg1;
}
<?php
$l10n = _get_reader();
for ($i = 0; $i < $l10n->total; $i++) {
$orig = $l10n->get_original_string($i);
$translation = __($orig);
print T_js_decl($orig, $translation);
}
?>

View file

@ -39,7 +39,6 @@
"lib/dojo/dojo.js",
"lib/dijit/dijit.js",
"lib/dojo/tt-rss-layer.js",
"localized_js.php",
"errors.php?mode=js") as $jsfile) {
echo javascript_tag($jsfile);
@ -60,6 +59,7 @@
print get_minified_js(array("functions", "deprecated", "prefs"));
init_js_translations();
?>
</script>