diff --git a/fittrackee_client/src/components/User/ProfileDisplay/UserInfos.vue b/fittrackee_client/src/components/User/ProfileDisplay/UserInfos.vue index 8f72521e..f8eb40d7 100644 --- a/fittrackee_client/src/components/User/ProfileDisplay/UserInfos.vue +++ b/fittrackee_client/src/components/User/ProfileDisplay/UserInfos.vue @@ -130,7 +130,8 @@ import { TAppConfig } from '@/types/application' import { IAuthUserProfile, IUserProfile } from '@/types/user' import { useStore } from '@/use/useStore' - import { formatDate } from '@/utils/dates' + import { formatDate, getDateFormat } from '@/utils/dates' + import { localeFromLanguage } from '@/utils/locales' interface Props { user: IUserProfile @@ -143,6 +144,9 @@ const store = useStore() const { user, fromAdmin } = toRefs(props) + const language: ComputedRef = computed( + () => store.getters[ROOT_STORE.GETTERS.LANGUAGE] + ) const authUser: ComputedRef = computed( () => store.getters[AUTH_USER_STORE.GETTERS.AUTH_USER_PROFILE] ) @@ -157,7 +161,11 @@ ) const birthDate = computed(() => props.user.birth_date - ? format(new Date(props.user.birth_date), authUser.value.date_format) + ? format( + new Date(props.user.birth_date), + `${getDateFormat(authUser.value.date_format, language.value)}`, + { locale: localeFromLanguage[language.value] } + ) : '' ) const isSuccess = computed( diff --git a/fittrackee_client/src/components/User/ProfileDisplay/UserPreferences.vue b/fittrackee_client/src/components/User/ProfileDisplay/UserPreferences.vue index cba7d7b3..bf2a418b 100644 --- a/fittrackee_client/src/components/User/ProfileDisplay/UserPreferences.vue +++ b/fittrackee_client/src/components/User/ProfileDisplay/UserPreferences.vue @@ -2,11 +2,11 @@
{{ $t('user.PROFILE.LANGUAGE') }}:
-
{{ language }}
+
{{ userLanguage }}
{{ $t('user.PROFILE.TIMEZONE') }}:
{{ timezone }}
{{ $t('user.PROFILE.DATE_FORMAT') }}:
-
{{ date_format }}
+
{{ getDateFormat(date_format, appLanguage) }}
{{ $t('user.PROFILE.FIRST_DAY_OF_WEEK') }}:
{{ $t(`user.PROFILE.${fistDayOfWeek}`) }}
{{ $t('user.PROFILE.UNITS.LABEL') }}:
@@ -30,9 +30,12 @@