From a9f623d1824287722796493b490b2f7f644b4944 Mon Sep 17 00:00:00 2001 From: pubkey Date: Fri, 15 Dec 2017 21:30:48 +0100 Subject: [PATCH] ADD fallback to en if key not translated --- src/lang/ca.js | 17 +++++++---------- src/lang/cn.js | 17 +++++++---------- src/lang/de.js | 19 +++++++++---------- src/lang/el.js | 17 +++++++---------- src/lang/en.js | 19 +++++++++---------- src/lang/es.js | 17 +++++++---------- src/lang/fr.js | 17 +++++++---------- src/lang/he.js | 17 +++++++---------- src/lang/hu.js | 17 +++++++---------- src/lang/id.js | 19 ++++++++----------- src/lang/it.js | 17 +++++++---------- src/lang/ja.js | 17 +++++++---------- src/lang/ka.js | 17 +++++++---------- src/lang/ko.js | 19 ++++++++----------- src/lang/lt.js | 17 +++++++---------- src/lang/nl.js | 19 ++++++++----------- src/lang/pl.js | 17 +++++++---------- src/lang/pt-br.js | 18 ++++++++---------- src/lang/pt.js | 17 +++++++---------- src/lang/ru.js | 18 +++++++----------- src/lang/sv.js | 17 +++++++---------- src/lang/th.js | 17 +++++++---------- src/lang/tr.js | 17 +++++++---------- src/lang/zh-tw.js | 17 +++++++---------- src/resumes/left-right-rtl.vue | 8 ++++---- src/resumes/left-right.vue | 8 ++++---- src/resumes/material-dark.vue | 10 +++++----- src/resumes/oblique.vue | 8 ++++---- src/resumes/options.js | 25 +++++++++++++++++++++---- src/resumes/purple.vue | 8 ++++---- src/resumes/side-bar-rtl.vue | 8 ++++---- src/resumes/side-bar.vue | 8 ++++---- 32 files changed, 226 insertions(+), 277 deletions(-) diff --git a/src/lang/ca.js b/src/lang/ca.js index c428ffb..6d258aa 100644 --- a/src/lang/ca.js +++ b/src/lang/ca.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const ca = { - headings: { - contact: 'Contacte', - experience: 'Experiència', - education: 'Educació', - skills: 'Habilitats', - about: 'Sobre mi' - } +const lang = { + contact: 'Contacte', + experience: 'Experiència', + education: 'Educació', + skills: 'Habilitats', + about: 'Sobre mi' }; -export default ca; +export default lang; diff --git a/src/lang/cn.js b/src/lang/cn.js index 230b93c..bca7680 100755 --- a/src/lang/cn.js +++ b/src/lang/cn.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const cn = { - headings: { - contact: '联系方式', - experience: '工作经历', - education: '教育经历', - skills: '技能专长', - about: '自我介绍' - } +const lang = { + contact: '联系方式', + experience: '工作经历', + education: '教育经历', + skills: '技能专长', + about: '自我介绍' }; -export default cn; +export default lang; diff --git a/src/lang/de.js b/src/lang/de.js index f80a686..dfa05ef 100755 --- a/src/lang/de.js +++ b/src/lang/de.js @@ -1,11 +1,10 @@ -/* eslint-disable */ -const de = { - headings: { - contact: 'Kontakt', - experience: 'Berufserfahrung', - education: 'Schulbildung', - skills: 'Qualifikationen', - about: 'Über mich' - } +const lang = { + contact: 'Kontakt', + born: 'Geboren', + bornIn: 'in', + experience: 'Berufserfahrung', + education: 'Schulbildung', + skills: 'Qualifikationen', + about: 'Über mich' }; -export default de; +export default lang; diff --git a/src/lang/el.js b/src/lang/el.js index b2de798..afb16b0 100755 --- a/src/lang/el.js +++ b/src/lang/el.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const el = { - headings: { - contact: 'Επικοινωνία', - experience: 'Επαγγελματική εμπειρία', - education: 'Εκπαίδευση', - skills: 'Δεξιότητες', - about: 'Σχετικά με εμένα' - } +const lang = { + contact: 'Επικοινωνία', + experience: 'Επαγγελματική εμπειρία', + education: 'Εκπαίδευση', + skills: 'Δεξιότητες', + about: 'Σχετικά με εμένα' }; -export default el; +export default lang; diff --git a/src/lang/en.js b/src/lang/en.js index 7d64be1..2a918a7 100755 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -1,11 +1,10 @@ -/* eslint-disable */ -const en = { - headings: { - contact: 'Contact', - experience: 'Experience', - education: 'Education', - skills: 'Skills', - about: 'About me' - } +const lang = { + contact: 'Contact', + born: 'Born', + bornIn: 'in', + experience: 'Experience', + education: 'Education', + skills: 'Skills', + about: 'About me' }; -export default en; +export default lang; diff --git a/src/lang/es.js b/src/lang/es.js index 308a167..99c6c12 100755 --- a/src/lang/es.js +++ b/src/lang/es.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const es = { - headings: { - contact: 'Contacto', - experience: 'Experiencia', - education: 'Educación', - skills: 'Habilidades', - about: 'Sobre mi' - } +const lang = { + contact: 'Contacto', + experience: 'Experiencia', + education: 'Educación', + skills: 'Habilidades', + about: 'Sobre mi' }; -export default es; +export default lang; diff --git a/src/lang/fr.js b/src/lang/fr.js index 8b2ec0f..341a1f7 100755 --- a/src/lang/fr.js +++ b/src/lang/fr.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const fr = { - headings: { - contact: 'Contact', - experience: 'Expérience professionelle', - education: 'Formation', - skills: 'Compétences', - about: 'À propos de moi' - } +const lang = { + contact: 'Contact', + experience: 'Expérience professionelle', + education: 'Formation', + skills: 'Compétences', + about: 'À propos de moi' }; -export default fr; +export default lang; diff --git a/src/lang/he.js b/src/lang/he.js index a4b2925..693006c 100755 --- a/src/lang/he.js +++ b/src/lang/he.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const he = { - headings: { - contact: 'יצירת קשר', - experience: 'ניסיון', - education: 'השכלה', - skills: 'כישורים', - about: 'תמצית' - } +const lang = { + contact: 'יצירת קשר', + experience: 'ניסיון', + education: 'השכלה', + skills: 'כישורים', + about: 'תמצית' }; -export default he; +export default lang; diff --git a/src/lang/hu.js b/src/lang/hu.js index 6744364..3831db6 100755 --- a/src/lang/hu.js +++ b/src/lang/hu.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const hu = { - headings: { - contact: 'Kapcsolat', - experience: 'Munkatapasztalat', - education: 'Tanulmány', - skills: 'Készségek', - about: 'Rólam' - } +const lang = { + contact: 'Kapcsolat', + experience: 'Munkatapasztalat', + education: 'Tanulmány', + skills: 'Készségek', + about: 'Rólam' }; -export default hu; +export default lang; diff --git a/src/lang/id.js b/src/lang/id.js index d9003f6..b1aa0e2 100755 --- a/src/lang/id.js +++ b/src/lang/id.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const id = { - headings: { - contact: "Kontak", - experience: "Pengalaman", - education: "Pendidikan", - skills: "Keterampilan", - about: "Tentang Saya" - } -}; -export default id; +const lang = { + contact: 'Kontak', + experience: 'Pengalaman', + education: 'Pendidikan', + skills: 'Keterampilan', + about: 'Tentang Saya' +}; +export default lang; diff --git a/src/lang/it.js b/src/lang/it.js index d8fa490..56ab8b1 100755 --- a/src/lang/it.js +++ b/src/lang/it.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const it = { - headings: { - contact: 'Contatti', - experience: 'Esperienza professionale', - education: 'Formazione', - skills: 'Competenze', - about: 'Su di me' - } +const lang = { + contact: 'Contatti', + experience: 'Esperienza professionale', + education: 'Formazione', + skills: 'Competenze', + about: 'Su di me' }; -export default it; +export default lang; diff --git a/src/lang/ja.js b/src/lang/ja.js index 9187359..567178b 100755 --- a/src/lang/ja.js +++ b/src/lang/ja.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const jp = { - headings: { - contact: '連絡先', - experience: '職務経歴', - education: '学歴', - skills: 'スキル', - about: '自己紹介' - } +const lang = { + contact: '連絡先', + experience: '職務経歴', + education: '学歴', + skills: 'スキル', + about: '自己紹介' }; -export default jp; +export default lang; diff --git a/src/lang/ka.js b/src/lang/ka.js index d1f9f5a..9ef6be0 100755 --- a/src/lang/ka.js +++ b/src/lang/ka.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const ka = { - headings: { - contact: 'კონტაქტი', - experience: 'გამოცდილება', - education: 'განათლება', - skills: 'უნარები', - about: 'ჩემ შესახებ' - } +const lang = { + contact: 'კონტაქტი', + experience: 'გამოცდილება', + education: 'განათლება', + skills: 'უნარები', + about: 'ჩემ შესახებ' }; -export default ka; +export default lang; diff --git a/src/lang/ko.js b/src/lang/ko.js index 51ec756..89e65e5 100644 --- a/src/lang/ko.js +++ b/src/lang/ko.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const ko = { - headings: { - contact: "연락처", - experience: "경력", - education: "학력", - skills: "보유스킬", - about: "자기소개" - } - }; - export default ko; +const lang = { + contact: '연락처', + experience: '경력', + education: '학력', + skills: '보유스킬', + about: '자기소개' +}; +export default lang; diff --git a/src/lang/lt.js b/src/lang/lt.js index b310458..2f40eac 100755 --- a/src/lang/lt.js +++ b/src/lang/lt.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const lt = { - headings: { - contact: 'Kontaktai', - experience: 'Patirtis', - education: 'Išsilavinimas', - skills: 'Įgūdžiai', - about: 'Apie mane' - } +const lang = { + contact: 'Kontaktai', + experience: 'Patirtis', + education: 'Išsilavinimas', + skills: 'Įgūdžiai', + about: 'Apie mane' }; -export default lt; +export default lang; diff --git a/src/lang/nl.js b/src/lang/nl.js index 95a3c87..5d4e832 100755 --- a/src/lang/nl.js +++ b/src/lang/nl.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const nl = { - headings: { - contact: 'Contact', - experience: 'Ervaringen', - education: 'Opleidingen', - skills: 'Skills', - about: 'Over mij' - } - }; - export default nl; \ No newline at end of file +const lang = { + contact: 'Contact', + experience: 'Ervaringen', + education: 'Opleidingen', + skills: 'Skills', + about: 'Over mij' +}; +export default lang; diff --git a/src/lang/pl.js b/src/lang/pl.js index 05fc70e..dfbc1a5 100755 --- a/src/lang/pl.js +++ b/src/lang/pl.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const pl = { - headings: { - contact: 'Kontakt', - experience: 'Doświadczenie', - education: 'Wykształcenie', - skills: 'Umiejętności', - about: 'O mnie' - } +const lang = { + contact: 'Kontakt', + experience: 'Doświadczenie', + education: 'Wykształcenie', + skills: 'Umiejętności', + about: 'O mnie' }; -export default pl; +export default lang; diff --git a/src/lang/pt-br.js b/src/lang/pt-br.js index 4403f93..864e7f2 100755 --- a/src/lang/pt-br.js +++ b/src/lang/pt-br.js @@ -1,11 +1,9 @@ -/* eslint-disable */ -const ptbr = { - headings: { - contact: 'Contato', - experience: 'Experiência Profissional', - education: 'Formação Acadêmica', /*You can choose, "Educação" or "Formação Acadêmica"! But the second one is more professional and is more used.*/ - skills: 'Competências', - about: 'Sobre' - } +const lang = { + contact: 'Contato', + experience: 'Experiência Profissional', + /* You can choose, "Educação" or "Formação Acadêmica"! But the second one is more professional and is more used. */ + education: 'Formação Acadêmica', + skills: 'Competências', + about: 'Sobre' }; -export default ptbr; +export default lang; diff --git a/src/lang/pt.js b/src/lang/pt.js index bf87f02..0588bf5 100755 --- a/src/lang/pt.js +++ b/src/lang/pt.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const pt = { - headings: { - contact: 'Contactos', - experience: 'Experiência Profissional', - education: 'Educação', - skills: 'Competências', - about: 'Sobre mim' - } +const lang = { + contact: 'Contactos', + experience: 'Experiência Profissional', + education: 'Educação', + skills: 'Competências', + about: 'Sobre mim' }; -export default pt; +export default lang; diff --git a/src/lang/ru.js b/src/lang/ru.js index 79c906f..85ee0d2 100755 --- a/src/lang/ru.js +++ b/src/lang/ru.js @@ -1,13 +1,9 @@ -/* eslint-disable */ - -const ru = { - headings: { - contact: "Контакты", - experience: "Опыт", - education: "Образование", - skills: "Навыки", - about: "Обо мне" - } +const lang = { + contact: 'Контакты', + experience: 'Опыт', + education: 'Образование', + skills: 'Навыки', + about: 'Обо мне' }; -export default ru; +export default lang; diff --git a/src/lang/sv.js b/src/lang/sv.js index 1e894e3..1debecc 100755 --- a/src/lang/sv.js +++ b/src/lang/sv.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const sv = { - headings: { - contact: 'Kontakt', - experience: 'Arbetslivserfarenhet', - education: 'Utbildning', - skills: 'Kunskaper', - about: 'Om mig' - } +const lang = { + contact: 'Kontakt', + experience: 'Arbetslivserfarenhet', + education: 'Utbildning', + skills: 'Kunskaper', + about: 'Om mig' }; -export default sv; +export default lang; diff --git a/src/lang/th.js b/src/lang/th.js index 1f4aca5..1898719 100755 --- a/src/lang/th.js +++ b/src/lang/th.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const th = { - headings: { - contact: 'ข้อมูลติดต่อ', - experience: 'ประสบการณ์ทำงาน', - education: 'ประวัติการศึกษา', - skills: 'ทักษะและความสามารถ', - about: 'ข้อมูลส่วนตัว' - } +const lang = { + contact: 'ข้อมูลติดต่อ', + experience: 'ประสบการณ์ทำงาน', + education: 'ประวัติการศึกษา', + skills: 'ทักษะและความสามารถ', + about: 'ข้อมูลส่วนตัว' }; -export default th; +export default lang; diff --git a/src/lang/tr.js b/src/lang/tr.js index 42e6372..8d4624a 100755 --- a/src/lang/tr.js +++ b/src/lang/tr.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const tr = { - headings: { - contact: 'İletişim', - experience: 'Deneyim', - education: 'Eğitim', - skills: 'Yetenekler', - about: 'Hakkımda' - } +const lang = { + contact: 'İletişim', + experience: 'Deneyim', + education: 'Eğitim', + skills: 'Yetenekler', + about: 'Hakkımda' }; -export default tr; +export default lang; diff --git a/src/lang/zh-tw.js b/src/lang/zh-tw.js index d712b91..4404121 100755 --- a/src/lang/zh-tw.js +++ b/src/lang/zh-tw.js @@ -1,11 +1,8 @@ -/* eslint-disable */ -const zhtw = { - headings: { - contact: '聯絡方式', - experience: '經歷', - education: '學歷', - skills: '技能專長', - about: '自我介紹' - } +const lang = { + contact: '聯絡方式', + experience: '經歷', + education: '學歷', + skills: '技能專長', + about: '自我介紹' }; -export default zhtw; +export default lang; diff --git a/src/resumes/left-right-rtl.vue b/src/resumes/left-right-rtl.vue index c190b76..324293a 100755 --- a/src/resumes/left-right-rtl.vue +++ b/src/resumes/left-right-rtl.vue @@ -13,7 +13,7 @@
-

{{ lang.headings.experience }}

+

{{ lang.experience }}

{{experience.company}} {{experience.position}} @@ -22,7 +22,7 @@
-

{{ lang.headings.contact }}

+

{{ lang.contact }}

@@ -49,13 +49,13 @@
-

{{ lang.headings.education }}

+

{{ lang.education }}

{{education.degree}} {{education.description}}
-

{{ lang.headings.skills }}

+

{{ lang.skills }}

{{skill.name}} diff --git a/src/resumes/left-right.vue b/src/resumes/left-right.vue index f7b9faf..4e700bb 100755 --- a/src/resumes/left-right.vue +++ b/src/resumes/left-right.vue @@ -13,7 +13,7 @@
-

{{ lang.headings.experience }}

+

{{ lang.experience }}

{{experience.company}} {{experience.position}} @@ -22,7 +22,7 @@
-

{{ lang.headings.contact }}

+

{{ lang.contact }}

@@ -49,13 +49,13 @@
-

{{ lang.headings.education }}

+

{{ lang.education }}

{{education.degree}} {{education.description}}
-

{{ lang.headings.skills }}

+

{{ lang.skills }}

{{skill.name}} diff --git a/src/resumes/material-dark.vue b/src/resumes/material-dark.vue index 0717023..3a25552 100755 --- a/src/resumes/material-dark.vue +++ b/src/resumes/material-dark.vue @@ -5,7 +5,7 @@
- {{ lang.headings.contact }} + {{ lang.contact }}
@@ -13,7 +13,7 @@
    -
  • Born {{person.birth.year}} in {{person.birth.location}}
  • +
  • {{ lang.born }} {{person.birth.year}} {{ lang.bornIn }} {{person.birth.location}}
@@ -77,7 +77,7 @@
- {{ lang.headings.skills }} + {{ lang.skills }}
@@ -98,7 +98,7 @@
{{person.position}}
-
{{ lang.headings.experience }}
+
{{ lang.experience }}

{{experience.position}} - {{experience.company}}

@@ -107,7 +107,7 @@ {{experience.description}}

-
{{ lang.headings.education }}
+
{{ lang.education }}
{{education.degree}}
diff --git a/src/resumes/oblique.vue b/src/resumes/oblique.vue index e026f2e..9bfebb4 100755 --- a/src/resumes/oblique.vue +++ b/src/resumes/oblique.vue @@ -16,7 +16,7 @@
-

{{ lang.headings.experience }}

+

{{ lang.experience }}

@@ -32,7 +32,7 @@
-

{{ lang.headings.education }}

+

{{ lang.education }}

{{education.degree}} @@ -43,7 +43,7 @@
-

{{ lang.headings.skills }}

+

{{ lang.skills }}

details @@ -55,7 +55,7 @@ {{person.knowledge}}
-

{{ lang.headings.contact }}

+

{{ lang.contact }}

{{person.contact.email}} {{person.contact.phone}} diff --git a/src/resumes/options.js b/src/resumes/options.js index 61c7ffd..cc3de95 100755 --- a/src/resumes/options.js +++ b/src/resumes/options.js @@ -1,6 +1,10 @@ import yaml from 'js-yaml'; -import { PERSON } from '../../resume/data.yml'; -import { terms } from '../terms'; +import { + PERSON +} from '../../resume/data.yml'; +import { + terms +} from '../terms'; // Called by templates to decrease redundancy function getVueOptions (name) { @@ -14,11 +18,24 @@ function getVueOptions (name) { }, computed: { lang () { - return this.terms[this.person.lang]; + const defaultLang = this.terms.en; + const useLang = this.terms[this.person.lang]; + + // overwrite non-set fields with default lang + Object.keys(defaultLang) + .filter(k => !useLang[k]) + .forEach(k => { + console.log(k); + useLang[k] = defaultLang[k]; + }); + + return useLang; } } }; return opt; } -export { getVueOptions }; +export { + getVueOptions +}; diff --git a/src/resumes/purple.vue b/src/resumes/purple.vue index dd0e44c..fdbb2e5 100755 --- a/src/resumes/purple.vue +++ b/src/resumes/purple.vue @@ -18,7 +18,7 @@
-

{{ lang.headings.experience }}

+

{{ lang.experience }}

{{experience.company}}

@@ -34,7 +34,7 @@
-

{{ lang.headings.education }}

+

{{ lang.education }}

{{education.description}}

@@ -42,7 +42,7 @@
-

{{ lang.headings.skills }}

+

{{ lang.skills }}

{{person.knowledge}}

    @@ -56,7 +56,7 @@
diff --git a/src/resumes/side-bar-rtl.vue b/src/resumes/side-bar-rtl.vue index e164d21..b364374 100755 --- a/src/resumes/side-bar-rtl.vue +++ b/src/resumes/side-bar-rtl.vue @@ -15,7 +15,7 @@
-

{{ lang.headings.contact }}

+

{{ lang.contact }}

@@ -47,7 +47,7 @@
-

{{ lang.headings.experience }}

+

{{ lang.experience }}

{{experience.company}} - @@ -62,7 +62,7 @@
-

{{ lang.headings.education }}

+

{{ lang.education }}

{{education.degree}} @@ -73,7 +73,7 @@
-

{{ lang.headings.skills }}

+

{{ lang.skills }}

{{skill.name}} diff --git a/src/resumes/side-bar.vue b/src/resumes/side-bar.vue index f704503..f1ae426 100755 --- a/src/resumes/side-bar.vue +++ b/src/resumes/side-bar.vue @@ -15,7 +15,7 @@
-

{{ lang.headings.contact }}

+

{{ lang.contact }}

@@ -47,7 +47,7 @@
-

{{ lang.headings.experience }}

+

{{ lang.experience }}

{{experience.company}} - @@ -62,7 +62,7 @@
-

{{ lang.headings.education }}

+

{{ lang.education }}

{{education.degree}} @@ -73,7 +73,7 @@
-

{{ lang.headings.skills }}

+

{{ lang.skills }}

{{skill.name}}
{{person.contact.email}}