diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bfd73778cc..6accd43476 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": { 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 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 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: