upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 06:37:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

fix(l10n): fix translations for init scripts

Browse source 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ 2023-12-07 11:51:33 +01:00
parent 5cf42ff25c
commit ceb2d41503
No known key found for this signature in database
GPG key ID: 60C25B8C072916CF
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/public/Util.php
View file

@ -161,6 +161,12 @@ class Util {
$path = "js/$file";
}
// We need to handle the translation BEFORE the init script
// is loaded, as the init script might use translations
if ($application !== 'core' && !str_contains($file, 'l10n')) {
self::addTranslations($application, null, true);
}
self::$scriptsInit[] = $path;
}
@ -233,9 +239,10 @@ class Util {
* Add a translation JS file
* @param string $application application id
* @param string $languageCode language code, defaults to the current locale
* @param bool $init whether the translations should be loaded early or not
* @since 8.0.0
*/
public static function addTranslations($application, $languageCode = null) {
public static function addTranslations($application, $languageCode = null, $init = false) {
if (is_null($languageCode)) {
$languageCode = \OC::$server->getL10NFactory()->findLanguage($application);
}
@ -244,7 +251,12 @@ class Util {
} else {
$path = "l10n/$languageCode";
}
self::$scripts[$application][] = $path;
if ($init) {
self::$scriptsInit[] = $path;
} else {
self::$scripts[$application][] = $path;
}
}
/**