external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

web/lib/translator.inc.php: Use vsprintf() in __()

Browse source 
Remove hacky substitution code from __() and use vsprintf() instead
which will deal with all sorts of format strings properly.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-08-15 10:16:46 +02:00
parent ee4b398033
commit b5d5687517
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
web/lib/translator.inc.php
View file

@ -5,12 +5,11 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR
# usage: # usage:
# use the __() function for returning translated strings of # use the __() function for returning translated strings of
# text. The string can contain escape codes %h for HTML # text. The string can contain escape codes "%s".
# and %s for regular text.
# #
# examples: # examples:
# print __("%s has %s apples.", "Bill", "5"); # print __("%s has %s apples.", "Bill", "5");
# print __("This is a %hmajor%h problem!", "<b>", "</b>"); # print __("This is a %smajor%s problem!", "<b>", "</b>");
include_once('config.inc.php'); include_once('config.inc.php');
include_once('gettext.php'); include_once('gettext.php');
@ -26,23 +25,15 @@ function __() {
$args = func_get_args(); $args = func_get_args();
# First argument is always string to be translated # First argument is always string to be translated
$tag = $args[0]; $tag = array_shift($args);
# Translate using gettext_reader initialized before. # Translate using gettext_reader initialized before.
$translated = $l10n->translate($tag); $translated = $l10n->translate($tag);
$translated = htmlspecialchars($translated, ENT_QUOTES); $translated = htmlspecialchars($translated, ENT_QUOTES);
$num_args = sizeof($args);
# Subsequent arguments are strings to be formatted # Subsequent arguments are strings to be formatted
# if (count($args) > 0) {
# TODO: make this more robust. $translated = vsprintf($translated, $args);
# '%%' should translate to a literal '%'
if ( $num_args > 1 ) {
for ($i = 1; $i < $num_args; $i++) {
$translated = preg_replace("/\%[sh]/", $args[$i], $translated, 1);
}
} }
return $translated; return $translated;