Skip to content

Commit f14b36b

Browse files
authored
Merge pull request #2068 from xenon007/locale/i18n-ru
Added Russian localization and README-ru.md
2 parents d614735 + 88f1a11 commit f14b36b

File tree

11 files changed

+2782
-5
lines changed

11 files changed

+2782
-5
lines changed

README-ru.md

Lines changed: 321 additions & 0 deletions
Large diffs are not rendered by default.

server/middleware/language.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func LanguageHandler() gin.HandlerFunc {
1414

1515
// fmt.Printf("Accept-Language value is: %s\r\n", lang)
1616
var oldLang = global.GVA_CONFIG.Language.Language
17-
if lang != "" && (lang == "en" || lang == "zh" || lang == "ar") { // currently we support en, zh, ar languages only
17+
if lang != "" && (lang == "en" || lang == "zh" || lang == "ar" || lang == "ru") { // currently we support en, zh, ar, ru languages only
1818
global.GVA_CONFIG.Language.Language = lang
1919
} else {
2020
global.GVA_CONFIG.Language.Language = "en"

server/resource/lang/ru.json

Lines changed: 534 additions & 0 deletions
Large diffs are not rendered by default.

server/utils/translate/translator.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ type Translator struct {
2222
// t.bundle.MustLoadMessageFile("./lang/en.json")
2323
// t.bundle.MustLoadMessageFile("./lang/zh.json")
2424
// t.bundle.MustLoadMessageFile("./lang/ar.json")
25+
// t.bundle.MustLoadMessageFile("./lang/ru.json")
2526
// t.localizer = i18n.NewLocalizer(t.bundle, initLang) // should add additionl check here
2627
// t.IsInit = true
2728
// // end of adding

web/src/App.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import zh from 'element-plus/dist/locale/zh-cn.mjs'
1414
import en from 'element-plus/dist/locale/en.mjs'
1515
import ar from 'element-plus/dist/locale/ar.mjs'
16+
import ru from 'element-plus/dist/locale/ru.mjs'
1617
import zh_tw from 'element-plus/dist/locale/zh-tw.mjs'
1718
import { useAppStore } from '@/pinia'
1819
import { useI18n } from 'vue-i18n'
@@ -26,7 +27,8 @@
2627
'zh-cn': zh,
2728
'zh-TW': zh_tw,
2829
en: en,
29-
ar: ar
30+
ar: ar,
31+
ru: ru
3032
}
3133
3234
const { locale } = useI18n()

web/src/assets/flags/ru.svg

Lines changed: 1 addition & 0 deletions
Loading

web/src/components/i18n/selectLanguage.vue

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,18 @@
2121
/>繁體中文
2222
</el-dropdown-item>
2323
<el-dropdown-item :disabled="$i18n.locale === 'ar'" command="ar"
24-
><img
24+
><img
2525
alt="العربية"
2626
class="w-8 mr-1"
2727
src="@/assets/flags/ar.svg"
28-
/>العربية
28+
/>العربية
29+
</el-dropdown-item>
30+
<el-dropdown-item :disabled="$i18n.locale === 'ru'" command="ru"
31+
><img
32+
alt="Русский"
33+
class="w-8 mr-1"
34+
src="@/assets/flags/ru.svg"
35+
/>العربية
2936
</el-dropdown-item>
3037
</el-dropdown-menu>
3138
</template>

web/src/i18n.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import enLocale from './locales/en.json'
33
import zhLocale from './locales/zh.json'
44
import zhtwLocale from './locales/zh-TW.json'
55
import arLocale from './locales/ar.json'
6+
import ruLocale from './locales/ru.json'
67
import Cookies from 'js-cookie'
78

89
const messages = {
@@ -17,6 +18,9 @@ const messages = {
1718
},
1819
ar: {
1920
...arLocale
21+
},
22+
ru: {
23+
...ruLocale
2024
}
2125
}
2226

web/src/locales/ru.json

Lines changed: 1125 additions & 0 deletions
Large diffs are not rendered by default.

web/src/view/systemTools/formCreate/index.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import zh from './locale/zh_cn.js' // 导入中文语言包
1717
import zh_tw from './locale/zh_tw.js' // 导入中文语言包
1818
import ar from './locale/ar.js'
19+
import ru from './locale/ru.js'
1920
import { useI18n } from 'vue-i18n' // 导入中文语言包
2021
2122
const { locale } = useI18n()
@@ -30,7 +31,8 @@
3031
'zh-cn': zh,
3132
'zh-TW': zh_tw,
3233
en: en,
33-
ar: ar
34+
ar: ar,
35+
ru: ru
3436
}
3537
3638
const designer = ref(null)

0 commit comments

Comments
 (0)