Merge branch 'i18n' of https://github.com/MutaTechTips/mutaharwebsite into i18n

src/i18n/_global.json

@@ -8,7 +8,6 @@
 	"STATUS": "https://status.projectsegfau.lt/",
 	"MINECRAFT": "Minecraft",
 	"INSTANCES": "https://instances.projectsegfau.lt/",
-	"FAQ_URL": "https://wiki.projectsegfau.lt/about/faq/",
 	"BLOG_URL": "https://blog.projectsegfau.lt/",
 	"EMAIL": "contact@projectsegfau.lt",
 	"MIDOU": "Midou",

src/i18n/common.json

@@ -47,5 +47,17 @@
 	"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)"
+	"CSM_OPTIMIZATION_MODS_NOTE": "Any optimization mod (We recommend at least Sodium)",
+	"FAQ_TITLE": "Frequently Asked Questions",
+	"FAQ_OWNER_TITLE": "Who is the project owner?",
+	"FAQ_OWNER": "Orignally: Midou (Sysadmin) and Mrlerien (Hoster), but now Odyssey346 (Game Server Sysadmin, webdev and social media manager) and Devnol (Hoster) are with us.",
+	"FAQ_TOXICITY_TITLE": "One of your services contains toxic people!",
+	"FAQ_TOXICITY_1": "You can contact us by mail or Matrix and we can figure this out with you. But we recommend that you put most of these requests in our support channel at",
+	"FAQ_TOXICITY_2": "on Matrix. If it's something personal, just say that you have a report against someone on one of our  services and you'd like to be contacted by an admin and we'll constact you ASAP. We have no lives so we're quite active.",
+	"FAQ_TRUST_TITLE": "How can I trust your services?",
+	"FAQ_TRUST_1": "Well, you really can't. We don't make our logs or anything public, however, if you would like the data we have on you, please contact us. If you're paranoid,",
+	"FAQ_TRUST_2": "you are allowed to use Tor on our services",
+	"FAQ_TRUST_3": ", but we don't host any .onion links.",
+	"FAQ_CONTACT_TITLE": "Which ways do you prefer to communicate?",
+	"FAQ_CONTACT": "Look at"
 }

src/i18n/el.json

@@ -1,51 +0,0 @@
-{
-	"NAVBAR_INSTANCES": "Instances & Διακομιστές παιχνιδιών",
-	"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)"
-}

src/lib/Nav.svelte

@@ -19,7 +19,7 @@
 		<a href={global.INSTANCES}>{$t("common.NAVBAR_INSTANCES")}</a>
 		<a href="/minecraft">{global.MINECRAFT}</a>
 		<a href="/donate">{$t("common.NAVBAR_DONATE")}</a>
-		<a href={global.FAQ_URL}>{$t("common.NAVBAR_FAQ")}</a>
+		<a href="/faq">{$t("common.NAVBAR_FAQ")}</a>
 		<a href="/contact">{$t("common.NAVBAR_CONTACT")}</a>
 		<a href={global.BLOG_URL}>{$t("common.NAVBAR_BLOG")}</a>
 	</div>

src/lib/app.css

@@ -24,6 +24,7 @@ body {
 	flex-direction: column;
 	position: relative;
 	min-height: 100vh;
+	line-height: 1.625;
 }
 
 main {

src/routes/faq.svelte

@@ -0,0 +1,34 @@
+<script lang="ts">
+	import { t } from "$lib/translations";
+	import * as global from "../i18n/_global.json";
+</script>
+
+<svelte:head>
+	<title>{$t("common.FAQ_TITLE")} | {global.NAME}</title>
+</svelte:head>
+
+<h1>{$t("common.FAQ_TITLE")}</h1>
+
+<h2>{$t('common.FAQ_OWNER_TITLE')}</h2>
+<p>{$t('common.FAQ_OWNER')}</p>
+
+<h2>{$t('common.FAQ_TOXICITY_TITLE')}</h2>
+<p>
+    {$t('common.FAQ_TOXICITY_1')}
+    <a href="https://matrix.to/#/#support:projectsegfau.lt">#support:projectsegfau.lt</a>
+    {$t('common.FAQ_TOXICITY_2')}
+</p>
+
+<h2>{$t('common.FAQ_TRUST_TITLE')}</h2>
+<p>
+    {$t('common.FAQ_TRUST_1')}
+    <strong>{$t('common.FAQ_TRUST_2')}</strong>
+    {$t('common.FAQ_TRUST_3')}
+</p>
+
+<h2>{$t('common.FAQ_CONTACT_TITLE')}</h2>
+<p>
+    {$t('common.FAQ_CONTACT')} 
+    <a href="/contact">{$t('common.NAVBAR_CONTACT')}</a>
+    .
+</p>

src/routes/index.svelte

@@ -9,16 +9,18 @@
 
 <h1>{global.NAME}</h1>
 
-<h2>{$t("common.INDEX_DESCRIPTION")}</h2>
+<div>
-
+	<h2>{$t("common.INDEX_DESCRIPTION")}</h2>
-<h1>{$t("common.INDEX_WHAT")}</h1>
+	
-<!-- Cause I feel the need to scream -->
+	<h1>{$t("common.INDEX_WHAT")}</h1>
-
+	<!-- Cause I feel the need to scream -->
-<p>{$t("common.INDEX_WHO_ARE_WE")}</p>
+	
-
+	<p>{$t("common.INDEX_WHO_ARE_WE")}</p>
-<h1>{$t("common.INDEX_TELL_ME_MORE")}</h1>
+	
-
+	<h1>{$t("common.INDEX_TELL_ME_MORE")}</h1>
-<p>{$t("common.INDEX_MORE_INFO")}</p>
+	
+	<p>{$t("common.INDEX_MORE_INFO")}</p>
+</div>
 
 <a
 	href="https://www.abuseipdb.com/user/82331"
@@ -27,7 +29,12 @@
 	<img
 		src="https://www.abuseipdb.com/contributor/82331.svg"
 		alt="AbuseIPDB Contributor Badge"
-		style="width: 270px;background: var(--accent-primary); padding: 0.5rem;position:absolute; bottom:8%;
+		style="width: 270px;background: var(--accent-primary); padding: 0.5rem;position:absolute; bottom:8%;border-radius: 10px;"
-		border-radius: 16px;"
 	/>
 </a>
+
+<style>
+	div {
+		padding-bottom: 200px;
+	}
+</style>