From 68ab056b3c9e58b18f18591de3ef21d0d2a16294 Mon Sep 17 00:00:00 2001 From: Khsmty Date: Sun, 5 Mar 2023 01:47:08 +0000 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20pnpm=20=E3=81=8C=20command=20not=20f?= =?UTF-8?q?ound=20=E3=81=AB=E3=81=AA=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/devcontainer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 59d3959462..9d970e9bcb 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,6 +3,9 @@ "dockerComposeFile": "docker-compose.yml", "service": "app", "workspaceFolder": "/workspace", + "features": { + "ghcr.io/devcontainers-contrib/features/pnpm:2": {} + }, "forwardPorts": [3000], "postCreateCommand": "sudo chmod 755 .devcontainer/init.sh && .devcontainer/init.sh", "customizations": { From d53a177e7b31a41e3c938b6988ae11e326018c52 Mon Sep 17 00:00:00 2001 From: Ry0taK <49341894+Ry0taK@users.noreply.github.com> Date: Sun, 5 Mar 2023 12:48:27 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20macOS=E4=B8=8A=E3=81=A7DevContainer?= =?UTF-8?q?=E3=81=8C=E5=8B=95=E4=BD=9C=E3=81=97=E3=81=AA=E3=81=84=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/docker-compose.yml | 2 +- .devcontainer/init.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 6ec3c86a4a..8f8c5a13ab 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -16,7 +16,7 @@ services: - external_network redis: - restart: always + restart: unless-stopped image: redis:7-alpine networks: - internal_network diff --git a/.devcontainer/init.sh b/.devcontainer/init.sh index 450c3920c3..bcad3e6d85 100755 --- a/.devcontainer/init.sh +++ b/.devcontainer/init.sh @@ -4,6 +4,7 @@ set -xe sudo chown -R node /workspace git submodule update --init +pnpm config set store-dir /home/node/.local/share/pnpm/store pnpm install --frozen-lockfile cp .devcontainer/devcontainer.yml .config/default.yml pnpm build From f5b63d828709cd5a629489341b69a5a0a4028a32 Mon Sep 17 00:00:00 2001 From: Ry0taK <49341894+Ry0taK@users.noreply.github.com> Date: Sun, 5 Mar 2023 14:40:41 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20Jest=E3=81=AE=E8=87=AA=E5=8B=95?= =?UTF-8?q?=E5=AE=9F=E8=A1=8C=E3=82=92=E7=84=A1=E5=8A=B9=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 6a0497946d..baffbe18ec 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,5 +5,6 @@ "typescript.tsdk": "node_modules/typescript/lib", "files.associations": { "*.test.ts": "typescript" - } + }, + "jest.autoRun": "off" } \ No newline at end of file From b4835c7e01db0004f43381c334ed83ff4da09f34 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 5 Mar 2023 19:37:26 +0900 Subject: [PATCH 4/4] New Crowdin updates (#10214) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Japanese, Kansai) --- locales/de-DE.yml | 1 + locales/en-US.yml | 1 + locales/ja-KS.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 80e25cd0cd..eae9389acb 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -958,6 +958,7 @@ disableFederationWarn: "Dies deaktiviert Föderation, aber alle Notizen bleiben, invitationRequiredToRegister: "Diese Instanz ist einladungsbasiert. Du musst einen validen Einladungscode eingeben, um dich zu registrieren." emailNotSupported: "Diese Instanz unterstützt das Versenden von Emails nicht" postToTheChannel: "In Kanal senden" +cannotBeChangedLater: "Kann später nicht mehr geändert werden." _achievements: earnedAt: "Freigeschaltet am" _types: diff --git a/locales/en-US.yml b/locales/en-US.yml index 27ab66e23e..53a30c741e 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -958,6 +958,7 @@ disableFederationWarn: "This will disable federation, but posts will continue to invitationRequiredToRegister: "This instance is invite-only. You must enter a valid invite code sign up." emailNotSupported: "This instance does not support sending emails" postToTheChannel: "Post to channel" +cannotBeChangedLater: "This cannot be changed later." _achievements: earnedAt: "Unlocked at" _types: diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index 3add0a9863..081457c2ff 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -958,6 +958,7 @@ disableFederationWarn: "連合が無効になっとるで。無効にしても invitationRequiredToRegister: "今このサーバー招待制になってもうてんねん。招待コードを持っとるんやったら登録できるで。" emailNotSupported: "このサーバーはメール配信がサポートされてへんみたいやわ" postToTheChannel: "チャンネルに投稿" +cannotBeChangedLater: "後からは変えられへんで。" _achievements: earnedAt: "貰った日ぃ" _types: