From 0b437ab6fde876d517d05a58c002ad79ad8bee3a Mon Sep 17 00:00:00 2001 From: Floatingghost Date: Tue, 28 May 2024 04:15:35 +0100 Subject: [PATCH 1/2] remove line left over in conflict --- src/components/post_status_form/post_status_form.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 3daac8a3..72fd29aa 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -156,8 +156,6 @@ const PostStatusForm = { const { postContentType: contentType, postLanguage: defaultPostLanguage, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage, alwaysShowSubjectInput } = this.$store.getters.mergedConfig const postLanguage = defaultPostLanguage || interfaceLanguage - const isoLanguage = interfaceToISOLanguage(interfaceLanguage) - let statusParams = { spoilerText: this.subject || '', status: statusText, From f3934afbd81e6c98334567a023845bf5b27c7b77 Mon Sep 17 00:00:00 2001 From: Floatingghost Date: Tue, 28 May 2024 04:17:04 +0100 Subject: [PATCH 2/2] make sure we normalise interfaceLanguage --- src/components/post_status_form/post_status_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 72fd29aa..6eee23ce 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -154,7 +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) let statusParams = { spoilerText: this.subject || '',