From ef7b338d732875ad3fa063f7e8a2d0924174166c Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 9 Oct 2019 15:01:54 +0530 Subject: [PATCH] translation: remove flags usage Signed-off-by: Rohit Yadav --- ui/package-lock.json | 13 ----- ui/package.json | 1 - ui/src/components/tools/TranslationMenu.vue | 56 ++++++++++----------- ui/src/core/ext.js | 4 +- 4 files changed, 30 insertions(+), 44 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index 578710a713a..b9b9367f81f 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -8164,11 +8164,6 @@ "path-exists": "^4.0.0" } }, - "flag-icon-css": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/flag-icon-css/-/flag-icon-css-2.9.0.tgz", - "integrity": "sha512-SeHvGEB43XFPZiJz6lFFRGHfp+Db+s1qGiClW70cZauQVbPM42wImlNUEuXSXs94kPchz7xvoxP0QK1y6FxLfg==" - }, "flat": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", @@ -17720,14 +17715,6 @@ } } }, - "vue-flag-icon": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/vue-flag-icon/-/vue-flag-icon-1.0.6.tgz", - "integrity": "sha1-AwT9/uvZgqa/mFxjPDRv88bS+dc=", - "requires": { - "flag-icon-css": "^2.8.0" - } - }, "vue-hot-reload-api": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz", diff --git a/ui/package.json b/ui/package.json index 49b354cec8a..ce8b1842e82 100644 --- a/ui/package.json +++ b/ui/package.json @@ -53,7 +53,6 @@ "vue": "^2.6.10", "vue-clipboard2": "^0.3.1", "vue-cropper": "0.4.9", - "vue-flag-icon": "^1.0.6", "vue-i18n": "^8.14.1", "vue-ls": "^3.2.1", "vue-router": "^3.1.3", diff --git a/ui/src/components/tools/TranslationMenu.vue b/ui/src/components/tools/TranslationMenu.vue index 1bed1f2042d..f82fec09be5 100644 --- a/ui/src/components/tools/TranslationMenu.vue +++ b/ui/src/components/tools/TranslationMenu.vue @@ -2,26 +2,29 @@ - + - - English - हिन्दी - 日本語 - 한국어 - 简体中文 - Arabic - Catalan - Deutsch - Españo - Français - Italiano - Magyar - Nederlands - Norsk - Polish - Português brasileiro - Русский + + English + हिन्दी + 日本語 + 한국어 + 简体中文 + Arabic + Catalan + Deutsch + Españo + Français + Italiano + Magyar + Nederlands + Norsk + Polish + Português brasileiro + Русский @@ -49,19 +52,13 @@ import hi from 'ant-design-vue/lib/locale-provider/he_IL' import moment from 'moment' import 'moment/locale/zh-cn' -import FlagIcon from 'vue-flag-icon' -Vue.use(FlagIcon) - moment.locale('en') export default { name: 'TranslationMenu', - components: { - FlagIcon - }, data () { return { - flag: 'gb', + language: 'en', enUS, arEG, caES, @@ -88,11 +85,14 @@ export default { if (!localeValue) { localeValue = 'en' } + this.setLocale(localeValue) + }, + setLocale (localeValue) { this.$locale = localeValue - moment.locale(localeValue) this.$i18n.locale = localeValue + this.language = localeValue + moment.locale(localeValue) Vue.ls.set('current_locale', localeValue) - this.flag = e.item.$children[0].iso } } } diff --git a/ui/src/core/ext.js b/ui/src/core/ext.js index 2d8b02c936f..97bde5a20ab 100644 --- a/ui/src/core/ext.js +++ b/ui/src/core/ext.js @@ -8,9 +8,9 @@ import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' // import { far } from '@fortawesome/free-regular-svg-icons' import { faCentos, faUbuntu, faSuse, faRedhat, faFedora, faLinux, faFreebsd, faApple, faWindows, faJava } from '@fortawesome/free-brands-svg-icons' -import { faMicrochip, faMemory, faDatabase, faEthernet, faCompactDisc } from '@fortawesome/free-solid-svg-icons' +import { faLanguage, faMicrochip, faMemory, faDatabase, faEthernet, faCompactDisc } from '@fortawesome/free-solid-svg-icons' library.add(faCentos, faUbuntu, faSuse, faRedhat, faFedora, faLinux, faFreebsd, faApple, faWindows, faJava) -library.add(faMicrochip, faMemory, faDatabase, faEthernet, faCompactDisc) +library.add(faLanguage, faMicrochip, faMemory, faDatabase, faEthernet, faCompactDisc) Vue.component('font-awesome-icon', FontAwesomeIcon)