fix: review corrections

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>

packages/nc-gui/components/notification/Card.vue

@@ -25,7 +25,7 @@ const groupType = computed({
     <div class="p-3" @click.stop>
       <div class="flex items-center">
         <span class="text-md font-medium text-[#212121]">
-          {{ $t('activity.notification') }}
+          {{ $t('general.notification') }}
         </span>
         <div class="flex-grow"></div>
         <div

packages/nc-gui/components/template/Editor.vue

@@ -844,7 +844,7 @@ function handleUIDTChange(column, table) {
 
                 <template v-else-if="column.key === 'dtxp' && hasSelectColumn[tableIdx]">
                   <span>
-                    {{ $t('general.options')}}
+                    {{ $t('general.options') }}
                   </span>
                 </template>
               </template>
@@ -887,7 +887,7 @@ function handleUIDTChange(column, table) {
                 <template v-if="column.key === 'action'">
                   <a-tooltip v-if="record.key === 0">
                     <template #title>
-                      <span>{{ $t('general.primaryValue')}}</span>
+                      <span>{{ $t('general.primaryValue') }}</span>
                     </template>
 
                     <div class="flex items-center float-right mr-4">
@@ -897,7 +897,7 @@ function handleUIDTChange(column, table) {
 
                   <a-tooltip v-else>
                     <template #title>
-                      <span>{{  $t('activity.deleteColumn') }}</span>
+                      <span>{{ $t('activity.column.delete') }}</span>
                     </template>
 
                     <a-button type="text" @click="deleteTableColumn(tableIdx, record.key)">
@@ -913,7 +913,7 @@ function handleUIDTChange(column, table) {
             <div class="mt-5 flex gap-2 justify-center">
               <a-tooltip bottom>
                 <template #title>
-                  <span>{{  $t('activity.column.addNumberColumn') }}</span>
+                  <span>{{ $t('activity.column.addNumber') }}</span>
                 </template>
 
                 <a-button class="group" @click="addNewColumnRow(tableIdx, 'Number')">
@@ -925,7 +925,7 @@ function handleUIDTChange(column, table) {
 
               <a-tooltip bottom>
                 <template #title>
-                  <span>{{  $t('activity.column.addSingleLineText') }}</span>
+                  <span>{{ $t('activity.column.addSingleLineText') }}</span>
                 </template>
 
                 <a-button class="group" @click="addNewColumnRow(tableIdx, 'SingleLineText')">
@@ -937,7 +937,7 @@ function handleUIDTChange(column, table) {
 
               <a-tooltip bottom>
                 <template #title>
-                  <span>{{  $t('activity.column.addLongText') }}</span>
+                  <span>{{ $t('activity.column.addLongText') }}</span>
                 </template>
 
                 <a-button class="group" @click="addNewColumnRow(tableIdx, 'LongText')">
@@ -949,7 +949,7 @@ function handleUIDTChange(column, table) {
 
               <a-tooltip bottom>
                 <template #title>
-                  <span>{{  $t('activity.column.addOther') }}</span>
+                  <span>{{ $t('activity.column.addOther') }}</span>
                 </template>
 
                 <a-button class="group" @click="addNewColumnRow(tableIdx, 'SingleLineText')">

packages/nc-gui/components/workspace/CreateProjectDlg.vue

@@ -26,7 +26,7 @@ const { navigateToProject } = useGlobal()
 const nameValidationRules = [
   {
     required: true,
-    message: t('msg.dbNameRequired'),
+    message: t('msg.info.dbNameRequired'),
   },
   baseTitleValidator,
 ] as RuleObject[]

packages/nc-gui/components/workspace/InviteCollabDlg.vue

@@ -42,7 +42,7 @@ const validators = computed(() => {
       {
         validator: (rule: any, value: string, callback: (errMsg?: string) => void) => {
           if (!value || value.length === 0) {
-            callback(t('error.signUpRules.emailRequired'))
+            callback(t('msg.error.signUpRules.emailRequired'))
             return
           }
           const invalidEmails = (value || '').split(/\s*,\s*/).filter((e: string) => !validateEmail(e))
@@ -50,8 +50,8 @@ const validators = computed(() => {
             callback(
               `${
                 invalidEmails.length > 1
-                  ? `${t('error.signUpRules.invalidEmails')}: `
-                  : `${t('error.signUpRules.invalidEmail')}: `
+                  ? `${t('msg.error.signUpRules.invalidEmails')}: `
+                  : `${t('msg.error.signUpRules.invalidEmail')}: `
               } ${invalidEmails.join(', ')} `,
             )
           } else {

packages/nc-gui/components/workspace/Settings.vue

@@ -3,7 +3,6 @@ import { useI18n } from '#imports'
 const { signOut } = useGlobal()
 const { t } = useI18n()
 
-
 const { deleteWorkspace, navigateToWorkspace, updateWorkspace } = useWorkspace()
 const { workspacesList, activeWorkspaceId, activeWorkspace, workspaces } = storeToRefs(useWorkspace())
 
@@ -20,9 +19,9 @@ const form = ref({
 
 const formRules = {
   title: [
-    { required: true, message: t('msg.wsNameRequired') },
-    { min: 3, message: t('msg.wsNameMinLength') },
-    { max: 50, message: t('msg.wsNameMaxLength') },
+    { required: true, message: t('msg.info.wsNameRequired') },
+    { min: 3, message: t('msg.info.wsNameMinLength') },
+    { max: 50, message: t('msg.info.wsNameMaxLength') },
   ],
 }
 
@@ -145,10 +144,10 @@ const onCancel = () => {
     </div>
     <div class="item flex flex-col">
       <div class="font-medium text-base">{{ $t('title.deleteWs') }}</div>
-      <div class="text-gray-500 mt-2">{{ $t('msg.wsDeleteDlg') }}</div>
+      <div class="text-gray-500 mt-2">{{ $t('msg.info.wsDeleteDlg') }}</div>
       <div class="flex flex-row mt-8 gap-x-2">
         <a-checkbox v-model:checked="isConfirmed" />
-        <div class="flex">{{ $t('msg.userConfirmation') }}</div>
+        <div class="flex">{{ $t('msg.info.userConfirmation') }}</div>
       </div>
 
       <div class="flex flex-row w-full justify-end mt-8">

packages/nc-gui/lang/en.json

@@ -566,7 +566,7 @@
     "requestDataSource": "Request a data source you need?",
     "apiKey": "API Key",
     "personalAccessToken": "Personal Access Token",
-    "sharedBaseUrl": "Shared Base",
+    "sharedBaseUrl": "Shared Base URL",
     "importData": "Import Data",
     "importSecondaryViews": "Import Secondary Views",
     "importRollupColumns": "Import Rollup Fields",
@@ -644,8 +644,8 @@
     "useTheme": "Use Theme",
     "copyLink": "Copy Link",
     "copiedLink": "Link Copied",
-    "copyInviteLink":"Copy invite link",
-    "copiedInviteLink":"Copied invite link",
+    "copyInviteLink": "Copy invite link",
+    "copiedInviteLink": "Copied invite link",
     "copyUrl": "Copy URL",
     "moreColors": "More Colors",
     "moveProject": "Move Base",
@@ -788,14 +788,14 @@
     "expandRecord": "Expand Record",
     "deleteRecord": "Delete Record",
     "fullWidth": "Full width",
-    "exitFullWidth": "Full width",
+    "exitFullWidth": "Exit full width",
     "markAllAsRead": "Mark all as read",
     "column":{
-      "delete": "Delete Column",
-      "addNumber": "Add Number Column",
-      "addSingleLineText": "Add SingleLineText Column",
-      "addLongText": "Add LongText Column",
-      "addOther":"Add Other Column"
+      "delete": "Delete Field",
+      "addNumber": "Add Number Field",
+      "addSingleLineText": "Add SingleLineText Field",
+      "addLongText": "Add LongText Field",
+      "addOther":"Add Other Field"
     },
     "erd": {
       "showColumns": "Show Fields",
@@ -991,7 +991,7 @@
     "length59Required": "The length exceeds the max 59 characters",
     "noNewNotifications": "You have no new notifications",
     "noRecordFound": "Record not found",
-    "rowDeleted": "Row deleted",
+    "rowDeleted": "Record deleted",
     "saveChanges": "Do you want to save the changes?",
     "tooLargeField": "The field is too large to be converted to",
     "roleRequired": "Role required",
@@ -1161,10 +1161,11 @@
       "wsNameMaxLength":"Workspace name must be at most 50 characters long",
       "wsDeleteDlg": "Delete this workspace and all it’s contents.",
       "userConfirmation": "I understand that this action is irreversible",
-      "pageNotFound":"Page Not Found",
-      "makeLineBreak":"to make a line break",
+      "pageNotFound": "Page Not Found",
+      "makeLineBreak": "to make a line break",
+      "goToPrevious": "Go to previous",
       "goToNext": "Go to next",
-      "thankyou":"Thank you!",
+      "thankYou": "Thank you!",
       "submittedFormData": "You have successfully submitted the form data."
     },
     "error": {

packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/survey.vue

@@ -346,7 +346,7 @@ onMounted(() => {
               <div v-else-if="!submitted" class="flex items-center gap-3 flex-col">
                 <a-tooltip
                   :title="
-                    v$.localState[field.title]?.$error ? v$.localState[field.title].$errors[0].$message : $t('msg.goToNext')
+                    v$.localState[field.title]?.$error ? v$.localState[field.title].$errors[0].$message : $t('msg.info.goToNext')
                   "
                   :mouse-enter-delay="0.25"
                   :mouse-leave-delay="0"
@@ -393,9 +393,9 @@ onMounted(() => {
 
                 <template v-else>
                   <div class="flex flex-col gap-1">
-                    <div>{{ $t('msg.thankyou') }}</div>
+                    <div>{{ $t('msg.info.thankYou') }}</div>
 
-                    <div>{{ $t('msg.submittedFormData') }}</div>
+                    <div>{{ $t('msg.info.submittedFormData') }}</div>
                   </div>
                 </template>
               </div>
@@ -429,7 +429,7 @@ onMounted(() => {
           v-if="!submitted"
           class="color-transition shadow-sm absolute bottom-18 right-1/2 transform translate-x-[50%] md:bottom-4 md:(right-12 transform-none) flex items-center bg-white border dark:bg-slate-500 rounded divide-x-1"
         >
-          <a-tooltip :title="isFirst ? '' : 'Go to previous'" :mouse-enter-delay="0.25" :mouse-leave-delay="0">
+          <a-tooltip :title="isFirst ? '' : $t('msg.info.goToPrevious')" :mouse-enter-delay="0.25" :mouse-leave-delay="0">
             <button
               :class="
                 animationTarget === AnimationTarget.ArrowLeft && isAnimating
@@ -449,7 +449,7 @@ onMounted(() => {
           </a-tooltip>
 
           <a-tooltip
-            :title="v$.localState[field.title]?.$error ? '' : $t('msg.goToNext')"
+            :title="v$.localState[field.title]?.$error ? '' : $t('msg.info.goToNext')"
             :mouse-enter-delay="0.25"
             :mouse-leave-delay="0"
           >

packages/nc-gui/pages/reset/[id].vue

@@ -10,7 +10,7 @@ import {
   useApi,
   useRoute,
   useRouter,
-  useI18n
+  useI18n,
 } from '#imports'
 
 definePageMeta({
@@ -91,7 +91,7 @@ function resetError() {
           <a-form-item
             :label="$t('placeholder.password.new')"
             name="password"
-            :rules="[{ required: true, message: t('error.passwdRequired') }]"
+            :rules="[{ required: true, message: t('msg.error.signUpRules.passwdRequired') }]"
           >
             <a-input-password
               v-model:value="form.password"
@@ -104,7 +104,7 @@ function resetError() {
           <a-form-item
             :label="$t('placeholder.password.confirm')"
             name="newPassword"
-            :rules="[{ required: true, message: t('error.passwdRequired') }]"
+            :rules="[{ required: true, message: t('msg.error.signUpRules.passwdRequired') }]"
           >
             <a-input-password
               v-model:value="form.newPassword"