diff --git a/server/resource/lang/en.json b/server/resource/lang/en.json index dfb4af1d43..a2385e1327 100644 --- a/server/resource/lang/en.json +++ b/server/resource/lang/en.json @@ -11,8 +11,8 @@ "frontend": "Default front-end file running address", "copyright1": "--------------------------------------Copyright Statement--------------------------------------", "copyright2": "** Copyright: flipped-aurora open source team **", - "copyright3": "** Copyright holder: Beijing Flip Aurora Technology Co., Ltd. **", - "copyright4": "** To remove the authorization logo, you need to purchase a commercial license: https://gin-vue-admin.com/empower/index.html **" + "copyright3": "** Copyright holder: Beijing Flip Aurora Technology Co., Ltd. **", + "copyright4": "** To remove the authorization logo, you need to purchase a commercial license: https://gin-vue-admin.com/empower/index.html **" }, "viper": { "modeGinEnvName": "You are using the gin mode with environment name %s, the config path is %s\n", @@ -114,21 +114,18 @@ "description": "Description", "displayName": "Display Name", "keywordNotice": "%s is a Go keyword!", - "nonStandardPlugin": "Non-standard plugin, please migrate automatically according to the documentation", "autoPathExists": "autoPath already has a plugin with the same name, please install it manually", "duplicatePlugin": "A plugin with the same name already exists, please install it manually", "pluginNameRequired": "Plugin name cannot be empty", "webPathNotExist": "Web path does not exist", "serverPathNotExist": "Server path does not exist", - "duplicateRoleId": "Duplicate role ID exists", "queryRoleDataFailed": "Failed to query role data", "roleNotExist": "This role does not exist", "roleInUse": "This role is currently in use by users and cannot be deleted", "roleHasSubRoles": "This role has sub-roles and cannot be deleted", "invalidRoleId": "The submitted role ID is invalid", - "buttonInUse": "This button is currently in use and cannot be deleted", "menuHasSubMenu": "This menu has submenus and cannot be deleted", "recordNotFound": "Record does not exist", @@ -281,6 +278,7 @@ "getSyncApi": "Get sync API", "getTemplateFile": "Get the template file", "getUploadFileList": "Get upload file list", + "importURL": "Import URL", "getUsersList": "Get user list", "ignoreApi": "Ignore API", "importExcel": "Import Excel", @@ -473,11 +471,9 @@ "fileUploadFailed": "File upload failed!", "getHuaweiObjectFailedDuplicate": "Failed to get Huawei object storage object!", "deleteObjectFailed": "Failed to delete object (%s)! Output: %v", - "fileOpenParseFailed": "[filepath:%s] Failed to open/parse the file!", "fileOpenFailed": "[filepath:%s] Failed to open the file!", "injectionFailed": "[filepath:%s] Injection failed!", - "test_gva_user_injection": "Testing GvaUser struct injection", "test_gva_user_rollback": "Testing GvaUser rollback", "test_user_injection": "Testing &model.User{} injection", @@ -499,21 +495,18 @@ "exaCustomerRollback": "Test rollback of &example.ExaCustomer{}", "newExaFileUploadAndDownloadRollback": "Test rollback of new(example.ExaFileUploadAndDownload)", "newExaCustomerRollback": "Test rollback of new(example.ExaCustomer)", - "fileUploadAndDownloadRouterRollback": "Test rollback of FileUploadAndDownloadRouter", "fileUploadAndDownloadApiRollback": "Test rollback of FileUploadAndDownloadApi", "fileUploadAndDownloadServiceRollback": "Test rollback of FileUploadAndDownloadService", "fileUploadAndDownloadRouterInjection": "Test injection of FileUploadAndDownloadRouter", "fileUploadAndDownloadApiInjection": "Test injection of FileUploadAndDownloadApi", "fileUploadAndDownloadServiceInjection": "Test injection of FileUploadAndDownloadService", - "exampleApiGroupRollback": "Test rollback of ExampleApiGroup", "exampleRouterGroupRollback": "Test rollback of ExampleRouterGroup", "exampleServiceGroupRollback": "Test rollback of ExampleServiceGroup", "exampleApiGroupInjection": "Test injection of ExampleApiGroup", "exampleRouterGroupInjection": "Test injection of ExampleRouterGroup", "exampleServiceGroupInjection": "Test injection of ExampleServiceGroup", - "gvaPluginUserApiInjection": "Test injection of Gva Plugin UserApi", "gvaPluginUserRouterInjection": "Test injection of Gva Plugin UserRouter", "gvaPluginUserServiceInjection": "Test injection of Gva Plugin UserService", @@ -521,11 +514,9 @@ "gvaPluginUserRouterRollback": "Test rollback of Gva Plugin UserRouter", "gvaPluginUserApiRollback": "Test rollback of Gva Plugin UserApi", "gvaPluginUserServiceRollback": "Test rollback of Gva Plugin UserService", - "gvaPluginUserInjection": "Test injection of Gva Plugin User", "chineseInjection": "Test injection of Chinese", "gvaPluginUserRollback": "Test rollback of Gva Plugin User", - "registrationError": "is already registered and cannot be registered again", "valueCannotBeEmpty": "cannot be empty", "formatValidationFailed": "format validation failed", @@ -533,9 +524,7 @@ "sysNoSupport": "The system does not support", "fileNameInvalid": "File name is invalid" }, - "router": { - - }, + "router": {}, "directory": { "fileExists": "File with the same name exists" }, @@ -563,5 +552,4 @@ "nameAlreadyExists": "Category name already exists", "deleteChildrenFirst": "Please delete children first" } -} - +} \ No newline at end of file diff --git a/server/resource/lang/zh.json b/server/resource/lang/zh.json index 1473ff5c50..7af352c2ea 100644 --- a/server/resource/lang/zh.json +++ b/server/resource/lang/zh.json @@ -11,8 +11,8 @@ "frontend": "默认前端文件运行地址", "copyright1": "--------------------------------------版权声明--------------------------------------", "copyright2": "** 版权所有方：flipped-aurora开源团队 **", - "copyright3": "** 版权持有公司：北京翻转极光科技有限责任公司 **", - "copyright4": "** 剔除授权标识需购买商用授权：https://gin-vue-admin.com/empower/index.html **" + "copyright3": "** 版权持有公司：北京翻转极光科技有限责任公司 **", + "copyright4": "** 剔除授权标识需购买商用授权：https://gin-vue-admin.com/empower/index.html **" }, "viper": { "modeGinEnvName": "您正在使用gin模式的%s环境名称,config的路径为%s\n", @@ -306,6 +306,7 @@ "getSyncApi": "获取待同步API", "getTemplateFile": "获取模板文件", "getUploadFileList": "获取上传文件列表", + "importURL": "导入URL", "getUsersList": "获取用户列表", "ignoreApi": "忽略API", "importExcel": "导入Excel", @@ -515,9 +516,6 @@ "fileUploadFailed": "文件上传失败!", "getHuaweiObjectFailedDuplicate": "获取华为对象存储对象失败!", "deleteObjectFailed": "删除对象(%s)失败!, output: %v", - - - "fileOpenParseFailed": "[filepath:%s]打开/解析文件失败!", "fileOpenFailed": "[filepath:%s]打开文件失败!", "injectionFailed": "[filepath:%s]注入失败!", @@ -542,21 +540,18 @@ "exaCustomerRollback": "测试 &example.ExaCustomer{} 回滚", "newExaFileUploadAndDownloadRollback": "测试 new(example.ExaFileUploadAndDownload) 回滚", "newExaCustomerRollback": "测试 new(example.ExaCustomer) 回滚", - "fileUploadAndDownloadRouterRollback": "测试 FileUploadAndDownloadRouter 回滚", "fileUploadAndDownloadApiRollback": "测试 FileUploadAndDownloadApi 回滚", "fileUploadAndDownloadServiceRollback": "测试 FileUploadAndDownloadService 回滚", "fileUploadAndDownloadRouterInjection": "测试 FileUploadAndDownloadRouter 注入", "fileUploadAndDownloadApiInjection": "测试 FileUploadAndDownloadApi 注入", "fileUploadAndDownloadServiceInjection": "测试 FileUploadAndDownloadService 注入", - "exampleApiGroupRollback": "测试ExampleApiGroup回滚", "exampleRouterGroupRollback": "测试ExampleRouterGroup回滚", "exampleServiceGroupRollback": "测试ExampleServiceGroup回滚", "exampleApiGroupInjection": "测试ExampleApiGroup注入", "exampleRouterGroupInjection": "测试ExampleRouterGroup注入", "exampleServiceGroupInjection": "测试ExampleServiceGroup注入", - "gvaPluginUserApiInjection": "测试 Gva插件UserApi 注入", "gvaPluginUserRouterInjection": "测试 Gva插件UserRouter 注入", "gvaPluginUserServiceInjection": "测试 Gva插件UserService 注入", @@ -564,11 +559,9 @@ "gvaPluginUserRouterRollback": "测试 Gva插件UserRouter 回滚", "gvaPluginUserApiRollback": "测试 Gva插件UserApi 回滚", "gvaPluginUserServiceRollback": "测试 Gva插件UserService 回滚", - "gvaPluginUserInjection": "测试 Gva插件User 注入", "chineseInjection": "测试 中文 注入", "gvaPluginUserRollback": "测试 Gva插件User 回滚", - "registrationError": "已注册,无法重复注册", "valueCannotBeEmpty": "值不能为空", "formatValidationFailed": "格式校验不通过", @@ -588,9 +581,7 @@ "uploadToMinioFailed": "上传文件到minio失败" } }, - "router": { - - }, + "router": {}, "database": { "parentMenuInitFailed": "父级菜单初始化失败!", "childMenuInitFailed": "子菜单初始化失败!", @@ -602,10 +593,10 @@ "testRoleMenuAssignFailed": "为测试角色分配菜单失败", "casbinInitFailed": "Casbin 表 (%s) 数据初始化失败!", "tableInitFailed": "%s表数据初始化失败!", - "dictionaryTableNotFound": "未找到 %s 表初始化数据", - "initDataSuccess": "初始数据成功!", - "initDataExists": "的初始数据已存在!", - "initDataFailed": "初始数据失败!" + "dictionaryTableNotFound": "未找到 %s 表初始化数据", + "initDataSuccess": "初始数据成功!", + "initDataExists": "的初始数据已存在!", + "initDataFailed": "初始数据失败!" }, "menu": { "buildMenuIdMapping": "构建菜单ID映射，方便快速查找", @@ -704,7 +695,6 @@ "fileNamePathIllegal": "文件名或路径不合法", "createChunkFile": "创建切片文件", "removeChunk": "移除切片", -"breakpoint": { "continueFail": "断点续传失败", "continueSuccess": "断点续传成功", "invalidFileNameOrPath": "文件名或路径不合法" @@ -881,7 +871,5 @@ "generateRangeSearchField": "生成范围搜索字段", "timeCase": "time 的情况", "generateNormalSearchField": "生成普通搜索字段" - } } -} - +} \ No newline at end of file diff --git a/web/src/locales/ar.json b/web/src/locales/ar.json index 7a68c61800..f102f2564d 100644 --- a/web/src/locales/ar.json +++ b/web/src/locales/ar.json @@ -183,8 +183,8 @@ "noOnlySpace": "لا يمكن إدخال مسافات فقط", "operations": "العمليات", "order": "علامة الترتيب", - "placeInputEndData": "يرجى إدخال تاريخ الانتهاء", - "placeInputStartData": "يرجى إدخال تاريخ البدء", + "placeInputEndDate": "يرجى إدخال تاريخ الانتهاء", + "placeInputStartDate": "يرجى إدخال تاريخ البدء", "pleaseEnter": "يرجى الإدخال", "pleaseSelect": "يرجى الاختيار", "popUpOperation": "عملية النافذة المنبثقة", @@ -195,12 +195,11 @@ "searchCriteria": "معايير البحث", "searchDesc": "نطاق البحث هو من تاريخ البدء (شامل) إلى تاريخ الانتهاء (غير شامل)", "selectAll": "تحديد الكل", - "selectData": "تحديد التاريخ", "selectDataToDelete": "يرجى تحديد البيانات المراد حذفها", "selectDate": "تحديد التاريخ", "setupSuccess": "تم الإعداد بنجاح", - "startData": "تاريخ البدء", - "startDataMustBeforeEndData": "يجب أن يكون تاريخ البدء قبل تاريخ الانتهاء", + "startDate": "تاريخ البدء", + "startDateMustBeforeEndDate": "يجب أن يكون تاريخ البدء قبل تاريخ الانتهاء", "undeleted": "تم إلغاء الحذف", "updateSuccess": "تم التحديث بنجاح!", "warning": "تحذير", diff --git a/web/src/locales/en.json b/web/src/locales/en.json index 37ddaa2472..928018b506 100644 --- a/web/src/locales/en.json +++ b/web/src/locales/en.json @@ -184,8 +184,8 @@ "noOnlySpace": "Cannot input only spaces", "operations": "Operations", "order": "Order Mark", - "placeInputEndData": "Please enter the end date", - "placeInputStartData": "Please enter the start date", + "placeInputEndDate": "Please enter the end date", + "placeInputstartDate": "Please enter the start date", "pleaseEnter": "Please enter", "pleaseSelect": "Please select", "popUpOperation": "Popup Operation", @@ -196,12 +196,11 @@ "searchCriteria": "Search Criteria", "searchDesc": "The search range is from the start date (inclusive) to the end date (exclusive)", "selectAll": "Select All", - "selectData": "Select Date", "selectDataToDelete": "Please select the data to delete", "selectDate": "Select Date", "setupSuccess": "Setup successful", - "startData": "Start Date", - "startDataMustBeforeEndData": "The start date should be earlier than the end date", + "startDate": "Start Date", + "startDateMustBeforeEndDate": "The start date should be earlier than the end date", "undeleted": "Deletion canceled", "updateSuccess": "Updated successfully!", "warning": "Warning", @@ -401,6 +400,17 @@ } }, "view": { + "person": { + "basicInfo": "Basic Information", + "accountPassword": "Account Password", + "isSet": "Is Set", + "notSet": "Not Set", + "modify": "Modify", + "modifyPassword": "Modify Password", + "originalPassword": "Original Password", + "newPassword": "New Password", + "confirmPassword": "Confirm Password" + }, "about": { "flippedAuroraTeam": "Flipped-Aurora Team", "submitRecords": "Releases History" diff --git a/web/src/locales/ru.json b/web/src/locales/ru.json index 2c11491332..28fa84332f 100644 --- a/web/src/locales/ru.json +++ b/web/src/locales/ru.json @@ -184,8 +184,8 @@ "noOnlySpace": "Нельзя вводить только пробелы", "operations": "Операции", "order": "Порядок", - "placeInputEndData": "Введите дату окончания", - "placeInputStartData": "Введите дату начала", + "placeInputEndDate": "Введите дату окончания", + "placeInputStartDate": "Введите дату начала", "pleaseEnter": "Введите", "pleaseSelect": "Выберите", "popUpOperation": "Всплывающее действие", @@ -196,12 +196,11 @@ "searchCriteria": "Критерии поиска", "searchDesc": "Диапазон поиска: от даты начала (включительно) до даты окончания (исключительно)", "selectAll": "Выбрать все", - "selectData": "Выбрать дату", "selectDataToDelete": "Выберите данные для удаления", "selectDate": "Выбрать дату", "setupSuccess": "Настройка выполнена успешно", - "startData": "Дата начала", - "startDataMustBeforeEndData": "Дата начала должна быть раньше даты окончания", + "startDate": "Дата начала", + "startDateMustBeforeEndDate": "Дата начала должна быть раньше даты окончания", "undeleted": "Удаление отменено", "updateSuccess": "Обновлено успешно!", "warning": "Предупреждение", diff --git a/web/src/locales/zh-TW.json b/web/src/locales/zh-TW.json index 4d7af02ed5..8b1a8cf7b3 100644 --- a/web/src/locales/zh-TW.json +++ b/web/src/locales/zh-TW.json @@ -161,8 +161,8 @@ "noOnlySpace": "不能只輸入空白", "operations": "操作", "order": "排序標記", - "placeInputEndData": "請填寫結束日期", - "placeInputStartData": "請填寫開始日期", + "placeInputEndDate": "請填寫結束日期", + "placeInputStartDate": "請填寫開始日期", "pleaseEnter": "請輸入", "pleaseSelect": "請選擇", "popUpOperation": "彈窗操作", @@ -173,12 +173,11 @@ "searchCriteria": "搜索條件", "searchDesc": "搜索範圍是開始日期（包含）至結束日期（不包含）", "selectAll": "全選", - "selectData": "選擇日期", "selectDataToDelete": "請選擇要刪除的數據", "selectDate": "選擇日期", "setupSuccess": "設定成功", - "startData": "開始日期", - "startDataMustBeforeEndData": "開始日期應當早於結束日期", + "startDate": "開始日期", + "startDateMustBeforeEndDate": "開始日期應當早於結束日期", "undeleted": "已取消刪除", "updateSuccess": "更新成功!", "warning": "警告", diff --git a/web/src/locales/zh.json b/web/src/locales/zh.json index 7abc0b626c..5c1c962915 100644 --- a/web/src/locales/zh.json +++ b/web/src/locales/zh.json @@ -194,8 +194,8 @@ "noOnlySpace": "不能只输入空格", "operations": "操作", "order": "排序标记", - "placeInputEndData": "请填写结束日期", - "placeInputStartData": "请填写开始日期", + "placeInputEndDate": "请填写结束日期", + "placeInputStartDate": "请填写开始日期", "pleaseEnter": "请输入", "pleaseSelect": "请选择", "popUpOperation": "弹窗操作", @@ -206,12 +206,11 @@ "searchCriteria": "搜索条件", "searchDesc": "搜索范围是开始日期（包含）至结束日期（不包含）", "selectAll": "全选", - "selectData": "选择日期", "selectDataToDelete": "请选择要删除的数据", "selectDate": "选择日期", "setupSuccess": "设置成功", - "startData": "开始日期", - "startDataMustBeforeEndData": "开始日期应当早于结束日期", + "startDate": "开始日期", + "startDateMustBeforeEndDate": "开始日期应当早于结束日期", "undeleted": "已取消删除", "updateSuccess": "更新成功!", "warning": "警告", @@ -413,6 +412,17 @@ } }, "view": { + "person": { + "basicInfo": "基本信息", + "accountPassword": "账号密码", + "isSet": "已设置", + "notSet": "未设置", + "modify": "修改", + "modifyPassword": "修改密码", + "originalPassword": "原密码", + "newPassword": "新密码", + "confirmPassword": "确认密码" + }, "about": { "flippedAuroraTeam": "flipped-aurora团队", "submitRecords": "提交记录" @@ -1289,5 +1299,33 @@ "extractComponentName": "从 .vue 文件内容中提取组件名称", "vitePluginDefinition": "Vite 插件定义" } + }, + "iot": { + "exportExcel": "导出", + "exportExcelSuccess": "导出成功", + "exportExcelFail": "导出失败", + "type": "类型", + "iotDeviceCode": "设备编码", + "detectionResult": "检测结果", + "detectionTime": "检测时间", + "vehicleNum": "车牌号", + "tireNum": "轮胎号", + "temperature": "温度", + "pressure": "压力", + "numOfGroove": "沟槽数", + "detectionData": "胎纹数据", + "detectionDataAverage": "平均数据", + "calibrationData": "校准数据", + "apperance": "外观", + "pictures": "外观照片" + }, + "msg": { + "date": "日期", + "title": "标题", + "type": "类型", + "sender": "发信人", + "received": "已查收", + "operation": "操作" + } } diff --git a/web/src/plugin/announcement/view/info.vue b/web/src/plugin/announcement/view/info.vue index 2cbb837567..f6a24df031 100644 --- a/web/src/plugin/announcement/view/info.vue +++ b/web/src/plugin/announcement/view/info.vue @@ -21,7 +21,7 @@ + /> — + /> @@ -366,12 +366,12 @@ searchInfo.value.startCreatedAt && !searchInfo.value.endCreatedAt ) { - callback(new Error(t('general.placeInputEndData'))) + callback(new Error(t('general.placeInputEndDate'))) } else if ( !searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt ) { - callback(new Error(t('general.placeInputStartData'))) + callback(new Error(t('general.placeInputstartDate'))) } else if ( searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt && @@ -380,7 +380,7 @@ searchInfo.value.startCreatedAt.getTime() > searchInfo.value.endCreatedAt.getTime()) ) { - callback(new Error(t('general.startDataMustBeforeEndData'))) + callback(new Error(t('general.startDateMustBeforeEndData'))) } else { callback() } diff --git a/web/src/view/systemTools/exportTemplate/exportTemplate.vue b/web/src/view/systemTools/exportTemplate/exportTemplate.vue index 65f5d4c1b3..2395648fc4 100644 --- a/web/src/view/systemTools/exportTemplate/exportTemplate.vue +++ b/web/src/view/systemTools/exportTemplate/exportTemplate.vue @@ -25,7 +25,7 @@