Merge pull request #355 from vuelessjs/VL_Fix-datepickers-locales_Dmy…

…tro-Holdobin VL_Fix-datepickers-locales_Dmytro-Holdobin
vuelessjs · Jan 27, 2025 · fe99fef · fe99fef
2 parents f741226 + c1b7a13
commit fe99fef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/ui.form-date-picker-range/UDatePickerRange.vue b/src/ui.form-date-picker-range/UDatePickerRange.vue
@@ -570,11 +570,16 @@ const {
 } = useUI<Config>(defaultConfig, mutatedProps);
 
 /* Merging DatePickerRange's i18n translations into Calendar's i18n translations. */
+
+/* TODO:
+   Find way to do it more explicity. 
+   It is not really clear that i18n changes datepickerCalendarAttrs now.
+*/
 watchEffect(() => {
   const calendarConfig = datepickerCalendarAttrs.value.config as unknown as UCalendarConfig;
 
   if (!calendarConfig.i18n || props.config?.i18n) {
-    calendarConfig.i18n = merge({}, calendarConfig.i18n, config.value.i18n);
+    calendarConfig.i18n = merge({}, calendarConfig.i18n, props.config.i18n);
   }
 });
 </script>

diff --git a/src/ui.form-date-picker/UDatePicker.vue b/src/ui.form-date-picker/UDatePicker.vue
@@ -266,11 +266,15 @@ const {
 } = useUI<Config>(defaultConfig, mutatedProps);
 
 /* Merging DatePicker's i18n translations into Calendar's i18n translations. */
+/* TODO:
+   Find way to do it more explicity. 
+   It is not really clear that i18n changes datepickerCalendarAttrs now.
+*/
 watchEffect(() => {
   const calendarConfig = datepickerCalendarAttrs.value.config as unknown as UCalendarConfig;
 
   if (!calendarConfig?.i18n || props.config?.i18n) {
-    calendarConfig.i18n = merge({}, calendarConfig.i18n, config.value.i18n);
+    calendarConfig.i18n = merge({}, calendarConfig.i18n, props.config.i18n);
   }
 });
 </script>