tommy/mobilizon
1
0
Fork 0
forked from potsda.mn/mobilizon
Code Pull requests Activity

Merge branch 'translate-event-datetime-icon' into 'main'

Browse source 
Use the correct locale to create the event date and time icons

Closes #1515

See merge request framasoft/mobilizon!1572
This commit is contained in:
setop 2024-07-06 16:13:01 +00:00
parent e51dfd392c 462ed5b3c7
commit 46bfe5ff54
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/Event/DateCalendarIcon.vue
View file

@ -22,7 +22,12 @@
</div> </div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { computed } from "vue"; import { computed, watch } from "vue";
import { useI18n } from "vue-i18n";
const { locale } = useI18n({ useScope: "global" });
const localeConverted = locale.replace("_", "-");
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
@ -35,15 +40,15 @@ const props = withDefaults(
const dateObj = computed<Date>(() => new Date(props.date)); const dateObj = computed<Date>(() => new Date(props.date));
const month = computed<string>(() => const month = computed<string>(() =>
dateObj.value.toLocaleString(undefined, { month: "short" }) dateObj.value.toLocaleString(localeConverted, { month: "short" })
); );
const day = computed<string>(() => const day = computed<string>(() =>
dateObj.value.toLocaleString(undefined, { day: "numeric" }) dateObj.value.toLocaleString(localeConverted, { day: "numeric" })
); );
const weekday = computed<string>(() => const weekday = computed<string>(() =>
dateObj.value.toLocaleString(undefined, { weekday: "short" }) dateObj.value.toLocaleString(localeConverted, { weekday: "short" })
); );
const smallStyle = computed<string>(() => (props.small ? "1.2" : "2")); const smallStyle = computed<string>(() => (props.small ? "1.2" : "2"));

8
src/components/Event/StartTimeIcon.vue
View file

@ -13,8 +13,14 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { computed } from "vue"; import { computed } from "vue";
import { useI18n } from "vue-i18n";
import Clock from "vue-material-design-icons/ClockTimeTenOutline.vue"; import Clock from "vue-material-design-icons/ClockTimeTenOutline.vue";
const { locale } = useI18n({ useScope: "global" });
const localeConverted = locale.replace("_", "-");
const props = withDefaults( const props = withDefaults(
defineProps<{ defineProps<{
date: string; date: string;
@ -26,7 +32,7 @@ const props = withDefaults(
const dateObj = computed<Date>(() => new Date(props.date)); const dateObj = computed<Date>(() => new Date(props.date));
const time = computed<string>(() => const time = computed<string>(() =>
dateObj.value.toLocaleTimeString(undefined, { dateObj.value.toLocaleTimeString(localeConverted, {
hour: "2-digit", hour: "2-digit",
minute: "2-digit", minute: "2-digit",
}) })