diff options
author | Christopher Ng <chrng8@gmail.com> | 2021-08-14 03:29:33 +0300 |
---|---|---|
committer | Christopher Ng <chrng8@gmail.com> | 2021-08-14 03:29:41 +0300 |
commit | 21805650170645d2fc8a520206a412a12eb42a65 (patch) | |
tree | e988f90ddf3b6fb090f623c4e9e22323eb6408b7 | |
parent | 11cd9308cc32cdc253537ce1b75ed2a4ecd71685 (diff) |
Fix language strings
Signed-off-by: Christopher Ng <chrng8@gmail.com>
-rw-r--r-- | lib/Settings/Admin/AdminSettings.php | 8 | ||||
-rw-r--r-- | src/components/AdminSettings/HostedSignalingServer.vue | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/Settings/Admin/AdminSettings.php b/lib/Settings/Admin/AdminSettings.php index 396d5ca3c..a3095c66c 100644 --- a/lib/Settings/Admin/AdminSettings.php +++ b/lib/Settings/Admin/AdminSettings.php @@ -457,17 +457,17 @@ class AdminSettings implements ISettings { json_decode($this->serverConfig->getAppValue('spreed', 'hosted-signaling-server-account', "[]"), true) ?? [] ); $languages = $this->l10nFactory->getLanguages(); - foreach ($languages['commonlanguages'] as $key => $value) { + foreach ($languages['commonLanguages'] as $key => $value) { // remove "Deutsch (Formal)" if ($value['code'] === 'de_DE') { - unset($languages['commonlanguages'][$key]); + unset($languages['commonLanguages'][$key]); } // rename "Deutsch (Persönlich)" to "Deutsch" if ($value['code'] === 'de') { - $languages['commonlanguages'][$key]['name'] = 'Deutsch'; + $languages['commonLanguages'][$key]['name'] = 'Deutsch'; } } - $languages['commonlanguages'] = array_values($languages['commonlanguages']); + $languages['commonLanguages'] = array_values($languages['commonLanguages']); // TODO maybe filter out languages with an _ usort($countries, function ($a, $b) { return strcmp($a['name'], $b['name']); diff --git a/src/components/AdminSettings/HostedSignalingServer.vue b/src/components/AdminSettings/HostedSignalingServer.vue index 4fe2d38a4..dac1499b7 100644 --- a/src/components/AdminSettings/HostedSignalingServer.vue +++ b/src/components/AdminSettings/HostedSignalingServer.vue @@ -65,11 +65,11 @@ :placeholder="t('spreed', 'Language')" :disabled="loading" :aria-label="t('spreed', 'Language')"> - <option v-for="l in languages.commonlanguages" :key="l.code" :value="l.code"> + <option v-for="l in languages.commonLanguages" :key="l.code" :value="l.code"> {{ l.name }} </option> <optgroup label="––––––––––" /> - <option v-for="l in languages.languages" :key="l.code" :value="l.code"> + <option v-for="l in languages.otherLanguages" :key="l.code" :value="l.code"> {{ l.name }} </option> </select> @@ -205,7 +205,7 @@ export default { this.trialAccount = loadState('spreed', 'hosted_signaling_server_trial_data') const languagesAndCountries = loadState('spreed', 'hosted_signaling_server_language_data') - this.languages = languagesAndCountries.languages // two lists of {code: "es", name: "Español"} - one is in 'commonlanguages' and one in 'languages' + this.languages = languagesAndCountries.languages // two lists of {code: "es", name: "Español"} - one is in 'commonLanguages' and one in 'otherLanguages' this.countries = languagesAndCountries.countries // list of {code: "France", name: "France"} const signaling = loadState('spreed', 'signaling_servers') |