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

lib: Upgrade php-gettext from 1.0.11 to 1.0.12 

https://launchpad.net/php-gettext

The local change to rename the gettext_reader function to
__construct (commit 00b6b66827) has been
preserved.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2017-01-20 14:49:24 -05:00
parent e3cfa33ba9
commit 526096f06a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/gettext/gettext.inc
View File

@ -174,14 +174,13 @@ function _get_codeset($domain=null) {
* Convert the given string to the encoding set by bind_textdomain_codeset. * Convert the given string to the encoding set by bind_textdomain_codeset.
*/ */
function _encode($text) { function _encode($text) {
$source_encoding = mb_detect_encoding($text);
$target_encoding = _get_codeset(); $target_encoding = _get_codeset();
if ($source_encoding != $target_encoding) { if (function_exists("mb_detect_encoding")) {
return mb_convert_encoding($text, $target_encoding, $source_encoding); $source_encoding = mb_detect_encoding($text);
if ($source_encoding != $target_encoding)
$text = mb_convert_encoding($text, $target_encoding, $source_encoding);
} }
else {
return $text; return $text;
}
} }

4
lib/gettext/gettext.php
View File

@ -350,6 +350,10 @@ class gettext_reader {
* @return int array index of the right plural form * @return int array index of the right plural form
*/ */
function select_string($n) { function select_string($n) {
if (!is_int($n)) {
throw new InvalidArgumentException(
"Select_string only accepts integers: " . $n);
}
$string = $this->get_plural_forms(); $string = $this->get_plural_forms();
$string = str_replace('nplurals',"\$total",$string); $string = str_replace('nplurals',"\$total",$string);
$string = str_replace("n",$n,$string); $string = str_replace("n",$n,$string);