Browse Source

Merge pull request #6049 from gitstart/NCDBOSS-49-fix

NCDBOSS-49 - 🔦 Feature: Translation: "User acount Settings" pages are translated in json file, but the newest release still keep untraslated
pull/6055/head
աɨռɢӄաօռɢ 1 year ago committed by GitHub
parent
commit
6ca358c4d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      packages/nc-gui/components/account/Token.vue
  2. 9
      packages/nc-gui/lang/en.json
  3. 14
      packages/nc-gui/pages/account/index.vue

4
packages/nc-gui/components/account/Token.vue

@ -101,7 +101,7 @@ const descriptionInput: VNodeRef = (el) => (el as HTMLInputElement)?.focus()
<template>
<div class="h-full overflow-y-scroll scrollbar-thin-dull pt-2">
<div class="max-w-[900px] mx-auto p-4" data-testid="nc-token-list">
<div class="text-xl my-4 text-left font-weight-bold">Token Management</div>
<div class="text-xl my-4 text-left font-weight-bold">{{ $t('title.tokenManagement') }}</div>
<div class="py-2 flex gap-4 items-center">
<div class="flex-grow"></div>
<component :is="iconMap.reload" class="cursor-pointer" @click="loadTokens" />
@ -114,7 +114,7 @@ const descriptionInput: VNodeRef = (el) => (el as HTMLInputElement)?.focus()
>
<div class="flex items-center gap-1">
<component :is="iconMap.plus" />
Add new token
{{ $t('title.addNewToken') }}
</div>
</a-button>
</div>

9
packages/nc-gui/lang/en.json

@ -211,7 +211,14 @@
"codeSnippet": "Code Snippet",
"keyboardShortcut": "Keyboard Shortcuts",
"generateRandomName": "Generate Random Name",
"findRowByScanningCode": "Find row by scanning a QR or Barcode"
"findRowByScanningCode": "Find row by scanning a QR or Barcode",
"tokenManagement": "Token Management",
"addNewToken": "Add new token",
"accountSettings": "Account Settings",
"resetPasswordMenu": "Reset Password",
"tokens": "Tokens",
"userManagement": "User Management",
"licence": "Licence"
},
"labels": {
"createdBy": "Created By",

14
packages/nc-gui/pages/account/index.vue

@ -30,7 +30,7 @@ const openKeys = ref([/^\/account\/users/.test($route.fullPath) && 'users'])
class="tabs-menu h-full"
mode="inline"
>
<div class="text-xs text-gray-500 ml-4 pt-4 pb-2 font-weight-bold">Account Settings</div>
<div class="text-xs text-gray-500 ml-4 pt-4 pb-2 font-weight-bold">{{ $t('title.accountSettings') }}</div>
<a-sub-menu key="users" class="!bg-white">
<template #icon>
@ -44,10 +44,10 @@ const openKeys = ref([/^\/account\/users/.test($route.fullPath) && 'users'])
class="text-xs"
@click="navigateTo('/account/users/list')"
>
<span class="ml-4">User Management</span>
<span class="ml-4">{{ $t('title.userManagement') }}</span>
</a-menu-item>
<a-menu-item key="password-reset" class="text-xs" @click="navigateTo('/account/users/password-reset')">
<span class="ml-4">Reset Password</span>
<span class="ml-4">{{ $t('title.resetPasswordMenu') }}</span>
</a-menu-item>
<a-menu-item
v-if="isUIAllowed('superAdminAppSettings')"
@ -55,7 +55,7 @@ const openKeys = ref([/^\/account\/users/.test($route.fullPath) && 'users'])
class="text-xs"
@click="navigateTo('/account/users/settings')"
>
<span class="ml-4">Settings</span>
<span class="ml-4">{{ $t('activity.settings') }}</span>
</a-menu-item>
</a-sub-menu>
@ -67,7 +67,7 @@ const openKeys = ref([/^\/account\/users/.test($route.fullPath) && 'users'])
<div class="flex items-center space-x-2">
<MdiShieldKeyOutline />
<div class="select-none">Tokens</div>
<div class="select-none">{{ $t('title.tokens') }}</div>
</div>
</a-menu-item>
<a-menu-item
@ -79,7 +79,7 @@ const openKeys = ref([/^\/account\/users/.test($route.fullPath) && 'users'])
<div class="flex items-center space-x-2">
<component :is="iconMap.appStore" />
<div class="select-none">App Store</div>
<div class="select-none">{{ $t('title.appStore') }}</div>
</div>
</a-menu-item>
<a-menu-item
@ -91,7 +91,7 @@ const openKeys = ref([/^\/account\/users/.test($route.fullPath) && 'users'])
<div class="flex items-center space-x-2">
<component :is="iconMap.key" />
<div class="select-none">License</div>
<div class="select-none">{{ $t('title.licence') }}</div>
</div>
</a-menu-item>
</a-menu>

Loading…
Cancel
Save