New branding
This commit is contained in:
parent
ce3fd8acd6
commit
30eb10ba36
@ -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)
|
const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME)
|
||||||
// TODO change
|
// 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.
|
// 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')
|
const launcherDir = process.env.CONFIG_DIRECT_PATH || require('electron').remote.app.getPath('userData')
|
||||||
|
@ -14,43 +14,25 @@ const minecraftAgent = {
|
|||||||
name: 'Minecraft',
|
name: 'Minecraft',
|
||||||
version: 1
|
version: 1
|
||||||
}
|
}
|
||||||
const authpath = 'https://authserver.mojang.com'
|
const authpath = 'https://terebrauth.ts3miki.fr'
|
||||||
const statuses = [
|
const statuses = [
|
||||||
{
|
{
|
||||||
service: 'sessionserver.mojang.com',
|
service: 'terebros.fr',
|
||||||
status: 'grey',
|
status: 'grey',
|
||||||
name: 'Multiplayer Session Service',
|
name: 'Site web',
|
||||||
|
essential: false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
service: 'terebrauth.ts3miki.fr,
|
||||||
|
status: 'grey',
|
||||||
|
name: 'Serveur authentification',
|
||||||
essential: true
|
essential: true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
service: 'authserver.mojang.com',
|
service: 'play.terebros.fr',
|
||||||
status: 'grey',
|
status: 'grey',
|
||||||
name: 'Authentication Service',
|
name: 'Serveur Minecraft',
|
||||||
essential: true
|
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){
|
if(error || response.statusCode !== 200){
|
||||||
logger.warn('Unable to retrieve Mojang status.')
|
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)
|
//reject(error || response.statusCode)
|
||||||
for(let i=0; i<statuses.length; i++){
|
for(let i=0; i<statuses.length; i++){
|
||||||
statuses[i].status = 'grey'
|
statuses[i].status = 'grey'
|
||||||
|
@ -124,7 +124,7 @@ document.getElementById('avatarOverlay').onclick = (e) => {
|
|||||||
|
|
||||||
// Bind selected account
|
// Bind selected account
|
||||||
function updateSelectedAccount(authUser){
|
function updateSelectedAccount(authUser){
|
||||||
let username = 'No Account Selected'
|
let username = 'Aucun compte sélectionné'
|
||||||
if(authUser != null){
|
if(authUser != null){
|
||||||
if(authUser.displayName != null){
|
if(authUser.displayName != null){
|
||||||
username = authUser.displayName
|
username = authUser.displayName
|
||||||
@ -144,14 +144,14 @@ function updateSelectedServer(serv){
|
|||||||
}
|
}
|
||||||
ConfigManager.setSelectedServer(serv != null ? serv.getID() : null)
|
ConfigManager.setSelectedServer(serv != null ? serv.getID() : null)
|
||||||
ConfigManager.save()
|
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){
|
if(getCurrentView() === VIEWS.settings){
|
||||||
animateModsTabRefresh()
|
animateModsTabRefresh()
|
||||||
}
|
}
|
||||||
setLaunchEnabled(serv != null)
|
setLaunchEnabled(serv != null)
|
||||||
}
|
}
|
||||||
// Real text is set in uibinder.js on distributionIndexDone.
|
// 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) => {
|
server_selection_button.onclick = (e) => {
|
||||||
e.target.blur()
|
e.target.blur()
|
||||||
toggleServerSelection(true)
|
toggleServerSelection(true)
|
||||||
@ -159,7 +159,7 @@ server_selection_button.onclick = (e) => {
|
|||||||
|
|
||||||
// Update Mojang Status Color
|
// Update Mojang Status Color
|
||||||
const refreshMojangStatuses = async function(){
|
const refreshMojangStatuses = async function(){
|
||||||
loggerLanding.log('Refreshing Mojang Statuses..')
|
loggerLanding.log('Rafraichissement des status...')
|
||||||
|
|
||||||
let status = 'grey'
|
let status = 'grey'
|
||||||
let tooltipEssentialHTML = ''
|
let tooltipEssentialHTML = ''
|
||||||
|
@ -54,19 +54,7 @@ function shakeError(element){
|
|||||||
* @param {string} value The email value.
|
* @param {string} value The email value.
|
||||||
*/
|
*/
|
||||||
function validateEmail(value){
|
function validateEmail(value){
|
||||||
if(value){
|
if(value){} else {
|
||||||
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 {
|
|
||||||
lu = false
|
lu = false
|
||||||
showError(loginEmailError, Lang.queryJS('login.error.requiredValue'))
|
showError(loginEmailError, Lang.queryJS('login.error.requiredValue'))
|
||||||
loginDisabled(true)
|
loginDisabled(true)
|
||||||
|
@ -1,48 +1,48 @@
|
|||||||
{
|
{
|
||||||
"html": {
|
"html": {
|
||||||
"avatarOverlay": "Edit"
|
"avatarOverlay": "Modifier"
|
||||||
},
|
},
|
||||||
"js": {
|
"js": {
|
||||||
"login": {
|
"login": {
|
||||||
"error": {
|
"error": {
|
||||||
"invalidValue": "* Invalid Value",
|
"invalidValue": "* Valeur invalide",
|
||||||
"requiredValue": "* Required",
|
"requiredValue": "* Requis",
|
||||||
"userMigrated": {
|
"userMigrated": {
|
||||||
"title": "Error During Login:<br>Invalid Credentials",
|
"title": "Erreur:<br>Identifiants invalides",
|
||||||
"desc": "You've attempted to login with a migrated account. Try again using the account email as the username."
|
"desc": "You've attempted to login with a migrated account. Try again using the account email as the username."
|
||||||
},
|
},
|
||||||
"invalidCredentials": {
|
"invalidCredentials": {
|
||||||
"title": "Error During Login:<br>Invalid Credentials",
|
"title": "Erreur:<br>Identifiants invalides",
|
||||||
"desc": "The email or password you've entered is incorrect. Please try again."
|
"desc": "Le pseudo ou le mot de passe entré est invalide."
|
||||||
},
|
},
|
||||||
"rateLimit": {
|
"rateLimit": {
|
||||||
"title": "Error During Login:<br>Too Many Attempts",
|
"title": "Erreur:<br>Trop d'essais d'affilé",
|
||||||
"desc": "There have been too many login attempts with this account recently. Please try again later."
|
"desc": "Il y a eu beaucoup de tentatives de connection à votre compte récemment, veuillez patienter quelques instants."
|
||||||
},
|
},
|
||||||
"noInternet": {
|
"noInternet": {
|
||||||
"title": "Error During Login:<br>No Internet Connection",
|
"title": "Erreur:<br>Pas de connection internet.",
|
||||||
"desc": "You must be connected to the internet in order to login. Please connect and try again."
|
"desc": "Vous devez être connectés à Internet pour faire cette action. Connectez-vous et réessayez."
|
||||||
},
|
},
|
||||||
"authDown": {
|
"authDown": {
|
||||||
"title": "Error During Login:<br>Authentication Server Offline",
|
"title": "Erreur:<br>Serveur d'authentification hors ligne.",
|
||||||
"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 <a href=\"https://help.mojang.com/\">Mojang's help portal</a>."
|
"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": {
|
"notPaid": {
|
||||||
"title": "Error During Login:<br>Game Not Purchased",
|
"title": "Erreur:<br>Compte restreint",
|
||||||
"desc": "The account you are trying to login with has not purchased a copy of Minecraft.<br>You may purchase a copy on <a href=\"https://minecraft.net/\">Minecraft.net</a>"
|
"desc": "Le compte que vous avez utilisé est actuellement restreint et ne peut pas se connecter.
|
||||||
},
|
},
|
||||||
"unknown": {
|
"unknown": {
|
||||||
"title": "Error During Login:<br>Unknown Error"
|
"title": "Erreur:<br>Erreur inconnue"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"login": "LOGIN",
|
"login": "SE CONNECTER",
|
||||||
"loggingIn": "LOGGING IN",
|
"loggingIn": "CONNECTION EN COURS",
|
||||||
"success": "SUCCESS",
|
"success": "SUCCÈS",
|
||||||
"tryAgain": "Try Again"
|
"tryAgain": "Réessayer"
|
||||||
},
|
},
|
||||||
"landing": {
|
"landing": {
|
||||||
"launch": {
|
"launch": {
|
||||||
"pleaseWait": "Please wait.."
|
"pleaseWait": "Merci de patienter..."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user