Skip to content

feat(l10n): Allow to force language with a query parameter #48613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 2 commits into from
Oct 8, 2024
Merged

feat(l10n): Allow to force language with a query parameter #48613

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b8949e
feat(l10n): Allow to force language with a query parameter
come-nc Oct 8, 2024
5a05af0
feat(l10n): Respect forceLanguage query parameter in more places
come-nc Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions lib/private/L10N/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function get($app, $lang = null, $locale = null) {
$lang = str_replace(['\0', '/', '\\', '..'], '', $lang);
}

$forceLang = $this->config->getSystemValue('force_language', false);
$forceLang = $this->request->getParam('forceLanguage') ?? $this->config->getSystemValue('force_language', false);
if (is_string($forceLang)) {
$lang = $forceLang;
}
Expand Down Expand Up @@ -139,7 +139,7 @@ public function get($app, $lang = null, $locale = null) {
*/
public function findLanguage(?string $appId = null): string {
// Step 1: Forced language always has precedence over anything else
$forceLang = $this->config->getSystemValue('force_language', false);
$forceLang = $this->request->getParam('forceLanguage') ?? $this->config->getSystemValue('force_language', false);
if (is_string($forceLang)) {
$this->requestLanguage = $forceLang;
}
Expand Down Expand Up @@ -196,7 +196,7 @@ public function findLanguage(?string $appId = null): string {

public function findGenericLanguage(?string $appId = null): string {
// Step 1: Forced language always has precedence over anything else
$forcedLanguage = $this->config->getSystemValue('force_language', false);
$forcedLanguage = $this->request->getParam('forceLanguage') ?? $this->config->getSystemValue('force_language', false);
if ($forcedLanguage !== false) {
return $forcedLanguage;
}
Expand Down Expand Up @@ -411,6 +411,10 @@ public function getUserLanguage(?IUser $user = null): string {
return $language;
}

if (($forcedLanguage = $this->request->getParam('forceLanguage')) !== null) {
return $forcedLanguage;
}

// Use language from request
if ($this->userSession->getUser() instanceof IUser &&
$user->getUID() === $this->userSession->getUser()->getUID()) {
Expand All @@ -421,7 +425,7 @@ public function getUserLanguage(?IUser $user = null): string {
}
}

return $this->config->getSystemValueString('default_language', 'en');
return $this->request->getParam('forceLanguage') ?? $this->config->getSystemValueString('default_language', 'en');
}

/**
Expand Down