From d1c2c1842c9fc3df773302bca311a49b381ece00 Mon Sep 17 00:00:00 2001 From: Akis Date: Wed, 22 Jun 2022 09:57:47 +0300 Subject: [PATCH] add titles to pages --- .vscode/i18n.code-snippets | 16 +- src/i18n/common.json | 100 +++++----- src/i18n/nb.json | 44 ++--- src/lib/Content.svelte | 30 --- src/lib/Footer.svelte | 4 +- src/lib/Nav.svelte | 12 +- src/lib/translations.js | 38 ++-- src/routes/__layout.svelte | 67 ++++--- src/routes/contact.svelte | 188 +++++++++++-------- src/routes/donate.svelte | 63 ++++--- src/routes/faq.md | 27 --- src/routes/index.svelte | 32 +++- src/routes/minecraft/client-side-mods.svelte | 38 +++- src/routes/minecraft/index.svelte | 89 +++++---- svelte.config.js | 3 +- 15 files changed, 399 insertions(+), 352 deletions(-) delete mode 100644 src/lib/Content.svelte delete mode 100644 src/routes/faq.md diff --git a/.vscode/i18n.code-snippets b/.vscode/i18n.code-snippets index 91d567f..1255ee7 100644 --- a/.vscode/i18n.code-snippets +++ b/.vscode/i18n.code-snippets @@ -1,9 +1,9 @@ { - // Place your ProjectSegfaultWebsite workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and - // description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope - // is left empty or omitted, the snippet gets applied to all languages. The prefix is what is - // used to trigger the snippet and the body will be expanded and inserted. Possible variables are: - // $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. + // Place your ProjectSegfaultWebsite workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and + // description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope + // is left empty or omitted, the snippet gets applied to all languages. The prefix is what is + // used to trigger the snippet and the body will be expanded and inserted. Possible variables are: + // $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. // Placeholders with the same ids are connected. // Example: // "Print to console": { @@ -18,9 +18,7 @@ "i18n": { "scope": "svelte", "prefix": "i18n", - "body": [ - "{\\$t('common.$1')}" - ], + "body": ["{\\$t('common.$1')}"], "description": "i18n Snippet for Project Segfault's website" } -} \ No newline at end of file +} diff --git a/src/i18n/common.json b/src/i18n/common.json index 6afeecc..418ba2d 100644 --- a/src/i18n/common.json +++ b/src/i18n/common.json @@ -1,51 +1,51 @@ { - "NAVBAR_INSTANCES": "Instances & Gameservers", - "NAVBAR_DONATE": "Donate", - "NAVBAR_FAQ": "FAQ", - "NAVBAR_CONTACT": "Contact", - "NAVBAR_BLOG": "Blog", - "FOOTER_COPYRIGHT": "© 2021 - present, Project Segfault", - "INDEX_DESCRIPTION": "4 idiots, a Sun server and a Hitachi Compute Rack.", - "INDEX_WHAT": "what", - "INDEX_WHO_ARE_WE": "We are 4 teenagers who have a decently powerful server. What do we do with this server? Host game servers and random assortment of privacy respecting tools like Invidious, Nextcloud, Matrix etc.... and maybe some original works. You'll see eventually!", - "INDEX_TELL_ME_MORE": "Tell me more! What do you guys host? Where can I contact you? Can you fix my daughter's iPad?", - "INDEX_MORE_INFO": "We can't fix your daughter's iPad, but there is a navigation bar at the top of the page with links to websites that explain things about us, or contain useful information about us.", - "DONATE_TITLE": "Donate to Project Segfault", - "DONATE_DESCRIPTION": "The ways you can donate to us and more", - "DONATE_PLEASE_DO": "please do", - "DONATE_EXPLANATION": "If you donate, we will be more motivated to work on the server and host more stuff and maybe even get more hardware. I really recommend you donate any spare money you have if you enjoy or use our services on a daily basis. Thanks!", - "DONATE_OK_SURE": "sure I'll donate. Links?", - "CONTACT_TITLE": "Contact Us", - "CONTACT_DESCRIPTION": "Do you want to contact us?", - "CONTACT_OUR_EMAIL": "Our email", - "CONTACT_EMAIL_SPAM": "Please be aware that Microsoft often blocks non-popular emails, if you do contact us through there, make sure to check your spam and mark it as not-spam!", - "CONTACT_PEOPLE": "People", - "CONTACT_CLICK": "Click to show who is active on what platform", - "MINECRAFT_TITLE": "Project Segfault MC", - "MINECRAFT_DESCRIPTION": "Yeah, we have a Minecraft server.", - "MINECRAFT_SMP": "We have an invite-only SMP server running on our network on version 1.18* (1.18, 1.18.1, 1.18.2) which is also bridged to Bedrock using GeyserMC.", - "MINECRAFT_JOIN": "If you would like to join, please join our Discord and ask us there to be whitelisted.", - "MINECRAFT_DISCORD": "Invite link to our Discord", - "MINECRAFT_RULES": "Rules", - "MINECRAFT_RULE_1": "1. Do not modify buildings without permission.", - "MINECRAFT_RULE_2": "2. Do not bypass protections. (mining around a protected door, bypassing chest locks etc)", - "MINECRAFT_RULE_3": "3. Do not cheat", - "MINECRAFT_RULE_4": "4. Do not lag the shit out of the server.", - "MINECRAFT_IP": "IP", - "MINECRAFT_NOTE_1": "psst, you can join bedrock on your switch using the app we’ve linked below!", - "MINECRAFT_NOTE_2": "another psst, if you play on both Java and Bedrock, link your accounts together on GeyserMC’s website! Your accounts will be linked together meaning you will have the exact same experience.", - "MINECRAFT_LINKS": "Links", - "MINECRAFT_MC_IOS": "MC Server Connector for iOS", - "MINECRAFT_MC_ANDROID": "MC Server Connector for Android", - "MINECRAFT_CLIENT_SIDE_MODS": "Recommended Client-Side Mods", - "MINECRAFT_CLIENT_SIDE_MODS_URL": "Click me for a list of recommended client-side mods", - "MINECRAFT_PLUGIN_LIST_TITLE": "Plugin list", - "MINECRAFT_PLUGIN_LIST_NOTE": "This is a manually made list of our plugins, so it might not be up to date.", - "MINECRAFT_MCMMO": "Click here to download our build of mcMMO.", - "MINECRAFT_VIAVERSION_NOTE": "You may only connect from a base version and its subversions (1.18, 1.18.1, 1.18.2). You cannot connect from a major version older or newer than the major version the server is running.", - "CSM_GOBACK": "Click me to go back to the Minecraft site", - "CSM_TITLE": "Recommended mods list", - "CSM_HOW_THEY_ARE_PICKED": "These are picked by our community or are for server features like voice chatting.", - "CSM_NOTE_BEDROCK": "If you play on Bedrock, try to find an alternative to these. Mods like Simple Voice Chat have no alternative on Bedrock, sorry.", - "CSM_OPTIMIZATION_MODS_NOTE": "Any optimization mod (We recommend at least Sodium)" -} \ No newline at end of file + "NAVBAR_INSTANCES": "Instances & Gameservers", + "NAVBAR_DONATE": "Donate", + "NAVBAR_FAQ": "FAQ", + "NAVBAR_CONTACT": "Contact", + "NAVBAR_BLOG": "Blog", + "FOOTER_COPYRIGHT": "© 2021 - present, Project Segfault", + "INDEX_DESCRIPTION": "4 idiots, a Sun server and a Hitachi Compute Rack.", + "INDEX_WHAT": "what", + "INDEX_WHO_ARE_WE": "We are 4 teenagers who have a decently powerful server. What do we do with this server? Host game servers and random assortment of privacy respecting tools like Invidious, Nextcloud, Matrix etc.... and maybe some original works. You'll see eventually!", + "INDEX_TELL_ME_MORE": "Tell me more! What do you guys host? Where can I contact you? Can you fix my daughter's iPad?", + "INDEX_MORE_INFO": "We can't fix your daughter's iPad, but there is a navigation bar at the top of the page with links to websites that explain things about us, or contain useful information about us.", + "DONATE_TITLE": "Donate to Project Segfault", + "DONATE_DESCRIPTION": "The ways you can donate to us and more", + "DONATE_PLEASE_DO": "please do", + "DONATE_EXPLANATION": "If you donate, we will be more motivated to work on the server and host more stuff and maybe even get more hardware. I really recommend you donate any spare money you have if you enjoy or use our services on a daily basis. Thanks!", + "DONATE_OK_SURE": "sure I'll donate. Links?", + "CONTACT_TITLE": "Contact Us", + "CONTACT_DESCRIPTION": "Do you want to contact us?", + "CONTACT_OUR_EMAIL": "Our email", + "CONTACT_EMAIL_SPAM": "Please be aware that Microsoft often blocks non-popular emails, if you do contact us through there, make sure to check your spam and mark it as not-spam!", + "CONTACT_PEOPLE": "People", + "CONTACT_CLICK": "Click to show who is active on what platform", + "MINECRAFT_TITLE": "Project Segfault MC", + "MINECRAFT_DESCRIPTION": "Yeah, we have a Minecraft server.", + "MINECRAFT_SMP": "We have an invite-only SMP server running on our network on version 1.18* (1.18, 1.18.1, 1.18.2) which is also bridged to Bedrock using GeyserMC.", + "MINECRAFT_JOIN": "If you would like to join, please join our Discord and ask us there to be whitelisted.", + "MINECRAFT_DISCORD": "Invite link to our Discord", + "MINECRAFT_RULES": "Rules", + "MINECRAFT_RULE_1": "1. Do not modify buildings without permission.", + "MINECRAFT_RULE_2": "2. Do not bypass protections. (mining around a protected door, bypassing chest locks etc)", + "MINECRAFT_RULE_3": "3. Do not cheat", + "MINECRAFT_RULE_4": "4. Do not lag the shit out of the server.", + "MINECRAFT_IP": "IP", + "MINECRAFT_NOTE_1": "psst, you can join bedrock on your switch using the app we’ve linked below!", + "MINECRAFT_NOTE_2": "another psst, if you play on both Java and Bedrock, link your accounts together on GeyserMC’s website! Your accounts will be linked together meaning you will have the exact same experience.", + "MINECRAFT_LINKS": "Links", + "MINECRAFT_MC_IOS": "MC Server Connector for iOS", + "MINECRAFT_MC_ANDROID": "MC Server Connector for Android", + "MINECRAFT_CLIENT_SIDE_MODS": "Recommended Client-Side Mods", + "MINECRAFT_CLIENT_SIDE_MODS_URL": "Click me for a list of recommended client-side mods", + "MINECRAFT_PLUGIN_LIST_TITLE": "Plugin list", + "MINECRAFT_PLUGIN_LIST_NOTE": "This is a manually made list of our plugins, so it might not be up to date.", + "MINECRAFT_MCMMO": "Click here to download our build of mcMMO.", + "MINECRAFT_VIAVERSION_NOTE": "You may only connect from a base version and its subversions (1.18, 1.18.1, 1.18.2). You cannot connect from a major version older or newer than the major version the server is running.", + "CSM_GOBACK": "Click me to go back to the Minecraft site", + "CSM_TITLE": "Recommended mods list", + "CSM_HOW_THEY_ARE_PICKED": "These are picked by our community or are for server features like voice chatting.", + "CSM_NOTE_BEDROCK": "If you play on Bedrock, try to find an alternative to these. Mods like Simple Voice Chat have no alternative on Bedrock, sorry.", + "CSM_OPTIMIZATION_MODS_NOTE": "Any optimization mod (We recommend at least Sodium)" +} diff --git a/src/i18n/nb.json b/src/i18n/nb.json index 4dcb145..3206076 100644 --- a/src/i18n/nb.json +++ b/src/i18n/nb.json @@ -1,23 +1,23 @@ { - "NAVBAR_INSTANCES": "Våre tjenester og spillservere", - "NAVBAR_DONATE": "Doner", - "NAVBAR_FAQ": "OSS", - "NAVBAR_CONTACT": "Kontakt", - "NAVBAR_BLOG": "Blogg", - "INDEX_DESCRIPTION": "4 idioter, en Sun server og en Hitachi Compute Rack.", - "INDEX_WHAT": "hva", - "INDEX_WHO_ARE_WE": "Vi er 4 tenåringer med en grei server. Hva gjør vi med denne serveren? Vi ofrer tjenester som respekterer personvernet ditt som for eksempel Invidious, Matrix, Pleroma. Vi kjører også noen spillservere på serveren våres, for eksempel Minecraft. Kanskje vi lager noe originalt... det får du se etterhvert!", - "INDEX_TELL_ME_MORE": "Fortell meg mer! Hva kjører dere på serverene deres? Hvor kan jeg komme i kontakt med dere? Kan dere fikse min datters iPad?", - "INDEX_MORE_INFO": "Vi kan ikke fikse din datters iPad, men det er navigasjonslinje på toppen av siden som har lenker til sider som forklarer ting om oss, eller har nyttig informasjon om oss.", - "DONATE_TITLE": "Doner til Project Segfault", - "DONATE_DESCRIPTION": "Veiene du kan donere til oss og mer", - "DONATE_PLEASE_DO": "vær så snill", - "DONATE_EXPLANATION": "Hvis du donerer, blir vi mer motivert til å jobbe på serverene våres og ofre flere tjenester, og kanskje skaffe oss mer maskinvare. Jeg anbefaler at du donerer reservepenger hvis du liker å bruke tjenestene våres, eller hvis du bruker våres tjenester på en daglig basis. Takk!", - "DONATE_OK_SURE": "greit, jeg skal donere. Hvor kan jeg donere?", - "CONTACT_TITLE": "Få kontakt med oss", - "CONTACT_DESCRIPTION": "Veier du kan komme i kontakt med oss.", - "CONTACT_OUR_EMAIL": "Våres e-post", - "CONTACT_EMAIL_SPAM": "Microsoft (Outlook, Hotmail) pleier å markere e-poster som ikke er populære som søppelpost. Hvis du sender oss en e-post via Microsoft, husk å markere oss som ikke søppelpost!", - "CONTACT_PEOPLE": "Medlemmer i Project Segfault", - "CONTACT_CLICK": "Klikk for å komme i kontakt med en av medlemmene våres." -} \ No newline at end of file + "NAVBAR_INSTANCES": "Våre tjenester og spillservere", + "NAVBAR_DONATE": "Doner", + "NAVBAR_FAQ": "OSS", + "NAVBAR_CONTACT": "Kontakt", + "NAVBAR_BLOG": "Blogg", + "INDEX_DESCRIPTION": "4 idioter, en Sun server og en Hitachi Compute Rack.", + "INDEX_WHAT": "hva", + "INDEX_WHO_ARE_WE": "Vi er 4 tenåringer med en grei server. Hva gjør vi med denne serveren? Vi ofrer tjenester som respekterer personvernet ditt som for eksempel Invidious, Matrix, Pleroma. Vi kjører også noen spillservere på serveren våres, for eksempel Minecraft. Kanskje vi lager noe originalt... det får du se etterhvert!", + "INDEX_TELL_ME_MORE": "Fortell meg mer! Hva kjører dere på serverene deres? Hvor kan jeg komme i kontakt med dere? Kan dere fikse min datters iPad?", + "INDEX_MORE_INFO": "Vi kan ikke fikse din datters iPad, men det er navigasjonslinje på toppen av siden som har lenker til sider som forklarer ting om oss, eller har nyttig informasjon om oss.", + "DONATE_TITLE": "Doner til Project Segfault", + "DONATE_DESCRIPTION": "Veiene du kan donere til oss og mer", + "DONATE_PLEASE_DO": "vær så snill", + "DONATE_EXPLANATION": "Hvis du donerer, blir vi mer motivert til å jobbe på serverene våres og ofre flere tjenester, og kanskje skaffe oss mer maskinvare. Jeg anbefaler at du donerer reservepenger hvis du liker å bruke tjenestene våres, eller hvis du bruker våres tjenester på en daglig basis. Takk!", + "DONATE_OK_SURE": "greit, jeg skal donere. Hvor kan jeg donere?", + "CONTACT_TITLE": "Få kontakt med oss", + "CONTACT_DESCRIPTION": "Veier du kan komme i kontakt med oss.", + "CONTACT_OUR_EMAIL": "Våres e-post", + "CONTACT_EMAIL_SPAM": "Microsoft (Outlook, Hotmail) pleier å markere e-poster som ikke er populære som søppelpost. Hvis du sender oss en e-post via Microsoft, husk å markere oss som ikke søppelpost!", + "CONTACT_PEOPLE": "Medlemmer i Project Segfault", + "CONTACT_CLICK": "Klikk for å komme i kontakt med en av medlemmene våres." +} diff --git a/src/lib/Content.svelte b/src/lib/Content.svelte deleted file mode 100644 index 6476773..0000000 --- a/src/lib/Content.svelte +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - {global.NAME} - - -
- -
diff --git a/src/lib/Footer.svelte b/src/lib/Footer.svelte index fd7695a..9e9ba7b 100644 --- a/src/lib/Footer.svelte +++ b/src/lib/Footer.svelte @@ -4,13 +4,13 @@ import IconGitHub from "~icons/simple-icons/github"; import IconSignal from "~icons/fa6-solid/signal"; import * as global from "../i18n/_global.json"; - import { t } from '$lib/translations'; + import { t } from "$lib/translations";