Merge branch 'develop' into dep-update

make sure we normalise interfaceLanguage
remove line left over in conflict
2024-06-15 13:36:24 +01:00 · 2024-05-28 04:17:04 +01:00 · 2024-05-28 04:15:35 +01:00
1 changed files with 1 additions and 3 deletions
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -154,9 +154,7 @@ const PostStatusForm = {
    }
    const { postContentType: contentType, postLanguage: defaultPostLanguage, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage, alwaysShowSubjectInput } = this.$store.getters.mergedConfig
-    const postLanguage = defaultPostLanguage || interfaceLanguage
+    const postLanguage = defaultPostLanguage || interfaceToISOLanguage(interfaceLanguage)
    const isoLanguage = interfaceToISOLanguage(interfaceLanguage)
    let statusParams = {
      spoilerText: this.subject || '',
Author	SHA1	Message	Date
Floatingghost	bd263587b2	Merge branch 'develop' into dep-update All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/pr/woodpecker Pipeline was successful Details	2024-06-15 13:36:24 +01:00
Floatingghost	f3934afbd8	make sure we normalise interfaceLanguage All checks were successful ci/woodpecker/manual/woodpecker Pipeline was successful Details	2024-05-28 04:17:04 +01:00
Floatingghost	0b437ab6fd	remove line left over in conflict	2024-05-28 04:15:35 +01:00