GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[I18N] Fix implementation of I18nHelper::formatICU

This commit is contained in:
Hugo Sales 2020-06-23 12:05:38 +00:00 committed by Hugo Sales
parent 491e82f94e
commit 753f852941
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Core/I18n/I18nHelper.php
View File

@ -217,38 +217,38 @@ abstract class I18nHelper
public static function formatICU(array $messages, array $params): string
{
$msg = '';
foreach ($params as $var => $val) {
if (is_int($val)) {
$res = '';
foreach (array_slice($params, 0, 1, true) as $var => $type) {
if (is_int($type)) {
$pref = '=';
$op = 'plural';
} elseif (is_string($var)) {
} elseif (is_string($type)) {
$pref = '';
$op = 'select';
} else {
throw new Exception('Invalid key type. (int|string) only');
throw new Exception('Invalid variable type. (int|string) only');
}
$res = "{{$var}, {$op}, ";
$i = 1;
$cnt = count($messages);
$res = "{$var}, {$op}, ";
$i = 0;
$cnt = count($messages) - 1;
foreach ($messages as $val => $m) {
if ($i !== $cnt) {
$res .= "{$pref}{$val}";
} else {
$res .= 'other';
}
if (is_array($m)) {
array_shift($params);
$res .= "{$pref}{$val} {" . self::formatICU($m, $params) . '} ';
$res .= ' {' . self::formatICU($m, array_slice($params, 1, null, true)) . '} ';
} elseif (is_string($m)) {
if ($i !== $cnt) {
$res .= "{$pref}{$val} {{$m}} ";
} else {
$res .= "other {{$m}}}";
}
$res .= " {{$m}} ";
} else {
throw new Exception('Invalid message array');
}
++$i;
}
$msg .= $res;
}
return $msg;
return "{{$res}}";
}
}