Merge branch 'honi-dev' of github.com:ThinaticSystem/honisskey into honi-dev

This commit is contained in:
ThinaticSystem 2022-04-05 04:50:19 +09:00
commit 3c73d602df
2 changed files with 10 additions and 3 deletions

View File

@ -26,8 +26,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

View File

@ -76,8 +76,13 @@ const tick = () => {
const ny = now.getFullYear();
year.value = ny;
month.value = nm + 1;
day.value = nd;
if (nd === 1 && nm + 1 === 4) { //
month.value = 3;
day.value = 32;
} else { //
month.value = nm + 1;
day.value = nd;
}
weekDay.value = [
i18n.ts._weekday.sunday,
i18n.ts._weekday.monday,