diff --git a/.github/workflows/ssh-deploy.yml b/.github/workflows/ssh-deploy.yml index 3ab9425..8300549 100644 --- a/.github/workflows/ssh-deploy.yml +++ b/.github/workflows/ssh-deploy.yml @@ -17,4 +17,4 @@ jobs: - name: SSH and run deployment script run: | ssh -i ~/.ssh/id_ed25519 ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} \ - 'source ~/.nvm/nvm.sh && sh "${{ secrets.SOURCE_PATH }}"/deploy.sh "${{ secrets.SOURCE_PATH }}" "${{ secrets.STATIC_PATH }}" "${{ secrets.BACKEND_PATH }}"' + 'source ~/.bashrc && sh "${{ secrets.SOURCE_PATH }}"/deploy.sh "${{ secrets.SOURCE_PATH }}" "${{ secrets.STATIC_PATH }}" "${{ secrets.BACKEND_PATH }}"' diff --git a/.github/workflows/ssh-stage.yml b/.github/workflows/ssh-stage.yml index 7fe1988..4ed8cb8 100644 --- a/.github/workflows/ssh-stage.yml +++ b/.github/workflows/ssh-stage.yml @@ -20,4 +20,4 @@ jobs: - name: SSH and run staging script run: | ssh -i ~/.ssh/id_ed25519 ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} \ - 'source ~/.nvm/nvm.sh && sh "${{ secrets.SOURCE_PATH }}"/stage.sh "${{ secrets.SOURCE_PATH }}"' + 'source ~/.bashrc && sh "${{ secrets.SOURCE_PATH }}"/stage.sh "${{ secrets.SOURCE_PATH }}"' diff --git a/apps/vdn-static/src/assets/locale/en_US.ftl b/apps/vdn-static/src/assets/locale/en_US.ftl index 67909e3..f3c2953 100644 --- a/apps/vdn-static/src/assets/locale/en_US.ftl +++ b/apps/vdn-static/src/assets/locale/en_US.ftl @@ -20,7 +20,7 @@ resources-resources-discord-buttons-join-label = "Join" resources-resources-discord-buttons-rules-label = "Rules" resources-images-discordLogo-alt = "Discord logo" kotoba-title = "Tropos-agnostic search" -kotoba-searchHelp = "To search tropos-agnostically, enter a term below." +kotoba-searchHelp = "To searcn tropos-agnostically, enter a term below." discord-rulesPage-title = "Discord Server Rules" discord-rulesPage-overview-title = "Overview" discord-rulesPage-overview-help = "Click any rule to see details." @@ -75,4 +75,4 @@ discord-rulesPage-rules-controversialTopics-section-body = md "- express intent or desire to harm yourself or others" "- solicit help in stopping yourself from harming yourself or someone else" "By crossing these boundaries, please be aware that you are asking members of the server (including moderators and the owner) to perform a role for which they are not trained or equipped. At the moderators' sole discretion, this may not be tolerated and may result in a warning, timeout, removal of the **@ike** role, or removal from the server." - "If you struggle with thoughts of this nature, but are not in immediate danger, please consider counseling. In an immediate crisis, call local emergency services or a relevant hotline: [](external.new:https://findahelpline.com/)" + "If you are struggling with thoughts of this nature, but are not immediately in danger, please consider seeking counseling. If you are experiencing an immediate crisis, please call **988** (in the United States), **999** (in the UK), or locate an emergency hotline appropriate for you. A list of resources by country exists here: [](external.new:https://blog.opencounseling.com/suicide-hotlines/)" diff --git a/apps/vdn-static/src/i18n/index.ts b/apps/vdn-static/src/i18n/index.ts index 23e5e4f..f3906d3 100644 --- a/apps/vdn-static/src/i18n/index.ts +++ b/apps/vdn-static/src/i18n/index.ts @@ -9,14 +9,13 @@ import { useLocalStorage } from "@vueuse/core"; import { computed, type DeepReadonly } from "vue"; import { type } from "arktype"; import enUsFtlSrc from "@/assets/locale/en_US.ftl"; -import esLaFtlSrc from "@/assets/locale/es_LA.ftl"; import vpVlFtlSrc from "@/assets/locale/vp_VL.ftl"; import wpVlFtlSrc from "@/assets/locale/wp_VL.ftl"; import type { FluentBundle } from "@fluent/bundle"; import { compileLocale } from "@/vi18n-lib/compile"; import type { ComputedRef } from "vue"; -export const LOCALE_IDS = ["en-US", "es-LA", "vp-VL", "wp-VL"] as const; +export const LOCALE_IDS = ["en-US", "vp-VL", "wp-VL"] as const; export type LocaleId = typeof LocaleId.infer; export const LocaleId = type.enumerated(...LOCALE_IDS); @@ -169,15 +168,13 @@ async function initI18n(): Promise { ), ); - const [esLa, vpVl, wpVl] = await Promise.all([ - doItAllForLocale("es-LA", esLaFtlSrc), + const [vpVl, wpVl] = await Promise.all([ doItAllForLocale("vp-VL", vpVlFtlSrc), doItAllForLocale("wp-VL", wpVlFtlSrc), ]); const localeIdToLocale = { "en-US": deepReadonly(defaultLocale), - "es-LA": esLa, "vp-VL": vpVl, "wp-VL": wpVl, } as const satisfies Record>; diff --git a/deploy.sh b/deploy.sh index 6581561..c18d868 100755 --- a/deploy.sh +++ b/deploy.sh @@ -11,6 +11,7 @@ STATIC_DIR=$2 BACKEND_DIR=$3 pwd +npm i -g pnpm && pnpm setup pnpm i -g pm2 cd $SOURCE_DIR pnpm i @@ -22,4 +23,4 @@ cp -r $SOURCE_DIR/apps/vdn-static/dist/* "$STATIC_DIR" cp -r $SOURCE_DIR/apps/vdb-backend/dist/* "$BACKEND_DIR" cd $BACKEND_DIR -pm2 start . +pm2 start . \ No newline at end of file diff --git a/stage.sh b/stage.sh index b1f5791..153b53a 100755 --- a/stage.sh +++ b/stage.sh @@ -11,5 +11,6 @@ SOURCE_DIR=$1 cd "$SOURCE_DIR" git fetch --all && git branch "backup-$(date +'%s')" -git checkout -f origin/main \ +npm i -g pnpm && pnpm setup && pnpm i -g turbo \ + && git checkout -f origin/main \ && pnpm i && turbo build