Compare commits

..

No commits in common. "3b72a4c99fb587c7d5d902756226d6c7a64fe0c8" and "a7e6d2fd701d423cacdc8d1df34f6db0a6931495" have entirely different histories.

6 changed files with 10 additions and 11 deletions

View file

@ -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 }}"'

View file

@ -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 }}"'

View file

@ -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/)"

View file

@ -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<I18n> {
),
);
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<LocaleId, DeepReadonly<Locale>>;

View file

@ -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

View file

@ -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