Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring translator to use "_" instead of "translator._".

Browse source 
This is shorter and pollutes less the code.
This commit is contained in:
David Négrier 2022-01-19 09:28:08 +01:00 • committed by Alexis Faizeau
parent 1789f36a63
commit 51c3f1d972
34 changed files with 174 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

18
front/src/Components/Menu/AboutRoomSubMenu.svelte
View file

@ -1,7 +1,7 @@
<script lang="ts">
import { gameManager } from "../../Phaser/Game/GameManager";
import { onMount } from "svelte";
import { translator } from "../../Translator/Translator";
import { _ } from "../../Translator/Translator";
let gameScene = gameManager.getCurrentGameScene();
@ -12,7 +12,7 @@
let mapName: string = "";
let mapLink: string = "";
let mapDescription: string = "";
let mapCopyright: string = translator._("menu.about.copyrights.map.empty");
let mapCopyright: string = _("menu.about.copyrights.map.empty");
let tilesetCopyright: string[] = [];
let audioCopyright: string[] = [];
@ -63,37 +63,37 @@
</script>
<div class="about-room-main">
<h2>{translator._("menu.about.map-info")}</h2>
<h2>{_("menu.about.map-info")}</h2>
<section class="container-overflow">
<h3>{mapName}</h3>
<p class="string-HTML">{mapDescription}</p>
{#if mapLink}
<p class="string-HTML">
&gt; <a href={mapLink} target="_blank">{translator._("menu.about.map-link")}</a> &lt;
&gt; <a href={mapLink} target="_blank">{_("menu.about.map-link")}</a> &lt;
</p>
{/if}
<h3 class="nes-pointer hoverable" on:click={() => (expandedMapCopyright = !expandedMapCopyright)}>
{translator._("menu.about.copyrights.map.title")}
{_("menu.about.copyrights.map.title")}
</h3>
<p class="string-HTML" hidden={!expandedMapCopyright}>{mapCopyright}</p>
<h3 class="nes-pointer hoverable" on:click={() => (expandedTilesetCopyright = !expandedTilesetCopyright)}>
{translator._("menu.about.copyrights.tileset.title")}
{_("menu.about.copyrights.tileset.title")}
</h3>
<section hidden={!expandedTilesetCopyright}>
{#each tilesetCopyright as copyright}
<p class="string-HTML">{copyright}</p>
{:else}
<p>{translator._("menu.about.copyrights.tileset.empty")}</p>
<p>{_("menu.about.copyrights.tileset.empty")}</p>
{/each}
</section>
<h3 class="nes-pointer hoverable" on:click={() => (expandedAudioCopyright = !expandedAudioCopyright)}>
{translator._("menu.about.copyrights.audio.title")}
{_("menu.about.copyrights.audio.title")}
</h3>
<section hidden={!expandedAudioCopyright}>
{#each audioCopyright as copyright}
<p class="string-HTML">{copyright}</p>
{:else}
<p>{translator._("menu.about.copyrights.audio.empty")}</p>
<p>{_("menu.about.copyrights.audio.empty")}</p>
{/each}
</section>
</section>

6
front/src/Components/Menu/AudioGlobalMessage.svelte
View file

@ -4,7 +4,7 @@
import { AdminMessageEventTypes } from "../../Connexion/AdminMessagesService";
import uploadFile from "../images/music-file.svg";
import type { PlayGlobalMessageInterface } from "../../Connexion/ConnexionModels";
import { translator } from "../../Translator/Translator";
import { _ } from "../../Translator/Translator";
interface EventTargetFiles extends EventTarget {
files: Array<File>;
@ -77,7 +77,7 @@
<img
class="nes-pointer"
src={uploadFile}
alt={translator._("menu.global-audio.upload-info")}
alt={_("menu.global-audio.upload-info")}
on:click|preventDefault={() => {
fileInput.click();
}}
@ -86,7 +86,7 @@
<p>{fileName} : {fileSize}</p>
{/if}
{#if errorFile}
<p class="err">{translator._("menu.global-audio.error")}</p>
<p class="err">{_("menu.global-audio.error")}</p>
{/if}
<input
type="file"

14
front/src/Components/Menu/ContactSubMenu.svelte
View file

@ -1,6 +1,6 @@
<script lang="ts">
import { contactPageStore } from "../../Stores/MenuStore";
import { translator } from "../../Translator/Translator";
import { _ } from "../../Translator/Translator";
function goToGettingStarted() {
const sparkHost = "https://workadventu.re/getting-started";
@ -16,18 +16,18 @@
<div class="create-map-main">
<section class="container-overflow">
<section>
<h3>{translator._("menu.contact.getting-started.title")}</h3>
<p>{translator._("menu.contact.getting-started.description")}</p>
<h3>{_("menu.contact.getting-started.title")}</h3>
<p>{_("menu.contact.getting-started.description")}</p>
<button type="button" class="nes-btn is-primary" on:click={goToGettingStarted}
>{translator._("menu.contact.getting-started.title")}</button
>{_("menu.contact.getting-started.title")}</button
>
</section>
<section>
<h3>{translator._("menu.contact.create-map.title")}</h3>
<p>{translator._("menu.contact.create-map.description")}</p>
<h3>{_("menu.contact.create-map.title")}</h3>
<p>{_("menu.contact.create-map.description")}</p>
<button type="button" class="nes-btn" on:click={goToBuildingMap}
>{translator._("menu.contact.create-map.title")}</button
>{_("menu.contact.create-map.title")}</button
>
</section>

12
front/src/Components/Menu/GlobalMessagesSubMenu.svelte
View file

@ -1,7 +1,7 @@
<script lang="ts">
import TextGlobalMessage from "./TextGlobalMessage.svelte";
import AudioGlobalMessage from "./AudioGlobalMessage.svelte";
import { translator } from "../../Translator/Translator";
import { _ } from "../../Translator/Translator";
let handleSendText: { sendTextMessage(broadcast: boolean): void };
let handleSendAudio: { sendAudioMessage(broadcast: boolean): Promise<void> };
@ -36,14 +36,14 @@
<button
type="button"
class="nes-btn {inputSendTextActive ? 'is-disabled' : ''}"
on:click|preventDefault={activateInputText}>{translator._("menu.global-message.text")}</button
on:click|preventDefault={activateInputText}>{_("menu.global-message.text")}</button
>
</section>
<section>
<button
type="button"
class="nes-btn {uploadAudioActive ? 'is-disabled' : ''}"
on:click|preventDefault={activateUploadAudio}>{translator._("menu.global-message.audio")}</button
on:click|preventDefault={activateUploadAudio}>{_("menu.global-message.audio")}</button
>
</section>
</div>
@ -58,12 +58,10 @@
<div class="global-message-footer">
<label>
<input type="checkbox" class="nes-checkbox is-dark nes-pointer" bind:checked={broadcastToWorld} />
<span>{translator._("menu.global-message.warning")}</span>
<span>{_("menu.global-message.warning")}</span>
</label>
<section>
<button class="nes-btn is-primary" on:click|preventDefault={send}
>{translator._("menu.global-message.send")}</button
>
<button class="nes-btn is-primary" on:click|preventDefault={send}>{_("menu.global-message.send")}</button>
</section>
</div>
</div>

14
front/src/Components/Menu/GuestSubMenu.svelte
View file

@ -1,5 +1,5 @@
<script lang="ts">
import { translator } from "../../Translator/Translator";
import { _ } from "../../Translator/Translator";
function copyLink() {
const input: HTMLInputElement = document.getElementById("input-share-link") as HTMLInputElement;
@ -23,18 +23,14 @@
<div class="guest-main">
<section class="container-overflow">
<section class="share-url not-mobile">
<h3>{translator._("menu.invite.description")}</h3>
<h3>{_("menu.invite.description")}</h3>
<input type="text" readonly id="input-share-link" value={location.toString()} />
<button type="button" class="nes-btn is-primary" on:click={copyLink}
>{translator._("menu.invite.copy")}</button
>
<button type="button" class="nes-btn is-primary" on:click={copyLink}>{_("menu.invite.copy")}</button>
</section>
<section class="is-mobile">
<h3>{translator._("menu.invite.description")}</h3>
<h3>{_("menu.invite.description")}</h3>
<input type="hidden" readonly id="input-share-link" value={location.toString()} />
<button type="button" class="nes-btn is-primary" on:click={shareLink}
>{translator._("menu.invite.share")}</button
>
<button type="button" class="nes-btn is-primary" on:click={shareLink}>{_("menu.invite.share")}</button>
</section>
</section>
</div>

6
front/src/Components/Menu/Menu.svelte
View file

@ -18,7 +18,7 @@
import { get } from "svelte/store";
import type { Unsubscriber } from "svelte/store";
import { sendMenuClickedEvent } from "../../Api/iframe/Ui/MenuItem";
import { translator } from "../../Translator/Translator";
import { _ } from "../../Translator/Translator";
let activeSubMenu: string = SubMenusInterface.profile;
let activeComponent: typeof ProfileSubMenu | typeof CustomSubMenu = ProfileSubMenu;
@ -92,7 +92,7 @@
function translateMenuName(menuName: string) {
const nameFormatted = "menu.sub." + menuName.toLowerCase().replaceAll(" ", "-");
const translation = translator._(nameFormatted);
const translation = _(nameFormatted);
return translation === nameFormatted ? menuName : translation;
}
@ -102,7 +102,7 @@
<div class="menu-container-main">
<div class="menu-nav-sidebar nes-container is-rounded" transition:fly={{ x: -1000, duration: 500 }}>
<h2>{translator._("menu.title")}</h2>
<h2>{_("menu.title")}</h2>
<nav>
{#each $subMenusStore as submenu}
<button

20
front/src/Components/Menu/MenuIcon.svelte
View file

@ -9,7 +9,7 @@
import { get } from "svelte/store";
import { ADMIN_URL } from "../../Enum/EnvironmentVariable";
import { showShareLinkMapModalStore } from "../../Stores/ModalStore";
import { translator } from "../../Translator/Translator";
import { _ } from "../../Translator/Translator";
function showMenu() {
menuVisiblilityStore.set(!get(menuVisiblilityStore));
@ -32,29 +32,19 @@
{#if $limitMapStore}
<img
src={logoInvite}
alt={translator._("menu.icon.open.invite")}
alt={_("menu.icon.open.invite")}
class="nes-pointer"
on:click|preventDefault={showInvite}
/>
<img
src={logoRegister}
alt={translator._("menu.icon.open.register")}
alt={_("menu.icon.open.register")}
class="nes-pointer"
on:click|preventDefault={register}
/>
{:else}
<img
src={logoWA}
alt={translator._("menu.icon.open.menu")}
class="nes-pointer"
on:click|preventDefault={showMenu}
/>
<img
src={logoTalk}
alt={translator._("menu.icon.open.chat")}
class="nes-pointer"
on:click|preventDefault={showChat}
/>
<img src={logoWA} alt={_("menu.icon.open.menu")} class="nes-pointer" on:click|preventDefault={showMenu} />
<img src={logoTalk} alt={_("menu.icon.open.chat")} class="nes-pointer" on:click|preventDefault={showChat} />
{/if}
</main>

18
front/src/Components/Menu/ProfileSubMenu.svelte
View file

@ -17,7 +17,7 @@
import btnProfileSubMenuCompanion from "../images/btn-menu-profile-companion.svg";
import Woka from "../Woka/Woka.svelte";
import Companion from "../Companion/Companion.svelte";
import { translator } from "../../Translator/Translator";
import { _ } from "../../Translator/Translator";
function disableMenuStores() {
menuVisiblilityStore.set(false);
@ -63,20 +63,20 @@
<div class="submenu">
<section>
<button type="button" class="nes-btn" on:click|preventDefault={openEditNameScene}>
<img src={btnProfileSubMenuIdentity} alt={translator._("menu.profile.edit.name")} />
<span class="btn-hover">{translator._("menu.profile.edit.name")}</span>
<img src={btnProfileSubMenuIdentity} alt={_("menu.profile.edit.name")} />
<span class="btn-hover">{_("menu.profile.edit.name")}</span>
</button>
<button type="button" class="nes-btn" on:click|preventDefault={openEditSkinScene}>
<Woka userId={-1} placeholderSrc="" width="26px" height="26px" />
<span class="btn-hover">{translator._("menu.profile.edit.woka")}</span>
<span class="btn-hover">{_("menu.profile.edit.woka")}</span>
</button>
<button type="button" class="nes-btn" on:click|preventDefault={openEditCompanionScene}>
<Companion userId={-1} placeholderSrc={btnProfileSubMenuCompanion} width="26px" height="26px" />
<span class="btn-hover">{translator._("menu.profile.edit.companion")}</span>
<span class="btn-hover">{_("menu.profile.edit.companion")}</span>
</button>
<button type="button" class="nes-btn" on:click|preventDefault={openEnableCameraScene}>
<img src={btnProfileSubMenuCamera} alt={translator._("menu.profile.edit.camera")} />
<span class="btn-hover">{translator._("menu.profile.edit.camera")}</span>
<img src={btnProfileSubMenuCamera} alt={_("menu.profile.edit.camera")} />
<span class="btn-hover">{_("menu.profile.edit.camera")}</span>
</button>
</section>
</div>
@ -90,12 +90,12 @@
</section>
<section>
<button type="button" class="nes-btn" on:click|preventDefault={logOut}
>{translator._("menu.profile.logout")}</button
>{_("menu.profile.logout")}</button
>
</section>
{:else}
<section>
<a type="button" class="nes-btn" href="/login">{translator._("menu.profile.login")}</a>
<a type="button" class="nes-btn" href="/login">{_("menu.profile.login")}</a>
</section>
{/if}
</div>

52
front/src/Components/Menu/SettingsSubMenu.svelte
View file

@ -4,7 +4,7 @@
import { HtmlUtils } from "../../WebRtc/HtmlUtils";
import { isMobile } from "../../Enum/EnvironmentVariable";
import { menuVisiblilityStore } from "../../Stores/MenuStore";
import { languages, translator } from "../../Translator/Translator";
import { languages, translator, _ } from "../../Translator/Translator";
let fullscreen: boolean = localUserStore.getFullscreen();
let notification: boolean = localUserStore.getNotification() === "granted";
@ -88,61 +88,61 @@
<div class="settings-main" on:submit|preventDefault={saveSetting}>
<section>
<h3>{translator._("menu.settings.game-quality.title")}</h3>
<h3>{_("menu.settings.game-quality.title")}</h3>
<div class="nes-select is-dark">
<select bind:value={valueGame}>
<option value={120}
>{isMobile()
? translator._("menu.settings.game-quality.short.high")
: translator._("menu.settings.game-quality.long.high")}</option
? _("menu.settings.game-quality.short.high")
: _("menu.settings.game-quality.long.high")}</option
>
<option value={60}
>{isMobile()
? translator._("menu.settings.game-quality.short.medium")
: translator._("menu.settings.game-quality.long.medium")}</option
? _("menu.settings.game-quality.short.medium")
: _("menu.settings.game-quality.long.medium")}</option
>
<option value={40}
>{isMobile()
? translator._("menu.settings.game-quality.short.minimum")
: translator._("menu.settings.game-quality.long.minimum")}</option
? _("menu.settings.game-quality.short.minimum")
: _("menu.settings.game-quality.long.minimum")}</option
>
<option value={20}
>{isMobile()
? translator._("menu.settings.game-quality.short.small")
: translator._("menu.settings.game-quality.long.small")}</option
? _("menu.settings.game-quality.short.small")
: _("menu.settings.game-quality.long.small")}</option
>
</select>
</div>
</section>
<section>
<h3>{translator._("menu.settings.video-quality.title")}</h3>
<h3>{_("menu.settings.video-quality.title")}</h3>
<div class="nes-select is-dark">
<select bind:value={valueVideo}>
<option value={30}
>{isMobile()
? translator._("menu.settings.video-quality.short.high")
: translator._("menu.settings.video-quality.long.high")}</option
? _("menu.settings.video-quality.short.high")
: _("menu.settings.video-quality.long.high")}</option
>
<option value={20}
>{isMobile()
? translator._("menu.settings.video-quality.short.medium")
: translator._("menu.settings.video-quality.long.medium")}</option
? _("menu.settings.video-quality.short.medium")
: _("menu.settings.video-quality.long.medium")}</option
>
<option value={10}
>{isMobile()
? translator._("menu.settings.video-quality.short.minimum")
: translator._("menu.settings.video-quality.long.minimum")}</option
? _("menu.settings.video-quality.short.minimum")
: _("menu.settings.video-quality.long.minimum")}</option
>
<option value={5}
>{isMobile()
? translator._("menu.settings.video-quality.short.small")
: translator._("menu.settings.video-quality.long.small")}</option
? _("menu.settings.video-quality.short.small")
: _("menu.settings.video-quality.long.small")}</option
>
</select>
</div>
</section>
<section>
<h3>{translator._("menu.settings.language.title")}</h3>
<h3>{_("menu.settings.language.title")}</h3>
<div class="nes-select is-dark">
<select class="languages-switcher" bind:value={valueLanguage}>
<!-- svelte-ignore missing-declaration -->
@ -153,9 +153,9 @@
</div>
</section>
<section class="settings-section-save">
<p>{translator._("menu.settings.save.warning")}</p>
<p>{_("menu.settings.save.warning")}</p>
<button type="button" class="nes-btn is-primary" on:click|preventDefault={saveSetting}
>{translator._("menu.settings.save.button")}</button
>{_("menu.settings.save.button")}</button
>
</section>
<section class="settings-section-noSaveOption">
@ -166,7 +166,7 @@
bind:checked={fullscreen}
on:change={changeFullscreen}
/>
<span>{translator._("menu.settings.fullscreen")}</span>
<span>{_("menu.settings.fullscreen")}</span>
</label>
<label>
<input
@ -175,7 +175,7 @@
bind:checked={notification}
on:change={changeNotification}
/>
<span>{translator._("menu.settings.notifications")}</span>
<span>{_("menu.settings.notifications")}</span>
</label>
<label>
<input
@ -184,7 +184,7 @@
bind:checked={forceCowebsiteTrigger}
on:change={changeForceCowebsiteTrigger}
/>
<span>{translator._("menu.settings.cowebsite-trigger")}</span>
<span>{_("menu.settings.cowebsite-trigger")}</span>
</label>
<label>
<input
@ -193,7 +193,7 @@
bind:checked={ignoreFollowRequests}
on:change={changeIgnoreFollowRequests}
/>
<span>{translator._("menu.settings.ignore-follow-request")}</span>
<span>{_("menu.settings.ignore-follow-request")}</span>
</label>
</section>
</div>

4
front/src/Components/Menu/TextGlobalMessage.svelte
View file

@ -5,7 +5,7 @@
import { AdminMessageEventTypes } from "../../Connexion/AdminMessagesService";
import type { Quill } from "quill";
import type { PlayGlobalMessageInterface } from "../../Connexion/ConnexionModels";
import { translator } from "../../Translator/Translator";
import { _ } from "../../Translator/Translator";
//toolbar
const toolbarOptions = [
@ -59,7 +59,7 @@
const { default: Quill } = await import("quill"); // eslint-disable-line @typescript-eslint/no-explicit-any
quill = new Quill(QUILL_EDITOR, {
placeholder: translator._("menu.global-message.enter"),
placeholder: _("menu.global-message.enter"),
theme: "snow",
modules: {
toolbar: toolbarOptions,