maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Fixed gettext - support for smarty, now you are able to change the language for real and the translated string is no longer saved in the cached template, refs #819

Browse Source 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
This commit is contained in:
Florian Aders (EleRas)
2011-06-23 12:56:18 +02:00
parent e9000a7e99
commit 6daec3c975
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/functions/smarty_plugins/gettext-prefilter.php
View File

@@ -28,6 +28,8 @@
*/ */
$smarty->registerFilter('pre', 'smarty_prefilter_t'); $smarty->registerFilter('pre', 'smarty_prefilter_t');
$smarty->registerFilter('post', 'smarty_postfilter_t');
function smarty_prefilter_t($tpl_source, &$smarty) { function smarty_prefilter_t($tpl_source, &$smarty) {
/* find all {t} ... {/t} uses regex */ /* find all {t} ... {/t} uses regex */
$tpl_source = preg_replace_callback( $tpl_source = preg_replace_callback(
@@ -39,6 +41,10 @@
/* return our new tpl_source */ /* return our new tpl_source */
return $tpl_source; return $tpl_source;
} }
function smarty_postfilter_t($tpl_source, &$smarty) {
return preg_replace('/<!--GETTEXT (.*?) \/GETTEXT-->/', '<?'.'php echo $1 ?'.'>', $tpl_source);
}
function smarty_helper_gettext_block($matches) function smarty_helper_gettext_block($matches)
{ {
/* the actual text is the 2nd submatch */ /* the actual text is the 2nd submatch */
@@ -85,14 +91,15 @@
} }
} }
$text = str_replace("'", "\'", $text);
// use plural if required parameters are set // use plural if required parameters are set
if (isset($count) && isset($plural)) if (isset($count) && isset($plural))
{ {
$text = isset($domain) ? dngettext($domain, $text, $plural, $count) : ngettext($text, $plural, $count); $text = isset($domain) ? "_dngettext('$domain', '$text', '$plural', '$count')" : "ngettext('$text', '$plural', '$count')";
} }
else else
{ // use normal { // use normal
$text = isset($domain) ? dgettext($domain, $text) : gettext($text); $text = isset($domain) ? "dgettext('$domain', '$text')" : "gettext('$text')";
} }
// default to noescaping at all // default to noescaping at all
@@ -112,6 +119,6 @@
} }
} }
return $text; return '<!--GETTEXT ' . $text . '; /GETTEXT-->';
} }
?> ?>