Merge branch 'master' of https://github.com/Tomarok/BTCV-Launcher

2023-04-30 19:08:54 +02:00 · 2023-04-30 19:08:54 +02:00 · bc892107d8
commit bc892107d8
parent 59f12fdf3b ef07ec814e
8 changed files with 1085 additions and 1814 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="c7fc7215-5a14-4d6e-8a38-d34bcd9137f5" name="Changes" comment="Update logo and loading screen">
+      <change afterPath="$PROJECT_DIR$/app/assets/lang/fr_FR.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/app.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.ejs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/assets/js/preloader.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/assets/js/preloader.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/frame.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/app/frame.ejs" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectId" id="2NjXulp14l9hE8PfQRAsdpoG2az" />
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
+  <component name="ProjectViewState">
+    <option name="autoscrollFromSource" value="true" />
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+    <option name="showMembers" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/Users/tomarok/Github/Perso/BTCV-Launcher&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.standard&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.standard&quot;: &quot;&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;settings.javascript.linters.eslint&quot;,
+    &quot;ts.external.directory.path&quot;: &quot;/Users/tomarok/Library/Application Support/JetBrains/Toolbox/apps/WebStorm/ch-0/231.8109.174/WebStorm.app/Contents/plugins/javascript-impl/jsLanguageServicesImpl/external&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  }
+}</component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$" />
+      <recent name="$PROJECT_DIR$/app" />
+    </key>
+  </component>
+  <component name="RunManager">
+    <configuration name="start" type="js.build_tools.npm" nameIsGenerated="true">
+      <package-json value="$PROJECT_DIR$/package.json" />
+      <command value="start" />
+      <node-interpreter value="project" />
+      <envs />
+      <method v="2" />
+    </configuration>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="c7fc7215-5a14-4d6e-8a38-d34bcd9137f5" name="Changes" comment="" />
+      <created>1680178690982</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1680178690982</updated>
+      <workItem from="1680178694227" duration="6132000" />
+      <workItem from="1680264149059" duration="598000" />
+      <workItem from="1682597151301" duration="1539000" />
+      <workItem from="1682599215708" duration="3000" />
+      <workItem from="1682599222418" duration="3037000" />
+      <workItem from="1682604704565" duration="2270000" />
+    </task>
+    <task id="LOCAL-00001" summary="Editing ico">
+      <created>1682604080148</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1682604080148</updated>
+    </task>
+    <task id="LOCAL-00002" summary="Update logo and loading screen">
+      <created>1682606030929</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1682606030929</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
+    <MESSAGE value="Editing ico" />
+    <MESSAGE value="Update logo and loading screen" />
+    <option name="LAST_COMMIT_MESSAGE" value="Update logo and loading screen" />
+  </component>
+</project>
--- a/app/app.ejs
+++ b/app/app.ejs
@ -1,7 +1,7 @@
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<html lang="fr" xmlns="http://www.w3.org/1999/xhtml">
 <head>
    <meta charset="utf-8" http-equiv="Content-Security-Policy" content="script-src 'self' 'sha256-In6B8teKZQll5heMl9bS7CESTbGvuAt3VVV86BUQBDk='"/>
-    <title>Helios Launcher</title>
+    <title>BTCV Launcher</title>
    <script src="./assets/js/scripts/uicore.js"></script>
    <script src="./assets/js/scripts/uibinder.js"></script>
    <link type="text/css" rel="stylesheet" href="./assets/css/launcher.css">
--- a/app/assets/images/LoadingText.png
+++ b/app/assets/images/LoadingText.png
--- a/app/assets/js/preloader.js
+++ b/app/assets/js/preloader.js
@ -23,7 +23,7 @@ DistroAPI['commonDir'] = ConfigManager.getCommonDirectory()
 DistroAPI['instanceDir'] = ConfigManager.getInstanceDirectory()

 // Load Strings
-LangLoader.loadLanguage('en_US')
+LangLoader.loadLanguage('fr_FR')

 /**
 * 
--- a/app/assets/lang/fr_FR.json
+++ b/app/assets/lang/fr_FR.json
@ -0,0 +1,49 @@
+{
+  "html": {
+    "avatarOverlay": "Modifier"
+  },
+  "js": {
+    "login": {
+      "error": {
+        "invalidValue": "* Valeur invalide",
+        "requiredValue": "* Champ obligatoire",
+        "userMigrated": {
+          "title": "Erreur lors de la connexion :<br>Identifiants invalides",
+          "desc": "Vous avez tenté de vous connecter avec un compte migré. Veuillez réessayer en utilisant l'adresse e-mail du compte comme nom d'utilisateur."
+        },
+        "invalidCredentials": {
+          "title": "Erreur lors de la connexion :<br>Identifiants invalides",
+          "desc": "L'adresse e-mail ou le mot de passe que vous avez entré est incorrect. Veuillez réessayer."
+        },
+        "rateLimit": {
+          "title": "Erreur lors de la connexion :<br>Trop de tentatives",
+          "desc": "Il y a eu trop de tentatives de connexion avec ce compte récemment. Veuillez réessayer plus tard."
+        },
+        "noInternet": {
+          "title": "Erreur lors de la connexion :<br>Pas de connexion Internet",
+          "desc": "Vous devez être connecté à Internet pour vous connecter. Veuillez vous connecter et réessayer."
+        },
+        "authDown": {
+          "title": "Erreur lors de la connexion :<br>Serveur d'authentification hors ligne",
+          "desc": "Le serveur d'authentification de Mojang est actuellement hors ligne ou inaccessible. Veuillez patienter un peu et réessayer. Vous pouvez vérifier l'état du serveur sur <a href="https://help.mojang.com/\">le portail d'aide de Mojang</a>."
+        },
+        "notPaid": {
+          "title": "Erreur lors de la connexion :<br>Jeu non acheté",
+          "desc": "Le compte que vous essayez de vous connecter n'a pas acheté une copie de Minecraft. Vous pouvez acheter une copie sur <a href="https://minecraft.net/\">Minecraft.net</a>."
+        },
+        "unknown": {
+          "title": "Erreur lors de la connexion :<br>Erreur inconnue"
+        }
+      },
+      "login": "CONNEXION",
+      "loggingIn": "CONNEXION EN COURS",
+      "success": "SUCCÈS",
+      "tryAgain": "Réessayer"
+    },
+    "landing": {
+      "launch": {
+        "pleaseWait": "Veuillez patienter.."
+      }
+    }
+  }
+}
--- a/app/frame.ejs
+++ b/app/frame.ejs
@ -13,7 +13,7 @@
        <% } else{ %>
            <div id="frameContentWin">
                <div id="frameTitleDock">
-                    <span id="frameTitleText"></span>
+                    <span id="frameTitleText">BTCV Launcher</span>
                </div>
                <div id="frameButtonDockWin">
                    <button class="frameButton fMb" id="frameButton_minimize" tabIndex="-1">
--- a/build/logo.png
+++ b/build/logo.png
--- a/package-lock.json
+++ b/package-lock.json