From eeb97d1509d56732f8b301018a316e4f1913f128 Mon Sep 17 00:00:00 2001 From: ThinaticSystem Date: Fri, 1 Apr 2022 02:29:21 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E2=98=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/client/src/widgets/calendar.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/client/src/widgets/calendar.vue b/packages/client/src/widgets/calendar.vue index c6a69b3fb..f5cee5355 100644 --- a/packages/client/src/widgets/calendar.vue +++ b/packages/client/src/widgets/calendar.vue @@ -76,8 +76,13 @@ const tick = () => { const ny = now.getFullYear(); year.value = ny; - month.value = nm + 1; - day.value = nd; + if (nm + 1 === 4 && nd === 1) { // エイプリルフール + month.value = 3; + day.value = 32; + } else { // 通常 + month.value = nm + 1; + day.value = nd; + } weekDay.value = [ i18n.ts._weekday.sunday, i18n.ts._weekday.monday, From e5b3ccc97b52696461e62ae16b621f2186385dee Mon Sep 17 00:00:00 2001 From: ThinaticSystem Date: Fri, 1 Apr 2022 17:06:08 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=A8=E3=82=A4=E3=83=97=E3=83=AA?= =?UTF-8?q?=E3=83=AB=E3=83=95=E3=83=BC=E3=83=AB=E3=81=AE=E5=BC=8F=E8=A9=95?= =?UTF-8?q?=E4=BE=A1=E3=82=92=E9=AB=98=E9=80=9F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/client/src/widgets/calendar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/widgets/calendar.vue b/packages/client/src/widgets/calendar.vue index f5cee5355..e0b82bb13 100644 --- a/packages/client/src/widgets/calendar.vue +++ b/packages/client/src/widgets/calendar.vue @@ -76,7 +76,7 @@ const tick = () => { const ny = now.getFullYear(); year.value = ny; - if (nm + 1 === 4 && nd === 1) { // エイプリルフール + if (nd === 1 && nm + 1 === 4) { // エイプリルフール month.value = 3; day.value = 32; } else { // 通常 From e07304067e8d4695c20978c6479fc0e18c184de0 Mon Sep 17 00:00:00 2001 From: ThinaticSystem Date: Fri, 1 Apr 2022 17:28:55 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E2=98=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6e0f500be..63c11138c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,8 +23,10 @@ Also, when you start implementation, assign yourself to the Issue (if you cannot ## Well-known branches - **`master`** branch is tracking the latest release and used for production purposes. -- **`develop`** branch is where we work for the next release. +- **`honi-dev`** branch is where we work for the next release. - When you create a PR, basically target it to this branch. +- **`develop`** branch is where original misskey team work for the next release. + - You **must not** target your PR to this branch. - **`l10n_develop`** branch is reserved for localization management. ## Creating a PR