From d279d284c2189dc3ed8cad7764f280d95950d7ab Mon Sep 17 00:00:00 2001 From: benjaminedc <benjaminedc@verdnatura.es> Date: Fri, 21 Mar 2025 11:09:56 +0100 Subject: [PATCH 1/3] fix: refs #8790 format code and update default SMS message in SendSmsDialog component --- src/components/common/SendSmsDialog.vue | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/components/common/SendSmsDialog.vue b/src/components/common/SendSmsDialog.vue index 269a4ec9a..74aa64c72 100644 --- a/src/components/common/SendSmsDialog.vue +++ b/src/components/common/SendSmsDialog.vue @@ -1,15 +1,15 @@ <script setup> -import {useDialogPluginComponent} from 'quasar'; -import {useI18n} from 'vue-i18n'; -import {computed, ref} from 'vue'; +import { useDialogPluginComponent } from 'quasar'; +import { useI18n } from 'vue-i18n'; +import { computed, ref } from 'vue'; import VnInput from 'components/common/VnInput.vue'; import axios from 'axios'; -import useNotify from "composables/useNotify"; +import useNotify from 'composables/useNotify'; const MESSAGE_MAX_LENGTH = 160; -const {t} = useI18n(); -const {notify} = useNotify(); +const { t } = useI18n(); +const { notify } = useNotify(); const props = defineProps({ title: { type: String, @@ -34,7 +34,7 @@ const props = defineProps({ }); const emit = defineEmits([...useDialogPluginComponent.emits, 'sent']); -const {dialogRef, onDialogHide} = useDialogPluginComponent(); +const { dialogRef, onDialogHide } = useDialogPluginComponent(); const smsRules = [ (val) => (val && val.length > 0) || t("The message can't be empty"), @@ -43,10 +43,12 @@ const smsRules = [ t("The message it's too long"), ]; -const message = ref(''); +const message = ref( + 'Retraso en ruta.\nInformamos que la ruta que lleva su pedido ha sufrido un retraso y la entrega se hará a lo largo del día.\nDisculpe las molestias.', +); const charactersRemaining = computed( - () => MESSAGE_MAX_LENGTH - new Blob([message.value]).size + () => MESSAGE_MAX_LENGTH - new Blob([message.value]).size, ); const charactersChipColor = computed(() => { @@ -114,7 +116,7 @@ const onSubmit = async () => { <QTooltip> {{ t( - 'Special characters like accents counts as a multiple' + 'Special characters like accents counts as a multiple', ) }} </QTooltip> From 197a4a0ca73ed94b976ebdba5a39dc84d2210f30 Mon Sep 17 00:00:00 2001 From: benjaminedc <benjaminedc@verdnatura.es> Date: Fri, 21 Mar 2025 11:42:31 +0100 Subject: [PATCH 2/3] fix: refs #8790 update default SMS message in SendSmsDialog component for improved clarity and localization --- src/components/common/SendSmsDialog.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/common/SendSmsDialog.vue b/src/components/common/SendSmsDialog.vue index 74aa64c72..ee468a42f 100644 --- a/src/components/common/SendSmsDialog.vue +++ b/src/components/common/SendSmsDialog.vue @@ -43,9 +43,7 @@ const smsRules = [ t("The message it's too long"), ]; -const message = ref( - 'Retraso en ruta.\nInformamos que la ruta que lleva su pedido ha sufrido un retraso y la entrega se hará a lo largo del día.\nDisculpe las molestias.', -); +const message = ref(t('routeLack')); const charactersRemaining = computed( () => MESSAGE_MAX_LENGTH - new Blob([message.value]).size, @@ -147,6 +145,8 @@ const onSubmit = async () => { } </style> <i18n> +en: + routeLack: Your order has been delayed in transit. Delivery will take place throughout the day. We apologize for the inconvenience and appreciate your patience. es: Message: Mensaje Send: Enviar @@ -155,4 +155,5 @@ es: The destination can't be empty: El destinatario no puede estar vacio The message can't be empty: El mensaje no puede estar vacio The message it's too long: El mensaje es demasiado largo + routeLack: Retraso en ruta. Informamos que la ruta que lleva su pedido ha sufrido un retraso y la entrega se hará a lo largo del día. Disculpe las molestias. </i18n> From 3587be39973a6f570c11e9601d510b3bf70b9680 Mon Sep 17 00:00:00 2001 From: benjaminedc <benjaminedc@verdnatura.es> Date: Mon, 24 Mar 2025 12:41:40 +0100 Subject: [PATCH 3/3] refactor: refs #8790 update SMS delay message and localization keys --- src/components/common/SendSmsDialog.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/common/SendSmsDialog.vue b/src/components/common/SendSmsDialog.vue index ee468a42f..a953abd75 100644 --- a/src/components/common/SendSmsDialog.vue +++ b/src/components/common/SendSmsDialog.vue @@ -43,7 +43,7 @@ const smsRules = [ t("The message it's too long"), ]; -const message = ref(t('routeLack')); +const message = ref(t('routeDelay')); const charactersRemaining = computed( () => MESSAGE_MAX_LENGTH - new Blob([message.value]).size, @@ -144,9 +144,10 @@ const onSubmit = async () => { max-width: 450px; } </style> + <i18n> en: - routeLack: Your order has been delayed in transit. Delivery will take place throughout the day. We apologize for the inconvenience and appreciate your patience. + routeDelay: "Your order has been delayed in transit.\nDelivery will take place throughout the day.\nWe apologize for the inconvenience and appreciate your patience." es: Message: Mensaje Send: Enviar @@ -155,5 +156,5 @@ es: The destination can't be empty: El destinatario no puede estar vacio The message can't be empty: El mensaje no puede estar vacio The message it's too long: El mensaje es demasiado largo - routeLack: Retraso en ruta. Informamos que la ruta que lleva su pedido ha sufrido un retraso y la entrega se hará a lo largo del día. Disculpe las molestias. -</i18n> + routeDelay: "Retraso en ruta.\nInformamos que la ruta que lleva su pedido ha sufrido un retraso y la entrega se hará a lo largo del día.\nDisculpe las molestias." + </i18n>