待激活设备国际化

src/components/device/PendingActivateDialog.vue

@@ -1,6 +1,6 @@
-<template>
+<template>
   <el-dialog
-    title="待激活设备"
+    :title="$t('device.dialog.pendingActivate.title')"
     :visible.sync="dialogVisible"
     width="980px"
     append-to-body
@@ -72,10 +72,10 @@
     />
 
     <div slot="footer" class="dialog-footer">
-      <span class="page-footer-meta">已选择设备：{{ selectedIds.length }} 台</span>
+      <span class="page-footer-meta">{{ $t("device.dialog.pendingActivate.selectedCount", { count: selectedIds.length }) }}</span>
       <el-button @click="handleClose">{{ $t("common.cancel") }}</el-button>
       <el-button type="primary" :loading="submitLoading" @click="handleSubmit">
-        批量激活
+        {{ $t("device.dialog.pendingActivate.batchActivate") }}
       </el-button>
     </div>
   </el-dialog>
@@ -211,10 +211,10 @@ export default {
     },
     handleSubmit() {
       if (!this.selectedIds.length) {
-        this.$message.warning("请至少选择一台设备");
+        this.$message.warning(this.$t("device.message.selectDeviceForPendingActivate"));
         return;
       }
-      this.$confirm(`确认激活已选中的 ${this.selectedIds.length} 台设备吗？`, this.$t("common.tips"), {
+      this.$confirm(this.$t("device.message.confirmPendingActivate", { count: this.selectedIds.length }), this.$t("common.tips"), {
         confirmButtonText: this.$t("common.confirm"),
         cancelButtonText: this.$t("common.cancel"),
         type: "warning",
@@ -228,7 +228,7 @@ export default {
           });
         })
         .then(() => {
-          this.$message.success("批量激活成功");
+          this.$message.success(this.$t("device.message.pendingActivateSuccess"));
           this.$emit("success");
           this.handleClose();
         })

src/lang/index.js

@@ -8,6 +8,7 @@ import systemUserDeviceMessages from "./system-user-device-messages";
 import profileMessages from "./profile-messages";
 import noPermissionMessages from "./no-permission-messages";
 import fenceMessages from "./fence-messages";
+import pendingActivateMessages from "./pending-activate-messages";
 import { getLanguage } from "@/utils/language";
 
 const DEFAULT_LANGUAGE = "zh-CN";
@@ -65,6 +66,11 @@ const mergedMessagesWithFence = mergeLocaleMessages(
   fenceMessages
 );
 
+const mergedMessagesWithPendingActivate = mergeLocaleMessages(
+  mergedMessagesWithFence,
+  pendingActivateMessages
+);
+
 function getByPath(obj, path) {
   if (!obj || !path) {
     return undefined;
@@ -86,9 +92,9 @@ function formatTemplate(text, params = {}) {
 
 export function t(key, params = {}) {
   const currentLanguage = getLanguage() || DEFAULT_LANGUAGE;
-  const currentMessages = mergedMessagesWithFence[currentLanguage] || {};
-  const englishMessages = mergedMessagesWithFence["en-US"] || {};
-  const defaultMessages = mergedMessagesWithFence[DEFAULT_LANGUAGE] || {};
+  const currentMessages = mergedMessagesWithPendingActivate[currentLanguage] || {};
+  const englishMessages = mergedMessagesWithPendingActivate["en-US"] || {};
+  const defaultMessages = mergedMessagesWithPendingActivate[DEFAULT_LANGUAGE] || {};
 
   const fromCurrent = getByPath(currentMessages, key);
   if (fromCurrent !== undefined) {

src/views/device/device/index.vue

@@ -81,7 +81,7 @@
             <el-button type="primary" plain icon="el-icon-s-claim" size="mini" @click="handleClaimDevice" v-hasPermi="['device:device:claim:batch']">{{ $t("device.button.claim") }}</el-button>
         </el-col>
         <el-col :span="1.5">
-            <el-button type="warning" plain icon="el-icon-tickets" size="mini" v-hasPermi="['device:device:activate:batch']" @click="handlePendingActivateDialog">待激活设备</el-button>
+            <el-button type="warning" plain icon="el-icon-tickets" size="mini" v-hasPermi="['device:device:activate:batch']" @click="handlePendingActivateDialog">{{ $t("device.button.pendingActivate") }}</el-button>
         </el-col>
         <el-col :span="1.5">
             <el-button type="success" plain icon="el-icon-circle-check" size="mini" :disabled="multiple" v-hasPermi="['device:device:activate:batch']" @click="handleBatchActivate">{{ $t("device.button.batchEnable") }}</el-button>