Merge pull request #4033 from nextcloud/fix/language-code-luxon

Use different formatted language code for luxon

Author: dartcafe

lib/Model/UserBase.php

@@ -167,6 +167,10 @@ public function getLanguageCode(): string {
 		return $this->languageCode;
 	}
 
+	public function getLanguageCodeIntl(): string {
+		return str_replace('_', '-', $this->languageCode);
+	}
+
 	public function getLocaleCode(): string {
 		if (!$this->localeCode) {
 			return $this->languageCode;
@@ -323,6 +327,7 @@ public function getRichUserArray(): array {
 			'isNoUser' => $this->getIsNoUser(),
 			'isUnrestrictedOwner' => $this->getIsUnrestrictedPollOwner(),
 			'languageCode' => $this->getLanguageCode(),
+			'languageCodeIntl' => $this->getLanguageCodeIntl(),
 			'localeCode' => $this->getLocaleCode(),
 			'organisation' => $this->getOrganisation(),
 			'subname' => $this->getSubName(),

src/Types/index.ts

@@ -164,6 +164,7 @@ export type User = {
 	desc: string | null
 	organisation: string | null
 	languageCode: string
+	languageCodeIntl: string
 	localeCode: string | null
 	timeZone: string | null
 	categories: string[] | null

src/components/Base/modules/DateBox.vue

@@ -16,7 +16,7 @@ const { dateTime: luxonDate, duration: luxonDuration = Duration.fromMillis(0) }
 	defineProps<Props>()
 
 const from = computed(() =>
-	luxonDate.setLocale(sessionStore.currentUser.languageCode),
+	luxonDate.setLocale(sessionStore.currentUser.languageCodeIntl),
 )
 
 const sessionStore = useSessionStore()

src/components/Export/ExportPoll.vue

@@ -212,7 +212,7 @@ function getIntervalRaw(option: Option): string {
  */
 function getFromFormatted(option: Option): string {
 	return DateTime.fromSeconds(option.timestamp)
-		.setLocale(sessionStore.currentUser.languageCode)
+		.setLocale(sessionStore.currentUser.languageCodeIntl)
 		.toLocaleString(DateTime.DATETIME_MED_WITH_WEEKDAY)
 }
 
@@ -222,7 +222,7 @@ function getFromFormatted(option: Option): string {
  */
 function getToFormatted(option: Option): string {
 	return DateTime.fromSeconds(option.timestamp)
-		.setLocale(sessionStore.currentUser.languageCode)
+		.setLocale(sessionStore.currentUser.languageCodeIntl)
 		.plus({ seconds: option.duration })
 		.toLocaleString(DateTime.DATETIME_MED_WITH_WEEKDAY)
 }

src/components/Options/OptionItemDateBox.vue

@@ -19,7 +19,7 @@ const { timeStamp, durationSeconds = 0 } = defineProps<Props>()
 
 // computed from as DateTime from Luxon
 const from = DateTime.fromSeconds(timeStamp).setLocale(
-	sessionStore.currentUser.languageCode,
+	sessionStore.currentUser.languageCodeIntl,
 )
 
 const duration = Duration.fromMillis(durationSeconds * 1000)

src/components/Options/OptionsDateAddDialog.vue

@@ -86,13 +86,13 @@ const dateTimeOptionsFiltered = computed(() => {
 // computed from as DateTime from Luxon
 const from = computed(() => {
 	const dateFrom = DateTime.fromJSDate(fromInput.value).setLocale(
-		sessionStore.currentUser.languageCode,
+		sessionStore.currentUser.languageCodeIntl,
 	)
 	// if the option is an all day option, the time is set to 00:00
 	if (allDay.value) {
 		return dateFrom
 			.startOf('day')
-			.setLocale(sessionStore.currentUser.languageCode)
+			.setLocale(sessionStore.currentUser.languageCodeIntl)
 	}
 	return dateFrom
 })