Compare commits

..

10 commits

Author SHA1 Message Date
Leon
3b72a4c99f improve: fix typo
Some checks are pending
SSH Deploy to staging / remote-update (push) Waiting to run
2026-05-06 13:48:45 -04:00
Leon
47718fec65 improve: locale parity & string brevity 2026-05-06 13:48:45 -04:00
e81081e906
Removing turbo setup command, it's already set up for deployer user
This time it SHOULD work fine???
2026-05-04 00:53:01 -04:00
0db55d0e95
Merge pull request #62 from ViossaDiskordServer/deployment-pipeline-patch-1
Deployment pipeline patch, related to "deployer" OS user and path weirdness, fingers crossed!!
2026-05-04 00:49:31 -04:00
a50c47588e
Removing npm invocation from staging file 2026-05-04 00:48:15 -04:00
bdad1d21dc
Remove npm/pnpm installation command from deploy script 2026-05-04 00:47:28 -04:00
bd5d7cca76
Update deployment script to source NVM 2026-05-04 00:45:47 -04:00
74b133afbb
Update SSH command to source NVM before staging
Pipeline update for environment variable path weirdness
2026-05-04 00:44:17 -04:00
86836dbe4a
Merge pull request #61 from ViossaDiskordServer/spanish-lang-switching
Adding Spanish locale file references to language switching logic file
2026-05-03 23:58:31 -04:00
Jezza Hehn
b61cd740c6 Adding Spanish locale file references to language switching logic file
Co-authored-by: Copilot <copilot@github.com>
2026-05-03 23:57:20 -04:00
6 changed files with 11 additions and 10 deletions

View file

@ -17,4 +17,4 @@ jobs:
- name: SSH and run deployment script - name: SSH and run deployment script
run: | run: |
ssh -i ~/.ssh/id_ed25519 ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} \ 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 }}"'

View file

@ -20,4 +20,4 @@ jobs:
- name: SSH and run staging script - name: SSH and run staging script
run: | run: |
ssh -i ~/.ssh/id_ed25519 ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} \ 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 }}"'

View file

@ -20,7 +20,7 @@ resources-resources-discord-buttons-join-label = "Join"
resources-resources-discord-buttons-rules-label = "Rules" resources-resources-discord-buttons-rules-label = "Rules"
resources-images-discordLogo-alt = "Discord logo" resources-images-discordLogo-alt = "Discord logo"
kotoba-title = "Tropos-agnostic search" 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-title = "Discord Server Rules"
discord-rulesPage-overview-title = "Overview" discord-rulesPage-overview-title = "Overview"
discord-rulesPage-overview-help = "Click any rule to see details." 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" "- express intent or desire to harm yourself or others"
"- solicit help in stopping yourself from harming yourself or someone else" "- 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." "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/)"

View file

@ -9,13 +9,14 @@ import { useLocalStorage } from "@vueuse/core";
import { computed, type DeepReadonly } from "vue"; import { computed, type DeepReadonly } from "vue";
import { type } from "arktype"; import { type } from "arktype";
import enUsFtlSrc from "@/assets/locale/en_US.ftl"; 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 vpVlFtlSrc from "@/assets/locale/vp_VL.ftl";
import wpVlFtlSrc from "@/assets/locale/wp_VL.ftl"; import wpVlFtlSrc from "@/assets/locale/wp_VL.ftl";
import type { FluentBundle } from "@fluent/bundle"; import type { FluentBundle } from "@fluent/bundle";
import { compileLocale } from "@/vi18n-lib/compile"; import { compileLocale } from "@/vi18n-lib/compile";
import type { ComputedRef } from "vue"; 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 type LocaleId = typeof LocaleId.infer;
export const LocaleId = type.enumerated(...LOCALE_IDS); export const LocaleId = type.enumerated(...LOCALE_IDS);
@ -168,13 +169,15 @@ async function initI18n(): Promise<I18n> {
), ),
); );
const [vpVl, wpVl] = await Promise.all([ const [esLa, vpVl, wpVl] = await Promise.all([
doItAllForLocale("es-LA", esLaFtlSrc),
doItAllForLocale("vp-VL", vpVlFtlSrc), doItAllForLocale("vp-VL", vpVlFtlSrc),
doItAllForLocale("wp-VL", wpVlFtlSrc), doItAllForLocale("wp-VL", wpVlFtlSrc),
]); ]);
const localeIdToLocale = { const localeIdToLocale = {
"en-US": deepReadonly(defaultLocale), "en-US": deepReadonly(defaultLocale),
"es-LA": esLa,
"vp-VL": vpVl, "vp-VL": vpVl,
"wp-VL": wpVl, "wp-VL": wpVl,
} as const satisfies Record<LocaleId, DeepReadonly<Locale>>; } as const satisfies Record<LocaleId, DeepReadonly<Locale>>;

View file

@ -11,7 +11,6 @@ STATIC_DIR=$2
BACKEND_DIR=$3 BACKEND_DIR=$3
pwd pwd
npm i -g pnpm && pnpm setup
pnpm i -g pm2 pnpm i -g pm2
cd $SOURCE_DIR cd $SOURCE_DIR
pnpm i pnpm i

View file

@ -11,6 +11,5 @@ SOURCE_DIR=$1
cd "$SOURCE_DIR" cd "$SOURCE_DIR"
git fetch --all && git branch "backup-$(date +'%s')" 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 && pnpm i && turbo build