From 24ead85f8fc1b3e870684decc97ac51930cea676 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 11 Jan 2024 16:50:25 +0900 Subject: [PATCH] =?UTF-8?q?enhance(frontend):=20=EB=B9=8C=ED=8A=B8?= =?UTF-8?q?=EC=9D=B8=20=ED=85=8C=EB=A7=88=EB=A5=BC=20=EC=84=A4=EC=B9=98?= =?UTF-8?q?=ED=95=98=EB=A0=A4=EA=B3=A0=20=ED=95=A0=20=EB=95=8C=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 1 + packages/frontend/src/pages/install-extentions.vue | 7 +++++++ packages/frontend/src/pages/settings/theme.install.vue | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index 6a37a4d487..f397823c64 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -29,6 +29,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGELOG.md#2023xx) 문서를 참고하십시오. ### Client +- Enhance: 빌트인 테마를 설치하려고 할 때 오류 메시지 개선 - Fix: 장식 추가로 일부 태그를 추가할 수 없음 --- diff --git a/packages/frontend/src/pages/install-extentions.vue b/packages/frontend/src/pages/install-extentions.vue index a732fc6ef5..86bfc53a17 100644 --- a/packages/frontend/src/pages/install-extentions.vue +++ b/packages/frontend/src/pages/install-extentions.vue @@ -235,6 +235,13 @@ async function fetch() { }; } catch (err) { switch (err.message.toLowerCase()) { + case 'builtin theme': + errorKV.value = { + title: i18n.ts._externalResourceInstaller._errors._themeParseFailed.title, + description: i18n.ts._theme.alreadyInstalled, + }; + break; + case 'this theme is already installed': errorKV.value = { title: i18n.ts._externalResourceInstaller._errors._themeParseFailed.title, diff --git a/packages/frontend/src/pages/settings/theme.install.vue b/packages/frontend/src/pages/settings/theme.install.vue index f36b40235d..cabb027235 100644 --- a/packages/frontend/src/pages/settings/theme.install.vue +++ b/packages/frontend/src/pages/settings/theme.install.vue @@ -36,7 +36,15 @@ async function install(code: string): Promise { text: i18n.t('_theme.installed', { name: theme.name }), }); } catch (err) { + console.log(err.message.toLowerCase()); switch (err.message.toLowerCase()) { + case 'builtin theme': + os.alert({ + type: 'info', + text: i18n.ts._theme.alreadyInstalled, + }); + break; + case 'this theme is already installed': os.alert({ type: 'info',