Skip to content

Commit f239653

Browse files
authored
Merge pull request #2131 from wall-js/i18n
fix(translate): 修复与日期相关的翻译键值错误,修复翻译文件问题
2 parents 11487fc + 248fce0 commit f239653

File tree

10 files changed

+100
-79
lines changed

10 files changed

+100
-79
lines changed

server/resource/lang/en.json

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"frontend": "Default front-end file running address",
1212
"copyright1": "--------------------------------------Copyright Statement--------------------------------------",
1313
"copyright2": "** Copyright: flipped-aurora open source team **",
14-
"copyright3": "** Copyright holder: Beijing Flip Aurora Technology Co., Ltd. **",
15-
"copyright4": "** To remove the authorization logo, you need to purchase a commercial license: https://gin-vue-admin.com/empower/index.html **"
14+
"copyright3": "** Copyright holder: Beijing Flip Aurora Technology Co., Ltd. **",
15+
"copyright4": "** To remove the authorization logo, you need to purchase a commercial license: https://gin-vue-admin.com/empower/index.html **"
1616
},
1717
"viper": {
1818
"modeGinEnvName": "You are using the gin mode with environment name %s, the config path is %s\n",
@@ -114,21 +114,18 @@
114114
"description": "Description",
115115
"displayName": "Display Name",
116116
"keywordNotice": "%s is a Go keyword!",
117-
118117
"nonStandardPlugin": "Non-standard plugin, please migrate automatically according to the documentation",
119118
"autoPathExists": "autoPath already has a plugin with the same name, please install it manually",
120119
"duplicatePlugin": "A plugin with the same name already exists, please install it manually",
121120
"pluginNameRequired": "Plugin name cannot be empty",
122121
"webPathNotExist": "Web path does not exist",
123122
"serverPathNotExist": "Server path does not exist",
124-
125123
"duplicateRoleId": "Duplicate role ID exists",
126124
"queryRoleDataFailed": "Failed to query role data",
127125
"roleNotExist": "This role does not exist",
128126
"roleInUse": "This role is currently in use by users and cannot be deleted",
129127
"roleHasSubRoles": "This role has sub-roles and cannot be deleted",
130128
"invalidRoleId": "The submitted role ID is invalid",
131-
132129
"buttonInUse": "This button is currently in use and cannot be deleted",
133130
"menuHasSubMenu": "This menu has submenus and cannot be deleted",
134131
"recordNotFound": "Record does not exist",
@@ -281,6 +278,7 @@
281278
"getSyncApi": "Get sync API",
282279
"getTemplateFile": "Get the template file",
283280
"getUploadFileList": "Get upload file list",
281+
"importURL": "Import URL",
284282
"getUsersList": "Get user list",
285283
"ignoreApi": "Ignore API",
286284
"importExcel": "Import Excel",
@@ -473,11 +471,9 @@
473471
"fileUploadFailed": "File upload failed!",
474472
"getHuaweiObjectFailedDuplicate": "Failed to get Huawei object storage object!",
475473
"deleteObjectFailed": "Failed to delete object (%s)! Output: %v",
476-
477474
"fileOpenParseFailed": "[filepath:%s] Failed to open/parse the file!",
478475
"fileOpenFailed": "[filepath:%s] Failed to open the file!",
479476
"injectionFailed": "[filepath:%s] Injection failed!",
480-
481477
"test_gva_user_injection": "Testing GvaUser struct injection",
482478
"test_gva_user_rollback": "Testing GvaUser rollback",
483479
"test_user_injection": "Testing &model.User{} injection",
@@ -499,43 +495,36 @@
499495
"exaCustomerRollback": "Test rollback of &example.ExaCustomer{}",
500496
"newExaFileUploadAndDownloadRollback": "Test rollback of new(example.ExaFileUploadAndDownload)",
501497
"newExaCustomerRollback": "Test rollback of new(example.ExaCustomer)",
502-
503498
"fileUploadAndDownloadRouterRollback": "Test rollback of FileUploadAndDownloadRouter",
504499
"fileUploadAndDownloadApiRollback": "Test rollback of FileUploadAndDownloadApi",
505500
"fileUploadAndDownloadServiceRollback": "Test rollback of FileUploadAndDownloadService",
506501
"fileUploadAndDownloadRouterInjection": "Test injection of FileUploadAndDownloadRouter",
507502
"fileUploadAndDownloadApiInjection": "Test injection of FileUploadAndDownloadApi",
508503
"fileUploadAndDownloadServiceInjection": "Test injection of FileUploadAndDownloadService",
509-
510504
"exampleApiGroupRollback": "Test rollback of ExampleApiGroup",
511505
"exampleRouterGroupRollback": "Test rollback of ExampleRouterGroup",
512506
"exampleServiceGroupRollback": "Test rollback of ExampleServiceGroup",
513507
"exampleApiGroupInjection": "Test injection of ExampleApiGroup",
514508
"exampleRouterGroupInjection": "Test injection of ExampleRouterGroup",
515509
"exampleServiceGroupInjection": "Test injection of ExampleServiceGroup",
516-
517510
"gvaPluginUserApiInjection": "Test injection of Gva Plugin UserApi",
518511
"gvaPluginUserRouterInjection": "Test injection of Gva Plugin UserRouter",
519512
"gvaPluginUserServiceInjection": "Test injection of Gva Plugin UserService",
520513
"gvaUserInjection": "Test injection of gva User",
521514
"gvaPluginUserRouterRollback": "Test rollback of Gva Plugin UserRouter",
522515
"gvaPluginUserApiRollback": "Test rollback of Gva Plugin UserApi",
523516
"gvaPluginUserServiceRollback": "Test rollback of Gva Plugin UserService",
524-
525517
"gvaPluginUserInjection": "Test injection of Gva Plugin User",
526518
"chineseInjection": "Test injection of Chinese",
527519
"gvaPluginUserRollback": "Test rollback of Gva Plugin User",
528-
529520
"registrationError": "is already registered and cannot be registered again",
530521
"valueCannotBeEmpty": "cannot be empty",
531522
"formatValidationFailed": "format validation failed",
532523
"lengthOrValueOutOfRange": "length or value is out of valid range",
533524
"sysNoSupport": "The system does not support",
534525
"fileNameInvalid": "File name is invalid"
535526
},
536-
"router": {
537-
538-
},
527+
"router": {},
539528
"directory": {
540529
"fileExists": "File with the same name exists"
541530
},
@@ -563,5 +552,4 @@
563552
"nameAlreadyExists": "Category name already exists",
564553
"deleteChildrenFirst": "Please delete children first"
565554
}
566-
}
567-
555+
}

server/resource/lang/zh.json

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"frontend": "默认前端文件运行地址",
1212
"copyright1": "--------------------------------------版权声明--------------------------------------",
1313
"copyright2": "** 版权所有方:flipped-aurora开源团队 **",
14-
"copyright3": "** 版权持有公司:北京翻转极光科技有限责任公司 **",
15-
"copyright4": "** 剔除授权标识需购买商用授权:https://gin-vue-admin.com/empower/index.html **"
14+
"copyright3": "** 版权持有公司:北京翻转极光科技有限责任公司 **",
15+
"copyright4": "** 剔除授权标识需购买商用授权:https://gin-vue-admin.com/empower/index.html **"
1616
},
1717
"viper": {
1818
"modeGinEnvName": "您正在使用gin模式的%s环境名称,config的路径为%s\n",
@@ -306,6 +306,7 @@
306306
"getSyncApi": "获取待同步API",
307307
"getTemplateFile": "获取模板文件",
308308
"getUploadFileList": "获取上传文件列表",
309+
"importURL": "导入URL",
309310
"getUsersList": "获取用户列表",
310311
"ignoreApi": "忽略API",
311312
"importExcel": "导入Excel",
@@ -515,9 +516,6 @@
515516
"fileUploadFailed": "文件上传失败!",
516517
"getHuaweiObjectFailedDuplicate": "获取华为对象存储对象失败!",
517518
"deleteObjectFailed": "删除对象(%s)失败!, output: %v",
518-
519-
520-
521519
"fileOpenParseFailed": "[filepath:%s]打开/解析文件失败!",
522520
"fileOpenFailed": "[filepath:%s]打开文件失败!",
523521
"injectionFailed": "[filepath:%s]注入失败!",
@@ -542,33 +540,28 @@
542540
"exaCustomerRollback": "测试 &example.ExaCustomer{} 回滚",
543541
"newExaFileUploadAndDownloadRollback": "测试 new(example.ExaFileUploadAndDownload) 回滚",
544542
"newExaCustomerRollback": "测试 new(example.ExaCustomer) 回滚",
545-
546543
"fileUploadAndDownloadRouterRollback": "测试 FileUploadAndDownloadRouter 回滚",
547544
"fileUploadAndDownloadApiRollback": "测试 FileUploadAndDownloadApi 回滚",
548545
"fileUploadAndDownloadServiceRollback": "测试 FileUploadAndDownloadService 回滚",
549546
"fileUploadAndDownloadRouterInjection": "测试 FileUploadAndDownloadRouter 注入",
550547
"fileUploadAndDownloadApiInjection": "测试 FileUploadAndDownloadApi 注入",
551548
"fileUploadAndDownloadServiceInjection": "测试 FileUploadAndDownloadService 注入",
552-
553549
"exampleApiGroupRollback": "测试ExampleApiGroup回滚",
554550
"exampleRouterGroupRollback": "测试ExampleRouterGroup回滚",
555551
"exampleServiceGroupRollback": "测试ExampleServiceGroup回滚",
556552
"exampleApiGroupInjection": "测试ExampleApiGroup注入",
557553
"exampleRouterGroupInjection": "测试ExampleRouterGroup注入",
558554
"exampleServiceGroupInjection": "测试ExampleServiceGroup注入",
559-
560555
"gvaPluginUserApiInjection": "测试 Gva插件UserApi 注入",
561556
"gvaPluginUserRouterInjection": "测试 Gva插件UserRouter 注入",
562557
"gvaPluginUserServiceInjection": "测试 Gva插件UserService 注入",
563558
"gvaUserInjection": "测试 gva的User 注入",
564559
"gvaPluginUserRouterRollback": "测试 Gva插件UserRouter 回滚",
565560
"gvaPluginUserApiRollback": "测试 Gva插件UserApi 回滚",
566561
"gvaPluginUserServiceRollback": "测试 Gva插件UserService 回滚",
567-
568562
"gvaPluginUserInjection": "测试 Gva插件User 注入",
569563
"chineseInjection": "测试 中文 注入",
570564
"gvaPluginUserRollback": "测试 Gva插件User 回滚",
571-
572565
"registrationError": "已注册,无法重复注册",
573566
"valueCannotBeEmpty": "值不能为空",
574567
"formatValidationFailed": "格式校验不通过",
@@ -588,9 +581,7 @@
588581
"uploadToMinioFailed": "上传文件到minio失败"
589582
}
590583
},
591-
"router": {
592-
593-
},
584+
"router": {},
594585
"database": {
595586
"parentMenuInitFailed": "父级菜单初始化失败!",
596587
"childMenuInitFailed": "子菜单初始化失败!",
@@ -602,10 +593,10 @@
602593
"testRoleMenuAssignFailed": "为测试角色分配菜单失败",
603594
"casbinInitFailed": "Casbin 表 (%s) 数据初始化失败!",
604595
"tableInitFailed": "%s表数据初始化失败!",
605-
"dictionaryTableNotFound": "未找到 %s 表初始化数据",
606-
"initDataSuccess": "初始数据成功!",
607-
"initDataExists": "的初始数据已存在!",
608-
"initDataFailed": "初始数据失败!"
596+
"dictionaryTableNotFound": "未找到 %s 表初始化数据",
597+
"initDataSuccess": "初始数据成功!",
598+
"initDataExists": "的初始数据已存在!",
599+
"initDataFailed": "初始数据失败!"
609600
},
610601
"menu": {
611602
"buildMenuIdMapping": "构建菜单ID映射,方便快速查找",
@@ -704,7 +695,6 @@
704695
"fileNamePathIllegal": "文件名或路径不合法",
705696
"createChunkFile": "创建切片文件",
706697
"removeChunk": "移除切片",
707-
"breakpoint": {
708698
"continueFail": "断点续传失败",
709699
"continueSuccess": "断点续传成功",
710700
"invalidFileNameOrPath": "文件名或路径不合法"
@@ -881,7 +871,5 @@
881871
"generateRangeSearchField": "生成范围搜索字段",
882872
"timeCase": "time 的情况",
883873
"generateNormalSearchField": "生成普通搜索字段"
884-
}
885874
}
886-
}
887-
875+
}

web/src/locales/ar.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@
183183
"noOnlySpace": "لا يمكن إدخال مسافات فقط",
184184
"operations": "العمليات",
185185
"order": "علامة الترتيب",
186-
"placeInputEndData": "يرجى إدخال تاريخ الانتهاء",
187-
"placeInputStartData": "يرجى إدخال تاريخ البدء",
186+
"placeInputEndDate": "يرجى إدخال تاريخ الانتهاء",
187+
"placeInputStartDate": "يرجى إدخال تاريخ البدء",
188188
"pleaseEnter": "يرجى الإدخال",
189189
"pleaseSelect": "يرجى الاختيار",
190190
"popUpOperation": "عملية النافذة المنبثقة",
@@ -195,12 +195,11 @@
195195
"searchCriteria": "معايير البحث",
196196
"searchDesc": "نطاق البحث هو من تاريخ البدء (شامل) إلى تاريخ الانتهاء (غير شامل)",
197197
"selectAll": "تحديد الكل",
198-
"selectData": "تحديد التاريخ",
199198
"selectDataToDelete": "يرجى تحديد البيانات المراد حذفها",
200199
"selectDate": "تحديد التاريخ",
201200
"setupSuccess": "تم الإعداد بنجاح",
202-
"startData": "تاريخ البدء",
203-
"startDataMustBeforeEndData": "يجب أن يكون تاريخ البدء قبل تاريخ الانتهاء",
201+
"startDate": "تاريخ البدء",
202+
"startDateMustBeforeEndDate": "يجب أن يكون تاريخ البدء قبل تاريخ الانتهاء",
204203
"undeleted": "تم إلغاء الحذف",
205204
"updateSuccess": "تم التحديث بنجاح!",
206205
"warning": "تحذير",

web/src/locales/en.json

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@
184184
"noOnlySpace": "Cannot input only spaces",
185185
"operations": "Operations",
186186
"order": "Order Mark",
187-
"placeInputEndData": "Please enter the end date",
188-
"placeInputStartData": "Please enter the start date",
187+
"placeInputEndDate": "Please enter the end date",
188+
"placeInputstartDate": "Please enter the start date",
189189
"pleaseEnter": "Please enter",
190190
"pleaseSelect": "Please select",
191191
"popUpOperation": "Popup Operation",
@@ -196,12 +196,11 @@
196196
"searchCriteria": "Search Criteria",
197197
"searchDesc": "The search range is from the start date (inclusive) to the end date (exclusive)",
198198
"selectAll": "Select All",
199-
"selectData": "Select Date",
200199
"selectDataToDelete": "Please select the data to delete",
201200
"selectDate": "Select Date",
202201
"setupSuccess": "Setup successful",
203-
"startData": "Start Date",
204-
"startDataMustBeforeEndData": "The start date should be earlier than the end date",
202+
"startDate": "Start Date",
203+
"startDateMustBeforeEndDate": "The start date should be earlier than the end date",
205204
"undeleted": "Deletion canceled",
206205
"updateSuccess": "Updated successfully!",
207206
"warning": "Warning",
@@ -401,6 +400,17 @@
401400
}
402401
},
403402
"view": {
403+
"person": {
404+
"basicInfo": "Basic Information",
405+
"accountPassword": "Account Password",
406+
"isSet": "Is Set",
407+
"notSet": "Not Set",
408+
"modify": "Modify",
409+
"modifyPassword": "Modify Password",
410+
"originalPassword": "Original Password",
411+
"newPassword": "New Password",
412+
"confirmPassword": "Confirm Password"
413+
},
404414
"about": {
405415
"flippedAuroraTeam": "Flipped-Aurora Team",
406416
"submitRecords": "Releases History"

web/src/locales/ru.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@
184184
"noOnlySpace": "Нельзя вводить только пробелы",
185185
"operations": "Операции",
186186
"order": "Порядок",
187-
"placeInputEndData": "Введите дату окончания",
188-
"placeInputStartData": "Введите дату начала",
187+
"placeInputEndDate": "Введите дату окончания",
188+
"placeInputStartDate": "Введите дату начала",
189189
"pleaseEnter": "Введите",
190190
"pleaseSelect": "Выберите",
191191
"popUpOperation": "Всплывающее действие",
@@ -196,12 +196,11 @@
196196
"searchCriteria": "Критерии поиска",
197197
"searchDesc": "Диапазон поиска: от даты начала (включительно) до даты окончания (исключительно)",
198198
"selectAll": "Выбрать все",
199-
"selectData": "Выбрать дату",
200199
"selectDataToDelete": "Выберите данные для удаления",
201200
"selectDate": "Выбрать дату",
202201
"setupSuccess": "Настройка выполнена успешно",
203-
"startData": "Дата начала",
204-
"startDataMustBeforeEndData": "Дата начала должна быть раньше даты окончания",
202+
"startDate": "Дата начала",
203+
"startDateMustBeforeEndDate": "Дата начала должна быть раньше даты окончания",
205204
"undeleted": "Удаление отменено",
206205
"updateSuccess": "Обновлено успешно!",
207206
"warning": "Предупреждение",

web/src/locales/zh-TW.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@
161161
"noOnlySpace": "不能只輸入空白",
162162
"operations": "操作",
163163
"order": "排序標記",
164-
"placeInputEndData": "請填寫結束日期",
165-
"placeInputStartData": "請填寫開始日期",
164+
"placeInputEndDate": "請填寫結束日期",
165+
"placeInputStartDate": "請填寫開始日期",
166166
"pleaseEnter": "請輸入",
167167
"pleaseSelect": "請選擇",
168168
"popUpOperation": "彈窗操作",
@@ -173,12 +173,11 @@
173173
"searchCriteria": "搜索條件",
174174
"searchDesc": "搜索範圍是開始日期(包含)至結束日期(不包含)",
175175
"selectAll": "全選",
176-
"selectData": "選擇日期",
177176
"selectDataToDelete": "請選擇要刪除的數據",
178177
"selectDate": "選擇日期",
179178
"setupSuccess": "設定成功",
180-
"startData": "開始日期",
181-
"startDataMustBeforeEndData": "開始日期應當早於結束日期",
179+
"startDate": "開始日期",
180+
"startDateMustBeforeEndDate": "開始日期應當早於結束日期",
182181
"undeleted": "已取消刪除",
183182
"updateSuccess": "更新成功!",
184183
"warning": "警告",

0 commit comments

Comments
 (0)