From 387d9ee5c3bdd9fcc298bb2a03d62e4c795e13dd Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Tue, 21 Feb 2023 18:11:01 +0000 Subject: [PATCH 1/7] =?UTF-8?q?=F0=9F=9A=A8=20Fix=20lint=20error=20(single?= =?UTF-8?q?=20quotes)=20in=20MvgConnection=20widget?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Widgets/MvgConnection.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Widgets/MvgConnection.vue b/src/components/Widgets/MvgConnection.vue index b4eae501..7d5ea54c 100644 --- a/src/components/Widgets/MvgConnection.vue +++ b/src/components/Widgets/MvgConnection.vue @@ -66,7 +66,7 @@ export default { connections: null, locationSearch: null, connectionName: null, - defaultTitle: "Connection", + defaultTitle: 'Connection', locations: { origin: undefined, destination: undefined, From 940879a7a7cb32317b6498fb61f8a0ec55da400b Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Tue, 21 Feb 2023 18:19:10 +0000 Subject: [PATCH 2/7] =?UTF-8?q?=F0=9F=93=9D=20Adds=20missing=20languages?= =?UTF-8?q?=20to=20readme,=20sorts=20alphabetically?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6b9efae4..a3ad6b2f 100644 --- a/README.md +++ b/README.md @@ -400,30 +400,32 @@ All data is fully E2E encrypted before being sent to the backend (done in [`Clou ## Language Switching 🌎 > For full internationalization documentation, see: [**Multi-Language Support**](./docs/multi-language-support.md) -Dashy supports multiple languages and locales. When available, your language should be automatically detected and applied on load. But you can also select a language through the UI (under config --> Switch Language) or set `appConfig.language` to your language (specified as a 2-digit [ISO 639-1 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)). +Dashy supports multiple languages and locales. When available, your language should be automatically detected and applied on load. But you can also select a language through the UI (under config --> Switch Language) or set `appConfig.language` to your language (specified as a 2-digit [ISO 639-1 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)), as seen below, e.g. `language: de`. #### Supported Languages - 🇬🇧 **English**: `en` - _Default_ +- 🇦🇪 **Arabic**: `ar` - _Auto-generated_ +- 🇧🇬 **Bulgarian**: `bg` - Contributed by **[@asenov](https://github.com/asenov)** - 🇨🇳 **Chinese**: `cn` - Contributed by **[@FormatToday](https://github.com/FormatToday)** +- 🇨🇿 **Czech**: `cs` - Contributed by **[@Tuzi555](https://github.com/Tuzi555)** +- 🇩🇰 **Danish**: `da` - Contributed by **[@lordpansar](https://github.com/lordpansar)** - 🇳🇱 **Dutch**: `nl` - Contributed by **[@evroon](https://github.com/evroon)** -- 🇲🇫 **French**: `fr` - Contributed by **[@EVOTk](https://github.com/EVOTk)** +- 🇫🇷 **French**: `fr` - Contributed by **[@EVOTk](https://github.com/EVOTk)** - 🇩🇪 **German**: `de` - Contributed by **[@Niklashere](https://github.com/Niklashere)** +- 🇮🇳 **Hindi**: `hi` - _Auto-generated_ - 🇮🇹 **Italian**: `it` - Contributed by **[@alexdelprete](https://github.com/alexdelprete)** +- 🇯🇵 **Japanese**: `ja` - _Auto-generated_ +- 🇰🇷 **Korean**: `ko` - Contributed by **[@boggy-cs](https://github.com/boggy-cs)** - 🇳🇴 **Norwegian Bokmål**: `nb` - Contributed by **[@rubjo](https://github.com/rubjo)** - 🇵🇱 **Polish**: `pl` - Contributed by **[@skaarj1989](https://github.com/skaarj1989)** - 🇵🇹 **Portuguese**: `pt` - Contributed by **[@LeoColman](https://github.com/LeoColman)** -- 🇪🇸 **Spanish**: `es` - Contributed by **[@lu4t](https://github.com/lu4t)** +- 🇷🇺 **Russian**: `ru` - _Auto-generated_ +- 🇸🇰 **Slovak**: `sk` - Contributed by **[@Smexhy](https://github.com/Smexhy)** - 🇸🇮 **Slovenian**: `sl` - Contributed by **[@UrekD](https://github.com/UrekD)** +- 🇪🇸 **Spanish**: `es` - Contributed by **[@lu4t](https://github.com/lu4t)** - 🇸🇪 **Swedish**: `sv` - Contributed by **[@BOZG](https://github.com/BOZG)** - 🇹🇼 **Traditional Chinese**: `zh-TW` - Contributed by **[@stanly0726](https://github.com/stanly0726)** -- 🇷🇺 **Russian**: `ru` -- 🇦🇪 **Arabic**: `ar` -- 🇮🇳 **Hindi**: `hi` -- 🇯🇵 **Japanese**: `ja` -- 🇰🇷 **Korean**: `ko` - Contributed by **[@boggy-cs](https://github.com/boggy-cs)** -- 🇸🇰 **Slovak**: `sk` - Contributed by **[@Smexhy](https://github.com/Smexhy)** -- 🇩🇰 **Danish**: `da` - Contributed by **[@lordpansar](https://github.com/lordpansar)** -- 🇨🇿 **Czech**: `cs` - Contributed by **[@Tuzi555](https://github.com/Tuzi555)** +- 🏴‍☠️ **Pirate**: `pirate` - Contributed by **[@Lissy93](https://github.com/lissy93)** #### Add your Language I would love Dashy to be available to everyone without language being a barrier to entry. If you've got a few minutes to spare, consider adding translations for your language. It's a quick task, and all text is in [a single JSON file](https://github.com/Lissy93/dashy/tree/master/src/assets/locales). Since any missing text will fall back to English, you don't need to translate it all. From 70a6cc6b64d580a19e835cde4e03bb8a368b34d8 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Tue, 21 Feb 2023 18:23:45 +0000 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=9A=9A=20Sorts=20languages=20alphabet?= =?UTF-8?q?ically,=20by=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/languages.js | 219 +++++++++++++++++++++-------------------- 1 file changed, 110 insertions(+), 109 deletions(-) diff --git a/src/utils/languages.js b/src/utils/languages.js index 223171f1..25d58539 100644 --- a/src/utils/languages.js +++ b/src/utils/languages.js @@ -1,29 +1,30 @@ -// Locales - Import translation files here! +// Locales - Import translation files here! (sort alphabetically) import en from '@/assets/locales/en.json'; +import ar from '@/assets/locales/ar.json'; +import bg from '@/assets/locales/bg.json'; +import cs from '@/assets/locales/cs.json'; +import da from '@/assets/locales/da.json'; import de from '@/assets/locales/de.json'; +import es from '@/assets/locales/es.json'; +import fr from '@/assets/locales/fr.json'; +import hi from '@/assets/locales/hi.json'; +import it from '@/assets/locales/it.json'; +import ja from '@/assets/locales/ja.json'; +import ko from '@/assets/locales/ko.json'; +import nb from '@/assets/locales/nb.json'; import nl from '@/assets/locales/nl.json'; import pl from '@/assets/locales/pl.json'; -import fr from '@/assets/locales/fr.json'; -import sl from '@/assets/locales/sl.json'; -import es from '@/assets/locales/es.json'; -import it from '@/assets/locales/it.json'; -import zhCN from '@/assets/locales/zh-CN.json'; -import zhTW from '@/assets/locales/zh-TW.json'; -import ar from '@/assets/locales/ar.json'; -import hi from '@/assets/locales/hi.json'; -import ja from '@/assets/locales/ja.json'; import pt from '@/assets/locales/pt.json'; import ru from '@/assets/locales/ru.json'; -import nb from '@/assets/locales/nb.json'; -import pirate from '@/assets/locales/zz-pirate.json'; -import sv from '@/assets/locales/sv.json'; -import bg from '@/assets/locales/bg.json'; -import ko from '@/assets/locales/ko.json'; import sk from '@/assets/locales/sk.json'; -import da from '@/assets/locales/da.json'; -import cs from '@/assets/locales/cs.json'; +import sl from '@/assets/locales/sl.json'; +import sv from '@/assets/locales/sv.json'; +import zhCN from '@/assets/locales/zh-CN.json'; +import zhTW from '@/assets/locales/zh-TW.json'; +import pirate from '@/assets/locales/zz-pirate.json'; // Language data - Next register your language by adding it to this list +// Sorted alphabetically by code (except English which is first, and specials at the end) export const languages = [ { name: 'English', @@ -31,14 +32,80 @@ export const languages = [ locale: en, flag: '🇬🇧', }, + { // Arabic + name: 'العربية', + code: 'ar', + locale: ar, + flag: '🇦🇪', + }, + { // Bulgarian + name: 'Български', + code: 'bg', + locale: bg, + flag: '🇧🇬', + }, + { // Czech + name: 'Čeština', + code: 'cs', + locale: cs, + flag: '🇨🇿', + }, + { // Danish + name: 'Dansk', + code: 'da', + locale: da, + flag: '🇩🇰', + }, { // German name: 'Deutsch', code: 'de', locale: de, flag: '🇩🇪', }, + { // Spanish + name: 'Español', + code: 'es', + locale: es, + flag: '🇪🇸', + }, { - name: 'Dutch', + name: 'Français', + code: 'fr', + locale: fr, + flag: '🇲🇫', + }, + { // Hindi + name: 'नहीं', + code: 'hi', + locale: hi, + flag: '🇮🇳', + }, + { // Italian + name: 'Italiano', + code: 'it', + locale: it, + flag: '🇮🇹', + }, + { // Japanese + name: '日本語', + code: 'ja', + locale: ja, + flag: '🇯🇵', + }, + { // Korean + name: '한국어', + code: 'ko', + locale: ko, + flag: '🇰🇷', + }, + { // Norwegian + name: 'Norsk', + code: 'nb', + locale: nb, + flag: '🇳🇴', + }, + { // Dutch + name: 'Nederlands', code: 'nl', locale: nl, flag: '🇳🇱', @@ -49,60 +116,6 @@ export const languages = [ locale: pl, flag: '🇵🇱', }, - { - name: 'Français', - code: 'fr', - locale: fr, - flag: '🇲🇫', - }, - { - name: 'Slovenščina', - code: 'sl', - locale: sl, - flag: '🇸🇮', - }, - { // Spanish - name: 'Español', - code: 'es', - locale: es, - flag: '🇪🇸', - }, - { // Italian - name: 'Italiano', - code: 'it', - locale: it, - flag: '🇮🇹', - }, - { // Chinese - name: '简体中文', - code: 'cn', - locale: zhCN, - flag: '🇨🇳', - }, - { // Chinese - name: '繁體中文', - code: 'zh-TW', - locale: zhTW, - flag: '🇹🇼', - }, - { // Arabic - name: 'العربية', - code: 'ar', - locale: ar, - flag: '🇦🇪', - }, - { // Hindi - name: 'नहीं', - code: 'hi', - locale: hi, - flag: '🇮🇳', - }, - { // Japanese - name: '日本語', - code: 'ja', - locale: ja, - flag: '🇯🇵', - }, { // Portuguese name: 'Português', code: 'pt', @@ -115,17 +128,17 @@ export const languages = [ locale: ru, flag: '🇷🇺', }, - { // Norwegian - name: 'Norsk', - code: 'nb', - locale: nb, - flag: '🇳🇴', + { // Slovak + name: 'Slovenčina', + code: 'sk', + locale: sk, + flag: '🇸🇰', }, - { // Joke Language - Pirate - name: 'Pirate', - code: 'pirate', - locale: pirate, - flag: '🏴‍☠️', + { + name: 'Slovenščina', + code: 'sl', + locale: sl, + flag: '🇸🇮', }, { // Swedish name: 'Svenska', @@ -133,35 +146,23 @@ export const languages = [ locale: sv, flag: '🇸🇪', }, - { // Bulgarian - name: 'Български', - code: 'bg', - locale: bg, - flag: '🇧🇬', + { // Chinese + name: '简体中文', + code: 'cn', + locale: zhCN, + flag: '🇨🇳', }, - { // Korean - name: '한국어', - code: 'ko', - locale: ko, - flag: '🇰🇷', + { // Chinese + name: '繁體中文', + code: 'zh-TW', + locale: zhTW, + flag: '🇹🇼', }, - { // Slovak - name: 'Slovenčina', - code: 'sk', - locale: sk, - flag: '🇸🇰', - }, - { // Danish - name: 'Dansk', - code: 'da', - locale: da, - flag: '🇩🇰', - }, - { // Czech - name: 'Čeština', - code: 'cs', - locale: cs, - flag: '🇨🇿', + { // Joke Language - Pirate + name: 'Pirate', + code: 'pirate', + locale: pirate, + flag: '🏴‍☠️', }, ]; From 7200d87d6aea25a74805e9220503e41913059102 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Tue, 21 Feb 2023 18:26:08 +0000 Subject: [PATCH 4/7] =?UTF-8?q?=F0=9F=8C=90=20Adds=20Bengali=20(thanks=20@?= =?UTF-8?q?Soaibuzzaman=20=F0=9F=99=8C=20#1107)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + src/utils/languages.js | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/README.md b/README.md index a3ad6b2f..43fe197b 100644 --- a/README.md +++ b/README.md @@ -405,6 +405,7 @@ Dashy supports multiple languages and locales. When available, your language sho #### Supported Languages - 🇬🇧 **English**: `en` - _Default_ - 🇦🇪 **Arabic**: `ar` - _Auto-generated_ +- 🇧🇩 **Bengali**: `bn` - Contributed by **[@soaibsafi](https://github.com/soaibsafi)** - 🇧🇬 **Bulgarian**: `bg` - Contributed by **[@asenov](https://github.com/asenov)** - 🇨🇳 **Chinese**: `cn` - Contributed by **[@FormatToday](https://github.com/FormatToday)** - 🇨🇿 **Czech**: `cs` - Contributed by **[@Tuzi555](https://github.com/Tuzi555)** diff --git a/src/utils/languages.js b/src/utils/languages.js index 25d58539..643466ac 100644 --- a/src/utils/languages.js +++ b/src/utils/languages.js @@ -2,6 +2,7 @@ import en from '@/assets/locales/en.json'; import ar from '@/assets/locales/ar.json'; import bg from '@/assets/locales/bg.json'; +import bn from '@/assets/locales/bn.json'; import cs from '@/assets/locales/cs.json'; import da from '@/assets/locales/da.json'; import de from '@/assets/locales/de.json'; @@ -44,6 +45,12 @@ export const languages = [ locale: bg, flag: '🇧🇬', }, + { // Bengali + name: 'বাংলা', + code: 'bn', + locale: bn, + flag: '🇧🇩', + }, { // Czech name: 'Čeština', code: 'cs', From 2e053064d3285b94fb14300bfbe594c153c1ddca Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Tue, 21 Feb 2023 18:27:18 +0000 Subject: [PATCH 5/7] =?UTF-8?q?=F0=9F=8C=90=20Adds=20Turkish=20(thanks=20@?= =?UTF-8?q?imsakg=20=20=F0=9F=99=8C=20#1188)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + src/utils/languages.js | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/README.md b/README.md index 43fe197b..6d9ff317 100644 --- a/README.md +++ b/README.md @@ -426,6 +426,7 @@ Dashy supports multiple languages and locales. When available, your language sho - 🇪🇸 **Spanish**: `es` - Contributed by **[@lu4t](https://github.com/lu4t)** - 🇸🇪 **Swedish**: `sv` - Contributed by **[@BOZG](https://github.com/BOZG)** - 🇹🇼 **Traditional Chinese**: `zh-TW` - Contributed by **[@stanly0726](https://github.com/stanly0726)** +- 🇹🇷 **Turkish**: `tr` - _Auto-generated_ - 🏴‍☠️ **Pirate**: `pirate` - Contributed by **[@Lissy93](https://github.com/lissy93)** #### Add your Language diff --git a/src/utils/languages.js b/src/utils/languages.js index 643466ac..7468c621 100644 --- a/src/utils/languages.js +++ b/src/utils/languages.js @@ -20,6 +20,7 @@ import ru from '@/assets/locales/ru.json'; import sk from '@/assets/locales/sk.json'; import sl from '@/assets/locales/sl.json'; import sv from '@/assets/locales/sv.json'; +import tr from '@/assets/locales/tr.json'; import zhCN from '@/assets/locales/zh-CN.json'; import zhTW from '@/assets/locales/zh-TW.json'; import pirate from '@/assets/locales/zz-pirate.json'; @@ -153,6 +154,12 @@ export const languages = [ locale: sv, flag: '🇸🇪', }, + { // Turkish + name: 'Türkçe', + code: 'tr', + locale: tr, + flag: '🇹🇷', + }, { // Chinese name: '简体中文', code: 'cn', From 896b7093f31caa2a3c3ea1c0b9b4f9d66deb6ba0 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Thu, 23 Feb 2023 17:20:37 +0000 Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=8C=90=20Credits=20@imsakg=20for=20Tu?= =?UTF-8?q?rkish=20translations=20(#1088)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6d9ff317..242f7d97 100644 --- a/README.md +++ b/README.md @@ -426,7 +426,7 @@ Dashy supports multiple languages and locales. When available, your language sho - 🇪🇸 **Spanish**: `es` - Contributed by **[@lu4t](https://github.com/lu4t)** - 🇸🇪 **Swedish**: `sv` - Contributed by **[@BOZG](https://github.com/BOZG)** - 🇹🇼 **Traditional Chinese**: `zh-TW` - Contributed by **[@stanly0726](https://github.com/stanly0726)** -- 🇹🇷 **Turkish**: `tr` - _Auto-generated_ +- 🇹🇷 **Turkish**: `tr` - Contributed by **[@imsakg](https://github.com/imsakg)** - 🏴‍☠️ **Pirate**: `pirate` - Contributed by **[@Lissy93](https://github.com/lissy93)** #### Add your Language From b4496fb91081e6192d26603f25c644de286178f7 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Thu, 23 Feb 2023 17:41:58 +0000 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=94=84=20Re-run=20CI=20builds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit