WIP [AMORO-3002] Complete internationalization for some remaining pag…

…es (#3006) [AMORO-3002] Complete internationalization for some remaining pages
apache · Jul 5, 2024 · ab1f6e1 · ab1f6e1
1 parent 69445d7
commit ab1f6e1
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 27 deletions.
diff --git a/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue b/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue
@@ -74,7 +74,14 @@ export default defineComponent({
 </script>
 
 <template>
-  <a-modal v-model:open="$props.visible" :title="$t('createDatabase')" @ok="handleOk" @cancel="handleCancel">
+  <a-modal 
+    v-model:open="$props.visible" 
+    :title="$t('createDatabase')" 
+    :ok-text="$t('ok')"
+    :cancel-text="$t('cancel')" 
+    @ok="handleOk" 
+    @cancel="handleCancel"
+  >
     <a-form ref="formRef" :model="formState" class="label-120">
       <a-form-item name="catalog" :label="$t('catalog')" :rules="[{ required: true, message: `${placeholder.selectClPh}` }]">
         <a-select

diff --git a/amoro-ams/amoro-ams-dashboard/src/language/en.ts b/amoro-ams/amoro-ams-dashboard/src/language/en.ts
@@ -205,4 +205,7 @@ export default {
   noResourceGroupsTitle: 'No resource groups available.',
   noResourceGroupsContent: 'Please create an optimizer group first.',
   goToButtonText: 'Go',
+  snapshots: 'Snapshots',
+  details: 'Details',
+  operations: 'Operations',
 }
diff --git a/amoro-ams/amoro-ams-dashboard/src/language/zh.ts b/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
@@ -205,4 +205,7 @@ export default {
   noResourceGroupsTitle: '没有任何优化组',
   noResourceGroupsContent: '需要首先创建一个默认优化组',
   goToButtonText: '前往',
+  snapshots: '快照',
+  details: '详情',
+  operations: '操作',
 }
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue
@@ -203,6 +203,7 @@ async function getOptimizerGroupList() {
       title: t('noResourceGroupsTitle'),
       content: t('noResourceGroupsContent'),
       okText: t('goToButtonText'),
+      cancelText: t('cancel'),
       onOk: async () => {
         try {
           router.push({ path: '/optimizing', query: { tab: 'optimizergroup' } })
@@ -457,6 +458,7 @@ async function handleRemove() {
     title: t('cannotDeleteModalTitle'),
     content: t('cannotDeleteModalContent'),
     wrapClassName: 'not-delete-modal',
+    okText: t('ok'),
   })
 }
 async function validatorName(_: any, value: string) {
@@ -534,6 +536,8 @@ function handleCancel() {
 async function deleteCatalogModal() {
   Modal.confirm({
     title: t('deleteCatalogModalTitle'),
+    okText: t('ok'),
+    cancelText: t('cancel'),
     onOk: async () => {
       try {
         await delCatalog(formState.catalog.name || '')

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue
@@ -152,6 +152,7 @@ function leaveConfirm(cb?: () => void) {
     title: t('leavePageModalTitle'),
     content: t('leavePageModalContent'),
     okText: t('leave'),
+    cancelText: t('cancel'),
     onOk: async () => {
       cb && await cb()
     },

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue
@@ -31,8 +31,10 @@ const open = ref(true)
   <AModal
     v-model:open="open"
     :width="560"
-    :title="`${$t('errorMessage')}`"
+    :title="$t('errorMessage')"
     :footer="null"
+    :ok-text="$t('ok')"
+    :cancel-text="$t('cancel')"
     class="upgrade-error"
     @cancel="emit('cancel')"
   >

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue
@@ -110,9 +110,8 @@ function releaseModal(record: any) {
   }
   Modal.confirm({
     title: t('releaseOptModalTitle'),
-    content: '',
-    okText: '',
-    cancelText: '',
+    okText: t('ok'),
+    cancelText: t('cancel'),
     onOk: () => {
       releaseJob(record)
     },

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
@@ -85,7 +85,16 @@ onMounted(() => {
 </script>
 
 <template>
-  <AModal :visible="props.visible" :title="$t('scaleOut')" :confirm-loading="confirmLoading" :closable="false" @ok="handleOk" @cancel="handleCancel">
+  <AModal 
+    :visible="props.visible" 
+    :title="$t('scaleOut')" 
+    :confirm-loading="confirmLoading" 
+    :closable="false" 
+    :ok-text="$t('ok')"
+    :cancel-text="$t('cancel')"
+    @ok="handleOk" 
+    @cancel="handleCancel"
+  >
     <a-form ref="formRef" :model="formState" class="label-120">
       <a-form-item name="resourceGroup" :label="$t('resourceGroup')" :rules="[{ required: true, message: `${placeholder.resourceGroupPh}` }]">
         <a-select

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue
@@ -25,7 +25,6 @@ import type { IGroupItem, IGroupItemInfo, ILableAndValue, IMap } from '@/types/c
 import { usePlaceholder } from '@/hooks/usePlaceholder'
 import { usePagination } from '@/hooks/usePagination'
 import { getOptimizerGroups, getQueueResourceInfo } from '@/services/optimize.service'
-// import ScaleOutModal from './components/ScaleOut.vue'
 import { mbToSize } from '@/utils'
 
 export default defineComponent({

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
@@ -109,8 +109,15 @@ onMounted(() => {
 
 <template>
   <AModal
-    :visible="true" :title="edit ? $t('editgroup') : $t('addgroup')" :confirm-loading="confirmLoading"
-    :closable="false" class="group-modal" @ok="handleOk" @cancel="handleCancel"
+    :visible="true" 
+    :title="edit ? $t('editgroup') : $t('addgroup')" 
+    :confirm-loading="confirmLoading"
+    :closable="false"
+    :ok-text="$t('ok')"
+    :cancel-text="$t('cancel')"
+    lass="group-modal" 
+    @ok="handleOk" 
+    @cancel="handleCancel"
   >
     <a-form ref="formRef" :model="formState" class="label-120">
       <a-form-item name="name" :label="$t('name')" :rules="[{ required: true, message: `${placeholder.groupNamePh}` }]">

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue
@@ -96,9 +96,8 @@ function releaseModal(record: any) {
   }
   Modal.confirm({
     title: t('releaseOptModalTitle'),
-    content: '',
-    okText: '',
-    cancelText: '',
+    okText: t('confirm'),
+    cancelText: t('cancel'),
     onOk: () => {
       releaseJob(record)
     },
@@ -174,6 +173,8 @@ async function removeGroup(record: IIOptimizeGroupItem) {
   if (res) {
     Modal.confirm({
       title: t('deleteGroupModalTitle'),
+      okText: t('ok'),
+      cancelText: t('cancel'),
       onOk: async () => {
         await groupDeleteAPI({ name: record.name })
         message.success(`${t('remove')} ${t('success')}`)
@@ -185,6 +186,7 @@ async function removeGroup(record: IIOptimizeGroupItem) {
   Modal.warning({
     title: t('cannotDeleteGroupModalTitle'),
     content: t('cannotDeleteGroupModalContent'),
+    okText: t('ok'),
   })
 }
 

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/ScaleOut.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/ScaleOut.vue
@@ -76,6 +76,8 @@ onMounted(() => {
     :title="$t('scaleOut')"
     :confirm-loading="confirmLoading"
     :closable="false"
+    :ok-text="$t('ok')"
+    :cancel-text="$t('cancel')"
     @ok="handleOk"
     @cancel="handleCancel"
   >

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue
@@ -126,7 +126,9 @@ onMounted(() => {
   <AModal
     :visible="visible"
     :width="560"
-    :title="`${$t('operationDetails')}`"
+    :ok-text="$t('ok')"
+    :cancel-text="$t('cancel')"
+    :title="$t('operationDetails')"
     class="operation-wrap"
     @cancel="cancel"
   >

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue
@@ -124,9 +124,8 @@ async function refreshOptimizingProcesses() {
 async function cancel() {
   Modal.confirm({
     title: t('cancelOptimizingProcessOptModalTitle'),
-    content: '',
-    okText: '',
-    cancelText: '',
+    okText: t('ok'),
+    cancelText: t('cancel'),
     onOk: async () => {
       try {
         loading.value = true

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
@@ -44,9 +44,9 @@ export default defineComponent({
     const detailRef = ref()
 
     const tabConfigs = shallowReactive([
-      { key: 'Snapshots', label: 'Snapshots' },
-      { key: 'Optimizing', label: 'Optimizing' },
-      { key: 'Operations', label: 'Operations' },
+      { key: 'Snapshots', label: 'snapshots' },
+      { key: 'Optimizing', label: 'optimizing' },
+      { key: 'Operations', label: 'operations' },
     ])
 
     const state = reactive({
@@ -156,13 +156,13 @@ export default defineComponent({
       </div>
       <div class="content">
         <a-tabs v-model:activeKey="activeKey" destroy-inactive-tab-pane @change="onChangeTab">
-          <a-tab-pane key="Details" tab="Details" force-render>
+          <a-tab-pane key="Details" :tab="$t('details')" force-render>
             <UDetails ref="detailRef" @set-base-detail-info="setBaseDetailInfo" />
           </a-tab-pane>
-          <a-tab-pane v-if="detailLoaded" key="Files" tab="Files">
+          <a-tab-pane v-if="detailLoaded" key="Files" :tab="$t('files')">
             <UFiles :has-partition="baseInfo.hasPartition" />
           </a-tab-pane>
-          <a-tab-pane v-for="tab in tabConfigs" :key="tab.key" :tab="`${tab.label}`">
+          <a-tab-pane v-for="tab in tabConfigs" :key="tab.key" :tab="$t(tab.label)">
             <component :is="`U${tab.key}`" />
           </a-tab-pane>
         </a-tabs>

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
@@ -30,14 +30,9 @@ const isEmpty = computed(() => {
 const status = computed(() => {
   return props.info?.status
 })
-
-// const innerWidth = computed(() => {
-//   return window.innerWidth - 220 - 34
-// })
 </script>
 
 <template>
-  <!-- :style="{width: `${innerWidth}px`}" -->
   <div class="sql-result-wrap">
     <div class="result-status" :style="{ background: debugResultBgcMap[status as keyof typeof debugResultBgcMap] }">
       <template v-if="status === 'Running'">