From 853f9dca31edb4b39178754d024d3f4dd5b204e0 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 7 May 2023 20:33:13 +0900
Subject: [PATCH 1/4] :art:
---
packages/frontend/src/pages/settings/migration.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/frontend/src/pages/settings/migration.vue b/packages/frontend/src/pages/settings/migration.vue
index 277f9f5387..541992875e 100644
--- a/packages/frontend/src/pages/settings/migration.vue
+++ b/packages/frontend/src/pages/settings/migration.vue
@@ -9,7 +9,7 @@
<template #caption>{{ i18n.ts._accountMigration.moveFromSub }}</template>
<div class="_gaps_m">
- <FormInfo warn>
+ <FormInfo>
{{ i18n.ts._accountMigration.moveFromDescription }}
</FormInfo>
<div>
From f82810cf1ba14c4718429bca2c0bf033012629c9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 7 May 2023 20:48:46 +0900
Subject: [PATCH 2/4] =?UTF-8?q?chore(frontend):=20=E3=82=AF=E3=83=A9?=
=?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E3=81=AE=E5=85=A8=E8=88=AC?=
=?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
locales/ja-JP.yml | 1 +
.../frontend/src/pages/settings/general.vue | 31 ++++++++++++-------
2 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 402eeac16e..b87f4d9cb4 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1035,6 +1035,7 @@ archive: "アーカイブ"
channelArchiveConfirmTitle: "{name}をアーカイブしますか？"
channelArchiveConfirmDescription: "アーカイブすると、チャンネル一覧や検索結果に表示されなくなり、新たな書き込みもできなくなります。"
thisChannelArchived: "このチャンネルはアーカイブされています。"
+displayOfNote: "ノートの表示"
_serverRules:
description: "新規登録前に表示する、サーバーの簡潔なルールを設定します。内容は利用規約の要約とすることを推奨します。"
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 0a53ed2c8d..be9ed0141a 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -42,7 +42,7 @@
</FormSection>
<FormSection>
- <template #label>{{ i18n.ts.appearance }}</template>
+ <template #label>{{ i18n.ts.displayOfNote }}</template>
<div class="_gaps_m">
<div class="_gaps_s">
@@ -52,11 +52,28 @@
<MkSwitch v-model="collapseRenotes">{{ i18n.ts.collapseRenotes }}</MkSwitch>
<MkSwitch v-model="advancedMfm">{{ i18n.ts.enableAdvancedMfm }}</MkSwitch>
<MkSwitch v-if="advancedMfm" v-model="animatedMfm">{{ i18n.ts.enableAnimatedMfm }}</MkSwitch>
+ <MkSwitch v-model="showGapBetweenNotesInTimeline">{{ i18n.ts.showGapBetweenNotesInTimeline }}</MkSwitch>
+ <MkSwitch v-model="loadRawImages">{{ i18n.ts.loadRawImages }}</MkSwitch>
+ </div>
+
+ <MkRadios v-model="mediaListWithOneImageAppearance">
+ <template #label>{{ i18n.ts.mediaListWithOneImageAppearance }}</template>
+ <option value="expand">{{ i18n.ts.default }}</option>
+ <option value="16_9">{{ i18n.t('limitTo', { x: '16:9' }) }}</option>
+ <option value="1_1">{{ i18n.t('limitTo', { x: '1:1' }) }}</option>
+ <option value="2_3">{{ i18n.t('limitTo', { x: '2:3' }) }}</option>
+ </MkRadios>
+ </div>
+ </FormSection>
+
+ <FormSection>
+ <template #label>{{ i18n.ts.appearance }}</template>
+
+ <div class="_gaps_m">
+ <div class="_gaps_s">
<MkSwitch v-model="reduceAnimation">{{ i18n.ts.reduceUiAnimation }}</MkSwitch>
<MkSwitch v-model="useBlurEffect">{{ i18n.ts.useBlurEffect }}</MkSwitch>
<MkSwitch v-model="useBlurEffectForModal">{{ i18n.ts.useBlurEffectForModal }}</MkSwitch>
- <MkSwitch v-model="showGapBetweenNotesInTimeline">{{ i18n.ts.showGapBetweenNotesInTimeline }}</MkSwitch>
- <MkSwitch v-model="loadRawImages">{{ i18n.ts.loadRawImages }}</MkSwitch>
<MkSwitch v-model="disableShowingAnimatedImages">{{ i18n.ts.disableShowingAnimatedImages }}</MkSwitch>
<MkSwitch v-model="squareAvatars">{{ i18n.ts.squareAvatars }}</MkSwitch>
<MkSwitch v-model="useSystemFont">{{ i18n.ts.useSystemFont }}</MkSwitch>
@@ -81,14 +98,6 @@
<option value="2"><span style="font-size: 16px;">Aa</span></option>
<option value="3"><span style="font-size: 17px;">Aa</span></option>
</MkRadios>
-
- <MkRadios v-model="mediaListWithOneImageAppearance">
- <template #label>{{ i18n.ts.mediaListWithOneImageAppearance }}</template>
- <option value="expand">{{ i18n.ts.default }}</option>
- <option value="16_9">{{ i18n.t('limitTo', { x: '16:9' }) }}</option>
- <option value="1_1">{{ i18n.t('limitTo', { x: '1:1' }) }}</option>
- <option value="2_3">{{ i18n.t('limitTo', { x: '2:3' }) }}</option>
- </MkRadios>
</div>
</FormSection>
From 63a0b7353ad0b072f441f6485e48a2499b1a048a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 7 May 2023 20:56:46 +0900
Subject: [PATCH 3/4] =?UTF-8?q?chore(frontend):=20=E3=82=AF=E3=83=A9?=
=?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E3=81=AE=E5=85=A8=E8=88=AC?=
=?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../frontend/src/pages/settings/general.vue | 75 ++++++++++---------
1 file changed, 39 insertions(+), 36 deletions(-)
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index be9ed0141a..88b5690f32 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -20,24 +20,10 @@
<option value="desktop"><i class="ti ti-device-desktop"/> {{ i18n.ts.desktop }}</option>
</MkRadios>
- <MkSwitch v-model="showFixedPostForm">{{ i18n.ts.showFixedPostForm }}</MkSwitch>
- <MkSwitch v-model="showFixedPostFormInChannel">{{ i18n.ts.showFixedPostFormInChannel }}</MkSwitch>
-
<FormSection>
- <template #label>{{ i18n.ts.behavior }}</template>
-
- <div class="_gaps_m">
- <div class="_gaps_s">
- <MkSwitch v-model="imageNewTab">{{ i18n.ts.openImageInNewTab }}</MkSwitch>
- <MkSwitch v-model="enableInfiniteScroll">{{ i18n.ts.enableInfiniteScroll }}</MkSwitch>
- <MkSwitch v-model="useReactionPickerForContextMenu">{{ i18n.ts.useReactionPickerForContextMenu }}</MkSwitch>
- </div>
- <MkSelect v-model="serverDisconnectedBehavior">
- <template #label>{{ i18n.ts.whenServerDisconnected }}</template>
- <option value="reload">{{ i18n.ts._serverDisconnectedBehavior.reload }}</option>
- <option value="dialog">{{ i18n.ts._serverDisconnectedBehavior.dialog }}</option>
- <option value="quiet">{{ i18n.ts._serverDisconnectedBehavior.quiet }}</option>
- </MkSelect>
+ <div class="_gaps_s">
+ <MkSwitch v-model="showFixedPostForm">{{ i18n.ts.showFixedPostForm }}</MkSwitch>
+ <MkSwitch v-model="showFixedPostFormInChannel">{{ i18n.ts.showFixedPostFormInChannel }}</MkSwitch>
</div>
</FormSection>
@@ -56,6 +42,20 @@
<MkSwitch v-model="loadRawImages">{{ i18n.ts.loadRawImages }}</MkSwitch>
</div>
+ <MkSelect v-model="instanceTicker">
+ <template #label>{{ i18n.ts.instanceTicker }}</template>
+ <option value="none">{{ i18n.ts._instanceTicker.none }}</option>
+ <option value="remote">{{ i18n.ts._instanceTicker.remote }}</option>
+ <option value="always">{{ i18n.ts._instanceTicker.always }}</option>
+ </MkSelect>
+
+ <MkSelect v-model="nsfw">
+ <template #label>{{ i18n.ts.nsfw }}</template>
+ <option value="respect">{{ i18n.ts._nsfw.respect }}</option>
+ <option value="ignore">{{ i18n.ts._nsfw.ignore }}</option>
+ <option value="force">{{ i18n.ts._nsfw.force }}</option>
+ </MkSelect>
+
<MkRadios v-model="mediaListWithOneImageAppearance">
<template #label>{{ i18n.ts.mediaListWithOneImageAppearance }}</template>
<option value="expand">{{ i18n.ts.default }}</option>
@@ -122,27 +122,30 @@
</FormSection>
<FormSection>
- <MkSwitch v-model="aiChanMode">{{ i18n.ts.aiChanMode }}</MkSwitch>
+ <template #label>{{ i18n.ts.behavior }}</template>
+
+ <div class="_gaps_m">
+ <div class="_gaps_s">
+ <MkSwitch v-model="imageNewTab">{{ i18n.ts.openImageInNewTab }}</MkSwitch>
+ <MkSwitch v-model="enableInfiniteScroll">{{ i18n.ts.enableInfiniteScroll }}</MkSwitch>
+ <MkSwitch v-model="useReactionPickerForContextMenu">{{ i18n.ts.useReactionPickerForContextMenu }}</MkSwitch>
+ </div>
+ <MkSelect v-model="serverDisconnectedBehavior">
+ <template #label>{{ i18n.ts.whenServerDisconnected }}</template>
+ <option value="reload">{{ i18n.ts._serverDisconnectedBehavior.reload }}</option>
+ <option value="dialog">{{ i18n.ts._serverDisconnectedBehavior.dialog }}</option>
+ <option value="quiet">{{ i18n.ts._serverDisconnectedBehavior.quiet }}</option>
+ </MkSelect>
+ <MkRange v-model="numberOfPageCache" :min="1" :max="10" :step="1" easing>
+ <template #label>{{ i18n.ts.numberOfPageCache }}</template>
+ <template #caption>{{ i18n.ts.numberOfPageCacheDescription }}</template>
+ </MkRange>
+ </div>
</FormSection>
- <MkSelect v-model="instanceTicker">
- <template #label>{{ i18n.ts.instanceTicker }}</template>
- <option value="none">{{ i18n.ts._instanceTicker.none }}</option>
- <option value="remote">{{ i18n.ts._instanceTicker.remote }}</option>
- <option value="always">{{ i18n.ts._instanceTicker.always }}</option>
- </MkSelect>
-
- <MkSelect v-model="nsfw">
- <template #label>{{ i18n.ts.nsfw }}</template>
- <option value="respect">{{ i18n.ts._nsfw.respect }}</option>
- <option value="ignore">{{ i18n.ts._nsfw.ignore }}</option>
- <option value="force">{{ i18n.ts._nsfw.force }}</option>
- </MkSelect>
-
- <MkRange v-model="numberOfPageCache" :min="1" :max="10" :step="1" easing>
- <template #label>{{ i18n.ts.numberOfPageCache }}</template>
- <template #caption>{{ i18n.ts.numberOfPageCacheDescription }}</template>
- </MkRange>
+ <FormSection>
+ <MkSwitch v-model="aiChanMode">{{ i18n.ts.aiChanMode }}</MkSwitch>
+ </FormSection>
<FormLink to="/settings/deck">{{ i18n.ts.deck }}</FormLink>
From 7d1dde0f0476ebfe7ac1311cffeb5ffc897d9e57 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 7 May 2023 20:59:29 +0900
Subject: [PATCH 4/4] =?UTF-8?q?chore(frontend):=20=E3=82=AF=E3=83=A9?=
=?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E3=81=AE=E5=85=A8=E8=88=AC?=
=?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../frontend/src/pages/settings/general.vue | 42 +++++++++----------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 88b5690f32..7c1522e059 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -40,6 +40,7 @@
<MkSwitch v-if="advancedMfm" v-model="animatedMfm">{{ i18n.ts.enableAnimatedMfm }}</MkSwitch>
<MkSwitch v-model="showGapBetweenNotesInTimeline">{{ i18n.ts.showGapBetweenNotesInTimeline }}</MkSwitch>
<MkSwitch v-model="loadRawImages">{{ i18n.ts.loadRawImages }}</MkSwitch>
+ <MkSwitch v-model="useReactionPickerForContextMenu">{{ i18n.ts.useReactionPickerForContextMenu }}</MkSwitch>
</div>
<MkSelect v-model="instanceTicker">
@@ -66,6 +67,26 @@
</div>
</FormSection>
+ <FormSection>
+ <template #label>{{ i18n.ts.notificationDisplay }}</template>
+
+ <div class="_gaps_m">
+ <MkRadios v-model="notificationPosition">
+ <template #label>{{ i18n.ts.position }}</template>
+ <option value="leftTop"><i class="ti ti-align-box-left-top"></i> {{ i18n.ts.leftTop }}</option>
+ <option value="rightTop"><i class="ti ti-align-box-right-top"></i> {{ i18n.ts.rightTop }}</option>
+ <option value="leftBottom"><i class="ti ti-align-box-left-bottom"></i> {{ i18n.ts.leftBottom }}</option>
+ <option value="rightBottom"><i class="ti ti-align-box-right-bottom"></i> {{ i18n.ts.rightBottom }}</option>
+ </MkRadios>
+
+ <MkRadios v-model="notificationStackAxis">
+ <template #label>{{ i18n.ts.stackAxis }}</template>
+ <option value="vertical"><i class="ti ti-carousel-vertical"></i> {{ i18n.ts.vertical }}</option>
+ <option value="horizontal"><i class="ti ti-carousel-horizontal"></i> {{ i18n.ts.horizontal }}</option>
+ </MkRadios>
+ </div>
+ </FormSection>
+
<FormSection>
<template #label>{{ i18n.ts.appearance }}</template>
@@ -101,26 +122,6 @@
</div>
</FormSection>
- <FormSection>
- <template #label>{{ i18n.ts.notificationDisplay }}</template>
-
- <div class="_gaps_m">
- <MkRadios v-model="notificationPosition">
- <template #label>{{ i18n.ts.position }}</template>
- <option value="leftTop"><i class="ti ti-align-box-left-top"></i> {{ i18n.ts.leftTop }}</option>
- <option value="rightTop"><i class="ti ti-align-box-right-top"></i> {{ i18n.ts.rightTop }}</option>
- <option value="leftBottom"><i class="ti ti-align-box-left-bottom"></i> {{ i18n.ts.leftBottom }}</option>
- <option value="rightBottom"><i class="ti ti-align-box-right-bottom"></i> {{ i18n.ts.rightBottom }}</option>
- </MkRadios>
-
- <MkRadios v-model="notificationStackAxis">
- <template #label>{{ i18n.ts.stackAxis }}</template>
- <option value="vertical"><i class="ti ti-carousel-vertical"></i> {{ i18n.ts.vertical }}</option>
- <option value="horizontal"><i class="ti ti-carousel-horizontal"></i> {{ i18n.ts.horizontal }}</option>
- </MkRadios>
- </div>
- </FormSection>
-
<FormSection>
<template #label>{{ i18n.ts.behavior }}</template>
@@ -128,7 +129,6 @@
<div class="_gaps_s">
<MkSwitch v-model="imageNewTab">{{ i18n.ts.openImageInNewTab }}</MkSwitch>
<MkSwitch v-model="enableInfiniteScroll">{{ i18n.ts.enableInfiniteScroll }}</MkSwitch>
- <MkSwitch v-model="useReactionPickerForContextMenu">{{ i18n.ts.useReactionPickerForContextMenu }}</MkSwitch>
</div>
<MkSelect v-model="serverDisconnectedBehavior">
<template #label>{{ i18n.ts.whenServerDisconnected }}</template>