Skip to content

Commit

Permalink
Merge pull request #1125 from h3poteto/iss-1106
Browse files Browse the repository at this point in the history
refs #1106 Add some empty language translations
  • Loading branch information
h3poteto committed Nov 19, 2019
2 parents bf234a4 + 62b0f09 commit b6066c2
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 37 deletions.
6 changes: 6 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@ files:
translation: /src/config/locales/%locale%/translation.json
languages_mapping:
locale:
cs: cs
de: de
es-ES: es_es
fr: fr
it: it
ja: ja
ko: ko
no: no
pl: pl
pt-PT: pt_pt
ru: ru
sv-SE: sv_se
zh-CN: zh_cn
1 change: 1 addition & 0 deletions src/config/locales/cs/translation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/config/locales/es_es/translation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/config/locales/no/translation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/config/locales/pt_pt/translation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/config/locales/ru/translation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/config/locales/sv_se/translation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
24 changes: 24 additions & 0 deletions src/constants/language/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,29 @@ export default {
zh_cn: {
name: '简体中文',
key: 'zh_cn'
},
cs: {
name: 'čeština',
key: 'cs'
},
es_es: {
name: 'Español',
key: 'es_es'
},
no: {
name: 'norsk',
key: 'no'
},
pt_pt: {
name: 'Português',
key: 'pt_pt'
},
ru: {
name: 'русский',
key: 'ru'
},
sv_se: {
name: 'svenska',
key: 'sv_se'
}
}
1 change: 1 addition & 0 deletions src/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ async function getLanguage() {
const conf = await preferences.load()
return conf.language.language
} catch (err) {
log.warn(err)
return Language.en.key
}
}
Expand Down
69 changes: 32 additions & 37 deletions src/renderer/components/Preferences/Language.vue
Original file line number Diff line number Diff line change
@@ -1,73 +1,68 @@
<template>
<div id="language">
<h2>{{ $t('preferences.language.title') }}</h2>
<el-form class="display-language section" label-position="top" size="small">
<el-form-item for="language" :label="$t('preferences.language.language_description')">
<el-select id="language" v-model="displayLanguage" placeholder="style">
<el-option
v-for="lang in languages"
:key="lang.key"
:label="lang.name"
:value="lang.key">
</el-option>
</el-select>
<p class="notice">{{ $t('preferences.language.notice') }}</p>
</el-form-item>
</el-form>
</div>
<div id="language">
<h2>{{ $t('preferences.language.title') }}</h2>
<el-form class="display-language section" label-position="top" size="small">
<el-form-item for="language" :label="$t('preferences.language.language_description')">
<el-select id="language" v-model="displayLanguage" placeholder="style">
<el-option v-for="lang in languages" :key="lang.key" :label="lang.name" :value="lang.key"> </el-option>
</el-select>
<p class="notice">{{ $t('preferences.language.notice') }}</p>
</el-form-item>
</el-form>
</div>
</template>

<script>
import Language from '~/src/constants/language'
export default {
name: 'language',
data () {
data() {
return {
languages: [
Language.cs,
Language.de,
Language.en,
Language.es_es,
Language.fr,
Language.it,
Language.ja,
Language.ko,
Language.no,
Language.pl,
Language.it,
Language.pt_pt,
Language.ru,
Language.sv_se,
Language.zh_cn
]
}
},
computed: {
displayLanguage: {
get () {
get() {
return this.$store.state.Preferences.Language.language.language
},
set (value) {
this.$store.dispatch('Preferences/Language/changeLanguage', value)
.then(() => {
this.confirm()
})
set(value) {
this.$store.dispatch('Preferences/Language/changeLanguage', value).then(() => {
this.confirm()
})
}
}
},
created () {
created() {
this.$store.dispatch('Preferences/Language/loadLanguage')
},
methods: {
confirm () {
this.$confirm(
this.$t('preferences.language.confirm.message'),
this.$t('preferences.language.confirm.title'),
{
confirmButtonText: this.$t('preferences.language.confirm.ok'),
cancelButtonText: this.$t('preferences.language.confirm.cancel'),
type: 'warning'
}
)
confirm() {
this.$confirm(this.$t('preferences.language.confirm.message'), this.$t('preferences.language.confirm.title'), {
confirmButtonText: this.$t('preferences.language.confirm.ok'),
cancelButtonText: this.$t('preferences.language.confirm.cancel'),
type: 'warning'
})
.then(() => {
this.$store.dispatch('Preferences/Language/relaunch')
})
.cancel(() => {
})
.cancel(() => {})
}
}
}
Expand Down

0 comments on commit b6066c2

Please sign in to comment.