From 7c322608fe3f660199746002d50e273adc88ac96 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Fri, 29 Sep 2023 15:08:42 +0530
Subject: [PATCH] fix: i18n for Currency, Email, Float, Integer, and URL

---
 packages/nc-gui/components/cell/Currency.vue | 2 +-
 packages/nc-gui/components/cell/Email.vue    | 4 ++--
 packages/nc-gui/components/cell/Float.vue    | 4 ++--
 packages/nc-gui/components/cell/Integer.vue  | 4 ++--
 packages/nc-gui/components/cell/Url.vue      | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue
index abdec73adf..1b5d363969 100644
--- a/packages/nc-gui/components/cell/Currency.vue
+++ b/packages/nc-gui/components/cell/Currency.vue
@@ -93,7 +93,7 @@ onMounted(() => {
     @contextmenu.stop
   />
 
-  <span v-else-if="vModel === null && showNull" class="nc-null">{{ $t('general.null') }}</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
 
   <!-- only show the numeric value as previously string value was accepted -->
   <span v-else-if="!isNaN(vModel)">{{ currency }}</span>
diff --git a/packages/nc-gui/components/cell/Email.vue b/packages/nc-gui/components/cell/Email.vue
index 434dd0a1fc..385fecb852 100644
--- a/packages/nc-gui/components/cell/Email.vue
+++ b/packages/nc-gui/components/cell/Email.vue
@@ -71,7 +71,7 @@ watch(
     :ref="focus"
     v-model="vModel"
     class="w-full outline-none text-sm px-1 py-2"
-    :placeholder="isEditColumn ? '(Optional)' : ''"
+    :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
     @keydown.left.stop
@@ -84,7 +84,7 @@ watch(
     @mousedown.stop
   />
 
-  <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
 
   <nuxt-link
     v-else-if="validEmail"
diff --git a/packages/nc-gui/components/cell/Float.vue b/packages/nc-gui/components/cell/Float.vue
index a9c8f41001..8a91b05ebb 100644
--- a/packages/nc-gui/components/cell/Float.vue
+++ b/packages/nc-gui/components/cell/Float.vue
@@ -51,7 +51,7 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
     class="outline-none px-1 border-none w-full h-full text-sm"
     type="number"
     step="0.1"
-    :placeholder="isEditColumn ? '(Optional)' : ''"
+    :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown.down.stop
     @keydown.left.stop
@@ -63,7 +63,7 @@ const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value
     @selectstart.capture.stop
     @mousedown.stop
   />
-  <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
   <span v-else class="text-sm">{{ vModel }}</span>
 </template>
 
diff --git a/packages/nc-gui/components/cell/Integer.vue b/packages/nc-gui/components/cell/Integer.vue
index 477232670a..16a2597c32 100644
--- a/packages/nc-gui/components/cell/Integer.vue
+++ b/packages/nc-gui/components/cell/Integer.vue
@@ -88,7 +88,7 @@ function onKeyDown(e: any) {
     class="outline-none py-2 px-1 border-none w-full h-full text-sm"
     type="number"
     style="letter-spacing: 0.06rem"
-    :placeholder="isEditColumn ? '(Optional)' : ''"
+    :placeholder="isEditColumn ? $t('labels.optional') : ''"
     @blur="editEnabled = false"
     @keydown="onKeyDown"
     @keydown.down.stop
@@ -99,7 +99,7 @@ function onKeyDown(e: any) {
     @selectstart.capture.stop
     @mousedown.stop
   />
-  <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+  <span v-else-if="vModel === null && showNull" class="nc-null uppercase">{{ $t('general.null') }}</span>
   <span v-else class="text-sm">{{ displayValue }}</span>
 </template>
 
diff --git a/packages/nc-gui/components/cell/Url.vue b/packages/nc-gui/components/cell/Url.vue
index 6243e473bf..cd6d15077e 100644
--- a/packages/nc-gui/components/cell/Url.vue
+++ b/packages/nc-gui/components/cell/Url.vue
@@ -91,7 +91,7 @@ watch(
       v-if="editEnabled"
       :ref="focus"
       v-model="vModel"
-      :placeholder="isEditColumn ? 'Enter default URL (Optional)' : ''"
+      :placeholder="isEditColumn ? $t('labels.enterDefaultUrlOptional') : ''"
       class="outline-none text-sm w-full px-2 py-2 bg-transparent h-full"
       @blur="editEnabled = false"
       @keydown.down.stop
@@ -105,7 +105,7 @@ watch(
       @mousedown.stop
     />
 
-    <span v-else-if="vModel === null && showNull" class="nc-null">NULL</span>
+    <span v-else-if="vModel === null && showNull" class="nc-null uppercase"> $t('general.null')</span>
 
     <nuxt-link
       v-else-if="isValid && !cellUrlOptions?.overlay"