From 910bfc9372a040e87218d325af0623eeb472507f Mon Sep 17 00:00:00 2001 From: Elijah R Date: Thu, 4 Jan 2024 12:26:44 -0500 Subject: [PATCH] some improvements: - add rules translation - store language to localstorage - fall back to english on load fail --- dist/index.html | 26 ++------------------------ dist/translations/de.json | 4 +++- dist/translations/en.json | 4 +++- src/i18n.js | 7 +++++-- src/index.js | 4 +++- 5 files changed, 16 insertions(+), 29 deletions(-) diff --git a/dist/index.html b/dist/index.html index 15659df..5935167 100644 --- a/dist/index.html +++ b/dist/index.html @@ -41,32 +41,10 @@
-

Welcome to CollabVM

+

Welcome to CollabVM

-

Before continuing, please familiarize yourself with our rules:

-

R1. Don't break the law.

- Do not use CollabVM or CollabVM's network to violate United States federal law, New York state law, or international law. If CollabVM becomes aware a crime has been committed through its service, you will be immediately banned, and your activities may be reported to the authorities if necessary.

CollabVM is required by law to notify law enforcement agencies if it becomes aware of the presence of child pornography on, or being transmitted through its network.

COPPA is also enforced, please do not use CollabVM if you are under the age of 13 years old. -

R2. No running DoS/DDoS tools.

- Do not use CollabVM to DoS/DDoS an indivdiual, business, company, or anyone else. -

R3. No spam distribution.

- Do not spam any emails using this service or push spam in general. -

R4. Do not abuse any exploits.

- Do not abuse any exploits, additionally if you see someone abusing exploits or you need to report one, please contact me at: computernewbab@gmail.com -

R5. Don't impersonate other users.

- Do not impersonate other members of CollabVM. If caught, you'll be temporarily disconnected, and banned if necessary. -

R6. One vote per person.

- Do not use any methods or tools to bypass the vote restriction. Only one vote per person is allowed, no matter what. Anybody who is caught doing this will be banned. -

R7. No Remote Administration Tools.

- Do not use any remote administration tools (ex: DarkComet, NanoCore, Anydesk, TeamViewer, Orcus, etc.) -

R8. No bypassing CollabNet.

- Do not attempt to bypass the blocking provided by CollabNet, especially if it is being used to break Rule 1, Rule 2, or Rule 7 (or run stupid over-used things). -

R9. No performing destructive actions constantly.

- Any user may not destroy the VM (rendering it unusable constantly), install/reinstall the operating system (except on VM7 or VM8), or run bots that do such. This includes bots that spam massive amounts of keyboard/mouse input ("kitting"). -

R10. No Cryptomining

- Attempting to mine cryptocurrency on the VMs will result in a kick, and then a permanent ban if you keep attempting. Besides, it's not like you're gonna make any money off it. -

NSFW Warning

- Please note that NSFW content is allowed on our anarchy VM (VM0b0t), and is viewed regularly. In addition, while we give a good effort to keep NSFW off the main VMs, people will occasionally slip it through. +
diff --git a/dist/translations/de.json b/dist/translations/de.json index 717f53a..d4b2a7d 100644 --- a/dist/translations/de.json +++ b/dist/translations/de.json @@ -3,6 +3,7 @@ "Home": "Hauptseite", "FAQ": "FAQ", "Rules": "Regeln", + "Welcome to CollabVM": "Willkommen zu CollabVM", "Do you want to reset the vm?": "Möchten Sie die VM zurücksetzen?", "Yes": "Ja", "No": "Nein", @@ -18,5 +19,6 @@ "Turn expires in # seconds.": "Ihre Zeit läuft in # Sekunden aus.", "Waiting for turn in # seconds.": "In der Reihe warten für # Sekunden.", "Please wait # seconds before starting another vote.": "Bitte warten Sie # Sekunden bevor Sie noch eine Abstimmung starten.", - "Enter new username": "Geben Sie Ihren neuen Nutzername ein." + "Enter new username": "Geben Sie Ihren neuen Nutzername ein.", + "rulesHTML": "

Bevor Sie fortfahren, machen Sie sich bitte mit unseren Regeln vertraut:

R1. Verbrechen Sie nicht das Gesetz.

Verwenden Sie CollabVM oder das CollabVM-Netzwerk nicht, um das Bundesgesetz der Vereinigten Staaten, das Gesetz des Staates New York oder internationales Recht zu verletzen. Wenn CollabVM erfährt, dass eine Straftat durch seinen Dienst begangen wurde, werden Sie sofort gesperrt und Ihre Aktivitäten können den Behörden gemeldet werden, falls erforderlich.
CollabVM ist gesetzlich verpflichtet, die Strafverfolgungsbehörden zu benachrichtigen, wenn es Kenntnis vom Vorhandensein von Kinderpornographie in seinem Netzwerk oder deren Übertragung erhält.
COPPA wird auch durchgesetzt, bitte benutzen Sie CollabVM nicht, wenn Sie unter 13 Jahre alt sind.

R2. Keine DoS/DDoS-Tools.

Benutzen Sie CollabVM nicht, um DoS/DDoS gegen eine Einzelperson, ein Geschäft, ein Unternehmen oder eine andere Person zu betreiben.

R3. Kein Spam-Versand.

Verwenden Sie diesen Dienst nicht zum Versenden von Spam-E-Mails oder zum Versenden von Spam im Allgemeinen.

R4. Keinen Missbrauch von Exploits.

Missbrauche keine Exploits. Wenn Sie jemanden sehen, der Exploits missbraucht, oder wenn Sie einen Exploit melden möchtest, kontaktiere mich bitte unter: computernewbab@gmail.com

R5. Geben Sie sich nicht als andere Benutzer aus.

Geben Sie sich nicht als andere Mitglieder von CollabVM aus. Wenn Sie erwischt werden, werden Sie vorübergehend von der Verbindung getrennt und gegebenenfalls gesperrt.

R6. Eine Stimme pro Person.

Verwenden Sie keine Methoden oder Hilfsmittel, um die Abstimmungsbeschränkung zu umgehen. Es ist nur eine Stimme pro Person erlaubt, egal wie. Jeder, der dabei erwischt wird, wird gebannt.

R7. Keine Fernadministrations-Tools.

Es dürfen keine Fernadministrations-Tools verwendet werden (z.B. DarkComet, NanoCore, Anydesk, TeamViewer, Orcus, uzw.)

R8. Kein Umgehen von CollabNet

Versuchen Sie nicht, die von CollabNet bereitgestellten Sperren zu umgehen, insbesondere dann nicht, wenn sie dazu benutzt werden, Regel 1, Regel 2 oder Regel 7 zu brechen (oder dumme, übermäßige Dinge auszuführen).

R9. Keine ständigen destruktiven Aktionen durchführen.

Jeder Nutzer darf die VM nicht zerstören (was es ständig unbrauchbar macht), ein anderes Betriebssystem installieren oder das Betriebssystem neu installieren (außer auf VM7 oder VM8) oder Bots ausführen, die dies tun. Dies schließt Bots ein, die massive Mengen an Tastatur-/Mauseingaben spammen (so genanntes \"Kitting\").

R10. Kein Cryptomining

Der Versuch, auf den VMs Kryptowährungen zu \"schürfen\", führt zu einem Kick und dann zu einem permanenten Bann, wenn Sie es weiter versuchen. Außerdem ist es ja nicht so, dass Sie damit Geld verdienen würden.

NSFW-Warnung

Bitte beachten Sie, dass NSFW-Inhalte auf unserer Anarcho-VM (VM0b0t) erlaubt sind und regelmäßig angesehen werden. Obwohl wir uns bemühen, NSFW von den Haupt-VMs fernzuhalten, kann es vorkommen, dass was durchrutscht.
" } \ No newline at end of file diff --git a/dist/translations/en.json b/dist/translations/en.json index 765a1a5..1e0fdf8 100644 --- a/dist/translations/en.json +++ b/dist/translations/en.json @@ -3,6 +3,7 @@ "Home": "Home", "FAQ": "FAQ", "Rules": "Rules", + "Welcome to CollabVM": "Welcome to CollabVM", "Do you want to reset the vm?": "Do you want to reset the vm?", "Yes": "Yes", "No": "No", @@ -18,5 +19,6 @@ "Turn expires in # seconds.": "Turn expires in # seconds.", "Waiting for turn in # seconds.": "Waiting for turn in # seconds.", "Please wait # seconds before starting another vote.": "Please wait # seconds before starting another vote.", - "Enter new username": "Enter new username" + "Enter new username": "Enter new username", + "rulesHTML": "

Before continuing, please familiarize yourself with our rules:

R1. Don't break the law.

Do not use CollabVM or CollabVM's network to violate United States federal law, New York state law, or international law. If CollabVM becomes aware a crime has been committed through its service, you will be immediately banned, and your activities may be reported to the authorities if necessary.

CollabVM is required by law to notify law enforcement agencies if it becomes aware of the presence of child pornography on, or being transmitted through its network.

COPPA is also enforced, please do not use CollabVM if you are under the age of 13 years old.

R2. No running DoS/DDoS tools.

Do not use CollabVM to DoS/DDoS an indivdiual, business, company, or anyone else.

R3. No spam distribution.

Do not spam any emails using this service or push spam in general.

R4. Do not abuse any exploits.

Do not abuse any exploits, additionally if you see someone abusing exploits or you need to report one, please contact me at: computernewbab@gmail.com

R5. Don't impersonate other users.

Do not impersonate other members of CollabVM. If caught, you'll be temporarily disconnected, and banned if necessary.

R6. One vote per person.

Do not use any methods or tools to bypass the vote restriction. Only one vote per person is allowed, no matter what. Anybody who is caught doing this will be banned.

R7. No Remote Administration Tools.

Do not use any remote administration tools (ex: DarkComet, NanoCore, Anydesk, TeamViewer, Orcus, etc.)

R8. No bypassing CollabNet.

Do not attempt to bypass the blocking provided by CollabNet, especially if it is being used to break Rule 1, Rule 2, or Rule 7 (or run stupid over-used things).

R9. No performing destructive actions constantly.

Any user may not destroy the VM (rendering it unusable constantly), install/reinstall the operating system (except on VM7 or VM8), or run bots that do such. This includes bots that spam massive amounts of keyboard/mouse input (\"kitting\").

R10. No Cryptomining

Attempting to mine cryptocurrency on the VMs will result in a kick, and then a permanent ban if you keep attempting. Besides, it's not like you're gonna make any money off it.

NSFW Warning

Please note that NSFW content is allowed on our anarchy VM (VM0b0t), and is viewed regularly. In addition, while we give a good effort to keep NSFW off the main VMs, people will occasionally slip it through." } \ No newline at end of file diff --git a/src/i18n.js b/src/i18n.js index 2b75b83..cd9beb7 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -54,6 +54,7 @@ export default class i18n { this.lang = lang; this.data = res; this.replaceAllInDOM(); + window.localStorage.setItem("cvm-lang", lang); }).catch((e) => { console.log(e); return alert(`i18n error: Failed to load language file for ${lang}. Alert a site administrator!`); @@ -67,6 +68,7 @@ export default class i18n { { id: "homeText", key: "Home" }, { id: "faqLink", key: "FAQ" }, { id: "rulesLink", key: "Rules" }, + { id: "welcomeText", key: "Welcome to CollabVM" }, { id: "onlineUserText", key: "Users Online" }, { id: "voteResetText", key: "Do you want to reset the vm?" }, { id: "voteYesText", key: "Yes" }, @@ -76,13 +78,14 @@ export default class i18n { { id: "takeTurnButtonText", key: "Take Turn" }, { id: "changeUsernameButtonText", key: "Change Username" }, { id: "voteResetButtonText", key: "Vote for Reset" }, - { id: "screenshotButtonText", key: "Screenshot" } + { id: "screenshotButtonText", key: "Screenshot" }, + { id: "rulesHtml", key: "rulesHTML"} ]; elements.forEach(el => { var element = document.getElementById(el.id); if (element != null) { - element.innerText = ` ${this.get(el.key)}`; + element.innerHTML = ` ${this.get(el.key)}`; } else { console.warn(`${el.id} was null (would have assigned ${this.get(el.key)})`) } diff --git a/src/index.js b/src/index.js index 60efd98..33ab9c7 100644 --- a/src/index.js +++ b/src/index.js @@ -7,9 +7,11 @@ import doCaptcha from "./captcha"; import i18n from "./i18n"; // i18n -window.i18n = new i18n(navigator.language.split("-")[0]); +window.i18n = new i18n(localStorage.getItem("cvm-lang") || navigator.language.split("-")[0]); window.i18n.init().then(() => { window.i18n.replaceAllInDOM(); +}).catch(() => { + window.i18n.change("en"); }); // None = -1