From e413a220dd6983012fbf276bf88a5bc7fe1afd6b Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Fri, 29 Sep 2023 10:35:23 +0530 Subject: [PATCH] fix: i18n for Currnecy --- packages/nc-gui/components/cell/Currency.vue | 4 ++-- .../components/smartsheet/column/CurrencyOptions.vue | 12 +++++++----- packages/nc-gui/lang/en.json | 5 +++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/packages/nc-gui/components/cell/Currency.vue b/packages/nc-gui/components/cell/Currency.vue index fc67d9274a..487a594178 100644 --- a/packages/nc-gui/components/cell/Currency.vue +++ b/packages/nc-gui/components/cell/Currency.vue @@ -79,7 +79,7 @@ onMounted(() => { v-model="vModel" type="number" class="w-full h-full text-sm border-none rounded-md outline-none" - :placeholder="isEditColumn ? '(Optional)' : ''" + :placeholder="isEditColumn ? $t('labels.optional') : ''" @blur="submitCurrency" @keydown.down.stop @keydown.left.stop @@ -93,7 +93,7 @@ onMounted(() => { @contextmenu.stop /> - NULL + {{ $t('labels.null') }} {{ currency }} diff --git a/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue b/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue index 63ce4816bd..f19d110c5e 100644 --- a/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue @@ -12,6 +12,8 @@ const props = defineProps<{ const emit = defineEmits(['update:value']) +const { t } = useI18n() + const vModel = useVModel(props, 'value', emit) const validators = { @@ -20,7 +22,7 @@ const validators = { validator: (_: any, locale: any) => { return new Promise((resolve, reject) => { if (!validateCurrencyLocale(locale)) { - return reject(new Error('Invalid locale')) + return reject(new Error(t('msg.invalidLocale'))) } resolve() }) @@ -32,7 +34,7 @@ const validators = { validator: (_: any, currencyCode: any) => { return new Promise((resolve, reject) => { if (!validateCurrencyCode(currencyCode)) { - return reject(new Error('Invalid Currency Code')) + return reject(new Error(t('msg.invalidCurrencyCode'))) } resolve() }) @@ -54,7 +56,7 @@ const currencyLocaleList = ref<{ text: string; value: string }[]>([]) const isMoney = computed(() => vModel.value.dt === 'money') const message = computed(() => { - if (isMoney.value && isPg.value) return "PostgreSQL 'money' type has own currency settings" + if (isMoney.value && isPg.value) return t('msg.postgresHasItsOwnCurrencySettings') return '' }) @@ -77,7 +79,7 @@ currencyLocales().then((locales) => {