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

[I18N] Remove support for context until it proves necessary, as it broke the code

Browse Source
This commit is contained in:
Hugo Sales 2020-07-22 01:53:00 +00:00 committed by Hugo Sales
parent 028d7c929f
commit e482ecfb87
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Core/I18n/I18n.php
View File

@ -309,16 +309,6 @@ function _m(): string
// Falthrough // Falthrough
// no break // no break
case 2: case 2:
if (is_string($args[0])) {
if (!is_array($args[1])) {
// ASCII 4 is EOT, used to separate context from string
$context = array_shift($args) . '\004';
} else {
throw new InvalidArgumentException('Bad parameters to `_m()`. '
. 'Seemingly called with a context and multiple messages');
}
}
if (is_array($args[0])) { if (is_array($args[0])) {
$args[0] = I18n::formatICU($args[0], $args[1]); $args[0] = I18n::formatICU($args[0], $args[1]);
} }
@ -326,7 +316,7 @@ function _m(): string
if (is_string($args[0])) { if (is_string($args[0])) {
$msg = $args[0]; $msg = $args[0];
$params = $args[1] ?? []; $params = $args[1] ?? [];
return I18n::$translator->trans($context ?? '' . $msg, $params, $domain); return I18n::$translator->trans($msg, $params, $domain);
} }
// Fallthrough // Fallthrough
// no break // no break