diff options
| author | Christopher Ng <chrng8@gmail.com> | 2021-08-14 03:16:31 +0300 |
|---|---|---|
| committer | Christopher Ng <chrng8@gmail.com> | 2021-08-27 08:06:12 +0300 |
| commit | cc5815dcd0342a521be400f35cbc8a666b83046d (patch) | |
| tree | c632864b41e8bc0f991ff866e143423e2d20ec27 /apps/settings | |
| parent | 3b2be23fee0cef9edde5443bfa892ca6407d06ff (diff) | |
Provide initial state
- camelCase language strings
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Diffstat (limited to 'apps/settings')
| -rw-r--r-- | apps/settings/lib/Settings/Personal/PersonalInfo.php | 13 | ||||
| -rw-r--r-- | apps/settings/src/components/UserList.vue | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php index d69d4b33b4c..0a84f20f513 100644 --- a/apps/settings/lib/Settings/Personal/PersonalInfo.php +++ b/apps/settings/lib/Settings/Personal/PersonalInfo.php @@ -148,6 +148,7 @@ class PersonalInfo implements ISettings { $personalInfoParameters = [ 'displayNames' => $this->getDisplayNames($account), 'emails' => $this->getEmails($account), + 'languages' => $this->getLanguages($user), ]; $accountParameters = [ @@ -256,7 +257,7 @@ class PersonalInfo implements ISettings { } /** - * returns the user language, common language and other languages in an + * returns the user's active language, common languages, and other languages in an * associative array * * @param IUser $user @@ -274,12 +275,12 @@ class PersonalInfo implements ISettings { $languages = $this->l10nFactory->getLanguages(); // associate the user language with the proper array - $userLangIndex = array_search($userConfLang, array_column($languages['commonlanguages'], 'code')); - $userLang = $languages['commonlanguages'][$userLangIndex]; + $userLangIndex = array_search($userConfLang, array_column($languages['commonLanguages'], 'code')); + $userLang = $languages['commonLanguages'][$userLangIndex]; // search in the other languages if ($userLangIndex === false) { - $userLangIndex = array_search($userConfLang, array_column($languages['languages'], 'code')); - $userLang = $languages['languages'][$userLangIndex]; + $userLangIndex = array_search($userConfLang, array_column($languages['otherLanguages'], 'code')); + $userLang = $languages['otherLanguages'][$userLangIndex]; } // if user language is not available but set somehow: show the actual code as name if (!is_array($userLang)) { @@ -290,7 +291,7 @@ class PersonalInfo implements ISettings { } return array_merge( - ['activelanguage' => $userLang], + ['activeLanguage' => $userLang], $languages ); } diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue index 5459a04398e..afbc1de76f8 100644 --- a/apps/settings/src/components/UserList.vue +++ b/apps/settings/src/components/UserList.vue @@ -369,11 +369,11 @@ export default { return [ { label: t('settings', 'Common languages'), - languages: this.settings.languages.commonlanguages, + languages: this.settings.languages.commonLanguages, }, { - label: t('settings', 'All languages'), - languages: this.settings.languages.languages, + label: t('settings', 'Other languages'), + languages: this.settings.languages.otherLanguages, }, ] }, |