diff --git a/.github/workflows/ssh-deploy.yml b/.github/workflows/ssh-deploy.yml index 8300549..3ab9425 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 ~/.bashrc && sh "${{ secrets.SOURCE_PATH }}"/deploy.sh "${{ secrets.SOURCE_PATH }}" "${{ secrets.STATIC_PATH }}" "${{ secrets.BACKEND_PATH }}"' + 'source ~/.nvm/nvm.sh && 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 4ed8cb8..7fe1988 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 ~/.bashrc && sh "${{ secrets.SOURCE_PATH }}"/stage.sh "${{ secrets.SOURCE_PATH }}"' + 'source ~/.nvm/nvm.sh && 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 f3c2953..67909e3 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 searcn tropos-agnostically, enter a term below." +kotoba-searchHelp = "To search 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 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/)" + "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/)" diff --git a/apps/vdn-static/src/i18n/index.ts b/apps/vdn-static/src/i18n/index.ts index f3906d3..23e5e4f 100644 --- a/apps/vdn-static/src/i18n/index.ts +++ b/apps/vdn-static/src/i18n/index.ts @@ -9,13 +9,14 @@ 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", "vp-VL", "wp-VL"] as const; +export const LOCALE_IDS = ["en-US", "es-LA", "vp-VL", "wp-VL"] as const; export type LocaleId = typeof LocaleId.infer; export const LocaleId = type.enumerated(...LOCALE_IDS); @@ -168,13 +169,15 @@ async function initI18n(): Promise { ), ); - const [vpVl, wpVl] = await Promise.all([ + const [esLa, vpVl, wpVl] = await Promise.all([ + doItAllForLocale("es-LA", esLaFtlSrc), 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 c18d868..6581561 100755 --- a/deploy.sh +++ b/deploy.sh @@ -11,7 +11,6 @@ STATIC_DIR=$2 BACKEND_DIR=$3 pwd -npm i -g pnpm && pnpm setup pnpm i -g pm2 cd $SOURCE_DIR pnpm i @@ -23,4 +22,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 . \ No newline at end of file +pm2 start . diff --git a/stage.sh b/stage.sh index 153b53a..b1f5791 100755 --- a/stage.sh +++ b/stage.sh @@ -11,6 +11,5 @@ SOURCE_DIR=$1 cd "$SOURCE_DIR" git fetch --all && git branch "backup-$(date +'%s')" -npm i -g pnpm && pnpm setup && pnpm i -g turbo \ - && git checkout -f origin/main \ +git checkout -f origin/main \ && pnpm i && turbo build