Skip to content

Rename language strings to camelCase #6115

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
nickvergessen merged 1 commit into from
Aug 31, 2021
Merged

Rename language strings to camelCase #6115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions lib/Settings/Admin/AdminSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,17 +457,17 @@ protected function initRequestSignalingServerTrial(): void {
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']);
Expand Down
6 changes: 3 additions & 3 deletions src/components/AdminSettings/HostedSignalingServer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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')
Expand Down