potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

merge-upstream-5.0.1 #66

Merged
778a69cd merged 80 commits from merge-upstream-5.0.1 into main 2024-12-26 12:55:41 +01:00
Conversation 0 Commits 80 Files changed 68 +62 -31
1 changed files with 62 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0fa7a20414 - Show all commits

93
src/components/Event/EventFullDate.vue
View file

@ -12,35 +12,47 @@
{{ singleTimeZone }} {{ singleTimeZone }}
</o-switch> </o-switch>
</p> </p>
<p v-else-if="isSameDay() && showStartTime && showEndTime"> <!-- endsOn is set and isSameDay() -->
<span>{{ <template v-else-if="isSameDay()">
t("On {date} from {startTime} to {endTime}", { <p v-if="showStartTime && showEndTime">
date: formatDate(beginsOn), <span>{{
startTime: formatTime(beginsOn, timezoneToShow), t("On {date} from {startTime} to {endTime}", {
endTime: formatTime(endsOn, timezoneToShow), date: formatDate(beginsOn),
}) startTime: formatTime(beginsOn, timezoneToShow),
}}</span> endTime: formatTime(endsOn, timezoneToShow),
<br /> })
<o-switch }}</span>
size="small" <br />
v-model="showLocalTimezone" <o-switch
v-if="differentFromUserTimezone" size="small"
> v-model="showLocalTimezone"
{{ singleTimeZone }} v-if="differentFromUserTimezone"
</o-switch> >
</p> {{ singleTimeZone }}
<p v-else-if="isSameDay() && showStartTime && !showEndTime"> </o-switch>
{{ </p>
t("On {date} starting at {startTime}", { <p v-else-if="showStartTime && !showEndTime">
date: formatDate(beginsOn), {{
startTime: formatTime(beginsOn, timezoneToShow), t("On {date} starting at {startTime}", {
}) date: formatDate(beginsOn),
}} startTime: formatTime(beginsOn, timezoneToShow),
</p> })
<p v-else-if="isSameDay()"> }}
{{ t("On {date}", { date: formatDate(beginsOn) }) }} </p>
</p> <p v-else-if="!showStartTime && showEndTime">
<p v-else-if="endsOn && showStartTime && showEndTime"> {{
t("On {date} ending at {endTime}", {
date: formatDate(beginsOn),
endTime: formatTime(endsOn, timezoneToShow),
})
}}
</p>
<p v-else>
{{ t("On {date}", { date: formatDate(beginsOn) }) }}
</p>
</template>
<!-- endsOn is set and !isSameDay() -->
<p v-else-if="showStartTime && showEndTime">
<span> <span>
{{ {{
t("From the {startDate} at {startTime} to the {endDate} at {endTime}", { t("From the {startDate} at {startTime} to the {endDate} at {endTime}", {
@ -60,7 +72,7 @@
{{ multipleTimeZones }} {{ multipleTimeZones }}
</o-switch> </o-switch>
</p> </p>
<p v-else-if="endsOn && showStartTime"> <p v-else-if="showStartTime && !showEndTime">
<span> <span>
{{ {{
t("From the {startDate} at {startTime} to the {endDate}", { t("From the {startDate} at {startTime} to the {endDate}", {
@ -79,7 +91,26 @@
{{ singleTimeZone }} {{ singleTimeZone }}
</o-switch> </o-switch>
</p> </p>
<p v-else-if="endsOn"> <p v-else-if="!showStartTime && showEndTime">
<span>
{{
t("From the {startDate} to the {endDate} at {endTime}", {
startDate: formatDate(beginsOn),
endDate: formatDate(endsOn),
endTime: formatTime(endsOn, timezoneToShow),
})
}}
</span>
<br />
<o-switch
size="small"
v-model="showLocalTimezone"
v-if="differentFromUserTimezone"
>
{{ singleTimeZone }}
</o-switch>
</p>
<p v-else>
{{ {{
t("From the {startDate} to the {endDate}", { t("From the {startDate} to the {endDate}", {
startDate: formatDate(beginsOn), startDate: formatDate(beginsOn),