From 30eb10ba3674dc5a9d723fce46bc77371493ac17 Mon Sep 17 00:00:00 2001 From: Aeris1One Date: Wed, 15 Jul 2020 22:01:23 +0200 Subject: [PATCH] New branding --- app/assets/js/configmanager.js | 2 +- app/assets/js/mojang.js | 42 +++++++++----------------------- app/assets/js/scripts/landing.js | 8 +++--- app/assets/js/scripts/login.js | 14 +---------- app/assets/lang/en_US.json | 40 +++++++++++++++--------------- 5 files changed, 38 insertions(+), 68 deletions(-) diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index 65a73061..8364af71 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -6,7 +6,7 @@ const logger = require('./loggerutil')('%c[ConfigManager]', 'color: #a02d2a; fon const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME) // TODO change -const dataPath = path.join(sysRoot, '.helioslauncher') +const dataPath = path.join(sysRoot, '.terebros') // Forked processes do not have access to electron, so we have this workaround. const launcherDir = process.env.CONFIG_DIRECT_PATH || require('electron').remote.app.getPath('userData') diff --git a/app/assets/js/mojang.js b/app/assets/js/mojang.js index 75143836..517bf940 100644 --- a/app/assets/js/mojang.js +++ b/app/assets/js/mojang.js @@ -14,43 +14,25 @@ const minecraftAgent = { name: 'Minecraft', version: 1 } -const authpath = 'https://authserver.mojang.com' +const authpath = 'https://terebrauth.ts3miki.fr' const statuses = [ { - service: 'sessionserver.mojang.com', + service: 'terebros.fr', status: 'grey', - name: 'Multiplayer Session Service', + name: 'Site web', + essential: false + }, + { + service: 'terebrauth.ts3miki.fr, + status: 'grey', + name: 'Serveur authentification', essential: true }, { - service: 'authserver.mojang.com', + service: 'play.terebros.fr', status: 'grey', - name: 'Authentication Service', + name: 'Serveur Minecraft', essential: true - }, - { - service: 'textures.minecraft.net', - status: 'grey', - name: 'Minecraft Skins', - essential: false - }, - { - service: 'api.mojang.com', - status: 'grey', - name: 'Public API', - essential: false - }, - { - service: 'minecraft.net', - status: 'grey', - name: 'Minecraft.net', - essential: false - }, - { - service: 'account.mojang.com', - status: 'grey', - name: 'Mojang Accounts Website', - essential: false } ] @@ -97,7 +79,7 @@ exports.status = function(){ if(error || response.statusCode !== 200){ logger.warn('Unable to retrieve Mojang status.') - logger.debug('Error while retrieving Mojang statuses:', error) + logger.debug('Error while retrieving Terebros statuses:', error) //reject(error || response.statusCode) for(let i=0; i { // Bind selected account function updateSelectedAccount(authUser){ - let username = 'No Account Selected' + let username = 'Aucun compte sélectionné' if(authUser != null){ if(authUser.displayName != null){ username = authUser.displayName @@ -144,14 +144,14 @@ function updateSelectedServer(serv){ } ConfigManager.setSelectedServer(serv != null ? serv.getID() : null) ConfigManager.save() - server_selection_button.innerHTML = '\u2022 ' + (serv != null ? serv.getName() : 'No Server Selected') + server_selection_button.innerHTML = '\u2022 ' + (serv != null ? serv.getName() : 'Aucun serveur sélectionné') if(getCurrentView() === VIEWS.settings){ animateModsTabRefresh() } setLaunchEnabled(serv != null) } // Real text is set in uibinder.js on distributionIndexDone. -server_selection_button.innerHTML = '\u2022 Loading..' +server_selection_button.innerHTML = '\u2022 Chargement...' server_selection_button.onclick = (e) => { e.target.blur() toggleServerSelection(true) @@ -159,7 +159,7 @@ server_selection_button.onclick = (e) => { // Update Mojang Status Color const refreshMojangStatuses = async function(){ - loggerLanding.log('Refreshing Mojang Statuses..') + loggerLanding.log('Rafraichissement des status...') let status = 'grey' let tooltipEssentialHTML = '' diff --git a/app/assets/js/scripts/login.js b/app/assets/js/scripts/login.js index 34078bd1..6080b301 100644 --- a/app/assets/js/scripts/login.js +++ b/app/assets/js/scripts/login.js @@ -54,19 +54,7 @@ function shakeError(element){ * @param {string} value The email value. */ function validateEmail(value){ - if(value){ - if(!basicEmail.test(value) && !validUsername.test(value)){ - showError(loginEmailError, Lang.queryJS('login.error.invalidValue')) - loginDisabled(true) - lu = false - } else { - loginEmailError.style.opacity = 0 - lu = true - if(lp){ - loginDisabled(false) - } - } - } else { + if(value){} else { lu = false showError(loginEmailError, Lang.queryJS('login.error.requiredValue')) loginDisabled(true) diff --git a/app/assets/lang/en_US.json b/app/assets/lang/en_US.json index 25b34c24..501cc355 100644 --- a/app/assets/lang/en_US.json +++ b/app/assets/lang/en_US.json @@ -1,48 +1,48 @@ { "html": { - "avatarOverlay": "Edit" + "avatarOverlay": "Modifier" }, "js": { "login": { "error": { - "invalidValue": "* Invalid Value", - "requiredValue": "* Required", + "invalidValue": "* Valeur invalide", + "requiredValue": "* Requis", "userMigrated": { - "title": "Error During Login:
Invalid Credentials", + "title": "Erreur:
Identifiants invalides", "desc": "You've attempted to login with a migrated account. Try again using the account email as the username." }, "invalidCredentials": { - "title": "Error During Login:
Invalid Credentials", - "desc": "The email or password you've entered is incorrect. Please try again." + "title": "Erreur:
Identifiants invalides", + "desc": "Le pseudo ou le mot de passe entré est invalide." }, "rateLimit": { - "title": "Error During Login:
Too Many Attempts", - "desc": "There have been too many login attempts with this account recently. Please try again later." + "title": "Erreur:
Trop d'essais d'affilé", + "desc": "Il y a eu beaucoup de tentatives de connection à votre compte récemment, veuillez patienter quelques instants." }, "noInternet": { - "title": "Error During Login:
No Internet Connection", - "desc": "You must be connected to the internet in order to login. Please connect and try again." + "title": "Erreur:
Pas de connection internet.", + "desc": "Vous devez être connectés à Internet pour faire cette action. Connectez-vous et réessayez." }, "authDown": { - "title": "Error During Login:
Authentication Server Offline", - "desc": "Mojang's authentication server is currently offline or unreachable. Please wait a bit and try again. You can check the status of the server on Mojang's help portal." + "title": "Erreur:
Serveur d'authentification hors ligne.", + "desc": "TerebrAuth est actuellement non accessible, merci de patienter quelques instants avant de joindre le support : il ne peut agir que d'un problème technique. }, "notPaid": { - "title": "Error During Login:
Game Not Purchased", - "desc": "The account you are trying to login with has not purchased a copy of Minecraft.
You may purchase a copy on Minecraft.net" + "title": "Erreur:
Compte restreint", + "desc": "Le compte que vous avez utilisé est actuellement restreint et ne peut pas se connecter. }, "unknown": { - "title": "Error During Login:
Unknown Error" + "title": "Erreur:
Erreur inconnue" } }, - "login": "LOGIN", - "loggingIn": "LOGGING IN", - "success": "SUCCESS", - "tryAgain": "Try Again" + "login": "SE CONNECTER", + "loggingIn": "CONNECTION EN COURS", + "success": "SUCCÈS", + "tryAgain": "Réessayer" }, "landing": { "launch": { - "pleaseWait": "Please wait.." + "pleaseWait": "Merci de patienter..." } } }