Skip to content

Commit

Permalink
Magyarítások
Browse files Browse the repository at this point in the history
  • Loading branch information
pepyta committed Mar 10, 2019
1 parent f9f06d2 commit 95bb20d
Show file tree
Hide file tree
Showing 9 changed files with 96 additions and 88 deletions.
2 changes: 1 addition & 1 deletion app/app.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div id="loadingContainer">
<div id="loadingContent">
<div id="loadSpinnerContainer">
<img id="loadCenterImage" src="assets/images/NewHopeIcon.png">
<img id="loadCenterImage" src="assets/images/NewHopeWideLogo.png">
<!--<img id="loadSpinnerImage" class="rotating" src="assets/images/newhopelogo2.png">-->
</div>
</div>
Expand Down
11 changes: 9 additions & 2 deletions app/assets/css/launcher.css
Original file line number Diff line number Diff line change
Expand Up @@ -349,12 +349,14 @@ body, button {
#welcomeButton:hover #welcomeSVG,
#welcomeButton:focus #welcomeSVG {
-webkit-filter: drop-shadow(0px 0px 2px #fff);
filter: drop-shadow(0px 0px 2px #fff);
}
#welcomeButton:active #welcomeSVG .arrowLine {
stroke: #c7c7c7;
}
#welcomeButton:active #welcomeSVG {
-webkit-filter: drop-shadow(0px 0px 2px #c7c7c7);
filter: drop-shadow(0px 0px 2px #c7c7c7);
}
#welcomeButton:disabled #welcomeSVG .arrowLine {
stroke: rgba(255, 255, 255, 0.75);
Expand Down Expand Up @@ -652,12 +654,14 @@ body, button {
#loginButton:hover #loginSVG,
#loginButton:focus #loginSVG {
-webkit-filter: drop-shadow(0px 0px 2px #fff);
filter: drop-shadow(0px 0px 2px #fff);
}
#loginButton:active #loginSVG .arrowLine {
stroke: #c7c7c7;
}
#loginButton:active #loginSVG {
-webkit-filter: drop-shadow(0px 0px 2px #c7c7c7);
filter: drop-shadow(0px 0px 2px #c7c7c7);
}
#loginButton:disabled #loginSVG .arrowLine {
stroke: rgba(255, 255, 255, 0.75);
Expand Down Expand Up @@ -2315,7 +2319,6 @@ input:checked + .toggleSwitchSlider:before {
width: 33%;
display: inline-flex;
justify-content: center;
le
}
#landingContainer > #lower > #left #content {
position: relative;
Expand Down Expand Up @@ -2600,6 +2603,7 @@ input:checked + .toggleSwitchSlider:before {
#newsNavigateRight:hover #newsNavigationRightSVG,
#newsNavigateRight:focus #newsNavigationRightSVG {
-webkit-filter: drop-shadow(0px 0px 2px #fff);
filter: drop-shadow(0px 0px 2px #fff);
}
#newsNavigateLeft:active #newsNavigationLeftSVG .arrowLine,
#newsNavigateRight:active #newsNavigationRightSVG .arrowLine {
Expand All @@ -2608,6 +2612,7 @@ input:checked + .toggleSwitchSlider:before {
#newsNavigateLeft:active #newsNavigationLeftSVG,
#newsNavigateRight:active #newsNavigationRightSVG {
-webkit-filter: drop-shadow(0px 0px 2px #c7c7c7);
filter: drop-shadow(0px 0px 2px #c7c7c7);
}
#newsNavigateLeft:disabled #newsNavigationLeftSVG .arrowLine,
#newsNavigateRight:disabled #newsNavigationRightSVG .arrowLine {
Expand Down Expand Up @@ -3167,12 +3172,14 @@ input:checked + .toggleSwitchSlider:before {
#newsButton:hover #newsButtonSVG,
#newsButton:focus #newsButtonSVG {
-webkit-filter: drop-shadow(0px 0px 2px #fff);
filter: drop-shadow(0px 0px 2px #fff);
}
#newsButton:active #newsButtonSVG .arrowLine {
stroke: #c7c7c7;
}
#newsButton:active #newsButtonSVG {
-webkit-filter: drop-shadow(0px 0px 2px #c7c7c7);
filter: drop-shadow(0px 0px 2px #c7c7c7);
}
#newsButton:disabled #newsButtonSVG .arrowLine {
stroke: rgba(255, 255, 255, 0.75);
Expand Down Expand Up @@ -3573,7 +3580,7 @@ input:checked + .toggleSwitchSlider:before {
/* Server listing image. */
.serverListingImg {
margin: 0px 10px 0px 5px;
border: 1px solid #fff;
/*border: 1px solid #fff;*/
height: 50px;
width: 50px;
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/js/authmanager.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const loggerSuccess = LoggerUtil('%c[AuthManager]', 'color: #209b07; font-weight
exports.addAccount = async function(username, password){
try {
//const session = await Mojang.authenticate(username, "", ConfigManager.getClientToken())
const ret = ConfigManager.addAuthAccount("", username, username, username)
const ret = ConfigManager.addAuthAccount(username, username, username, username)
ConfigManager.save()
return ret
} catch (err){
Expand Down
39 changes: 20 additions & 19 deletions app/assets/js/processbuilder.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const logger = LoggerUtil('%c[ProcessBuilder]', 'color: #003996; font-weight: bo

class ProcessBuilder {

constructor(distroServer, versionData, authUser){
constructor(distroServer, versionData, authUser, launcherVersion){
this.gameDir = path.join(ConfigManager.getInstanceDirectory(), distroServer.getID())
this.commonDir = ConfigManager.getCommonDirectory()
this.server = distroServer
Expand Down Expand Up @@ -190,7 +190,7 @@ class ProcessBuilder {
*/
_requiresAbsolute(){
try {
const ver = this.forgeData.id.split('-')[2]
const ver = this.versionData.id.split('-')[2]
const pts = ver.split('.')
const min = [14, 23, 3, 2655]
for(let i=0; i<pts.length; i++){
Expand Down Expand Up @@ -280,33 +280,37 @@ class ProcessBuilder {
}
}

/**
* Construct the argument array that will be passed to the JVM process.
* This function is for 1.12 and below.
*
* @param {Array.<Object>} mods An array of enabled mods which will be launched with this process.
* @param {string} tempNativePath The path to store the native libraries.
* @returns {Array.<string>} An array containing the full JVM arguments for this process.
*/
_constructJVMArguments112(mods, tempNativePath){
let args = ['-Xmx' + ConfigManager.getMaxRAM(),
'-Xms' + ConfigManager.getMinRAM(),
'-Djava.library.path=' + tempNativePath,
'-cp',
this.classpathArg(mods, tempNativePath).join(process.platform === 'win32' ? ';' : ':'),
this.versionData.mainClass]

let args = []

// Classpath Argument
args.push('-cp')
args.push(this.classpathArg(mods, tempNativePath).join(process.platform === 'win32' ? ';' : ':'))

// Java Arguments
if(process.platform === 'darwin'){
args.unshift('-Xdock:name=NewHope')
args.unshift('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns'))
args.push('-Xdock:name=NewHope')
args.push('-Xdock:icon=' + path.join(__dirname, '..', 'images', 'minecraft.icns'))
}
args.push('-Xmx' + ConfigManager.getMaxRAM())
args.push('-Xms' + ConfigManager.getMinRAM())
args = args.concat(ConfigManager.getJVMOptions())
args.push('-Djava.library.path=' + tempNativePath)

// Main Java Class
args.push(this.forgeData.mainClass)
args.push(this.versionData.mainClass)

// Forge Arguments
args = args.concat(this._resolveForgeArgs())
//args = args.concat(this._resolveForgeArgs())

return args
}
Expand Down Expand Up @@ -340,7 +344,7 @@ class ProcessBuilder {
args = args.concat(ConfigManager.getJVMOptions())

// Main Java Class
args.push(this.forgeData.mainClass)
args.push(this.versionData.mainClass)

// Vanilla Arguments
args = args.concat(this.versionData.arguments.game)
Expand Down Expand Up @@ -451,7 +455,7 @@ class ProcessBuilder {
}

// Forge Specific Arguments
args = args.concat(this.forgeData.arguments.game)
args = args.concat(this.versionData.arguments.game)

// Filter null values
args = args.filter(arg => {
Expand Down Expand Up @@ -597,18 +601,15 @@ class ProcessBuilder {
fs.ensureDirSync(tempNativePath)
for(let i=0; i<libArr.length; i++){
const lib = libArr[i]

if(Library.validateRules(lib.rules)){
if(Library.validateRules(lib.rules, lib.natives)){
if(lib.natives == null){
const dlInfo = lib.downloads
const artifact = dlInfo.artifact
const to = path.join(this.libPath, artifact.path)
libs.push(to)
} else {
// Extract the native library.
const extractInst = lib.extract
console.log(lib)
const exclusionArr = extractInst.exclude
const exclusionArr = lib.extract != null ? lib.extract.exclude : ['META-INF/']
const artifact = lib.downloads.classifiers[lib.natives[Library.mojangFriendlyOS()].replace('${arch}', process.arch.replace('x', ''))]

// Location of native zip.
Expand Down
2 changes: 1 addition & 1 deletion app/assets/js/scripts/landing.js
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ function dlAsync(login = true){
if(login && allGood) {
const authUser = ConfigManager.getSelectedAccount()
loggerLaunchSuite.log(`Sending selected account (${authUser.displayName}) to ProcessBuilder.`)
let pb = new ProcessBuilder(serv, versionData, forgeData, authUser, remote.app.getVersion())
let pb = new ProcessBuilder(serv, versionData, authUser, remote.app.getVersion())
setLaunchDetails('Launching game..')

// Attach a temporary listener to the client output.
Expand Down
34 changes: 17 additions & 17 deletions app/assets/js/scripts/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ function bindAuthAccountSelect(){
}
}
val.setAttribute('selected', '')
val.innerHTML = 'Selected Account &#10004;'
val.innerHTML = 'Kiválaszott felhasználó &#10004;'
setSelectedAccount(val.closest('.settingsAuthAccount').getAttribute('uuid'))
}
})
Expand Down Expand Up @@ -430,14 +430,14 @@ function populateAuthAccounts(){
<div class="settingsAuthAccountRight">
<div class="settingsAuthAccountDetails">
<div class="settingsAuthAccountDetailPane">
<div class="settingsAuthAccountDetailTitle">Username</div>
<div class="settingsAuthAccountDetailTitle">Felhasználónév</div>
<div class="settingsAuthAccountDetailValue">${acc.displayName}</div>
</div>
</div>
<div class="settingsAuthAccountActions">
<button class="settingsAuthAccountSelect" ${selectedUUID === acc.uuid ? 'selected>Selected Account &#10004;' : '>Select Account'}</button>
<button class="settingsAuthAccountSelect" ${selectedUUID === acc.uuid ? 'selected>Kiválaszott felhasználó &#10004;' : '>Felhasználó kiválasztása'}</button>
<div class="settingsAuthAccountWrapper">
<button class="settingsAuthAccountLogOut">Log Out</button>
<button class="settingsAuthAccountLogOut">Kijelentkezés</button>
</div>
</div>
</div>
Expand Down Expand Up @@ -862,7 +862,7 @@ function loadSelectedServerOnModsTab(){
<path class="cls-1" d="M100.93,65.54C89,62,68.18,55.65,63.54,52.13c2.7-5.23,18.8-19.2,28-27.55C81.36,31.74,63.74,43.87,58.09,45.3c-2.41-5.37-3.61-26.52-4.37-39-.77,12.46-2,33.64-4.36,39-5.7-1.46-23.3-13.57-33.49-20.72,9.26,8.37,25.39,22.36,28,27.55C39.21,55.68,18.47,62,6.52,65.55c12.32-2,33.63-6.06,39.34-4.9-.16,5.87-8.41,26.16-13.11,37.69,6.1-10.89,16.52-30.16,21-33.9,4.5,3.79,14.93,23.09,21,34C70,86.84,61.73,66.48,61.59,60.65,67.36,59.49,88.64,63.52,100.93,65.54Z"/>
<circle class="cls-2" cx="53.73" cy="53.9" r="38"/>
</svg>
<span class="serverListingStarTooltip">Main Server</span>
<span class="serverListingStarTooltip">Legfrisseb stabil verzió</span>
</div>` : ''}
</div>
</div>
Expand Down Expand Up @@ -1117,12 +1117,12 @@ function populateJavaExecDetails(execPath){
jg._validateJavaBinary(execPath).then(v => {
if(v.valid){
if(v.version.major < 9) {
settingsJavaExecDetails.innerHTML = `Selected: Java ${v.version.major} Update ${v.version.update} (x${v.arch})`
settingsJavaExecDetails.innerHTML = `Kiválasztva: Java ${v.version.major} Update ${v.version.update} (x${v.arch})`
} else {
settingsJavaExecDetails.innerHTML = `Selected: Java ${v.version.major}.${v.version.minor}.${v.version.revision} (x${v.arch})`
settingsJavaExecDetails.innerHTML = `Kiválasztva: Java ${v.version.major}.${v.version.minor}.${v.version.revision} (x${v.arch})`
}
} else {
settingsJavaExecDetails.innerHTML = 'Invalid Selection'
settingsJavaExecDetails.innerHTML = 'Érvénytelen kiválasztás'
}
})
}
Expand Down Expand Up @@ -1173,11 +1173,11 @@ function isPrerelease(version){
function populateVersionInformation(version, valueElement, titleElement, checkElement){
valueElement.innerHTML = version
if(isPrerelease(version)){
titleElement.innerHTML = 'Pre-release'
titleElement.innerHTML = 'Béta verzió'
titleElement.style.color = '#ff886d'
checkElement.style.background = '#ff886d'
} else {
titleElement.innerHTML = 'Stable Release'
titleElement.innerHTML = 'Stabil kiadás'
titleElement.style.color = null
checkElement.style.background = null
}
Expand Down Expand Up @@ -1216,7 +1216,7 @@ function populateReleaseNotes(){
},
timeout: 2500
}).catch(err => {
settingsAboutChangelogText.innerHTML = 'Failed to load release notes.'
settingsAboutChangelogText.innerHTML = 'Nem sikerült betölteni a frissítési jegyzéket.'
})
}

Expand Down Expand Up @@ -1264,27 +1264,27 @@ function settingsUpdateButtonStatus(text, disabled = false, handler = null){
*/
function populateSettingsUpdateInformation(data){
if(data != null){
settingsUpdateTitle.innerHTML = `New ${isPrerelease(data.version) ? 'Pre-release' : 'Release'} Available`
settingsUpdateTitle.innerHTML = `Új ${isPrerelease(data.version) ? 'béta verzió' : 'kiadás'} érhető el`
settingsUpdateChangelogCont.style.display = null
settingsUpdateChangelogTitle.innerHTML = data.releaseName
settingsUpdateChangelogText.innerHTML = data.releaseNotes
populateVersionInformation(data.version, settingsUpdateVersionValue, settingsUpdateVersionTitle, settingsUpdateVersionCheck)

if(process.platform === 'darwin'){
settingsUpdateButtonStatus('Download from GitHub<span style="font-size: 10px;color: gray;text-shadow: none !important;">Close the launcher and run the dmg to update.</span>', false, () => {
settingsUpdateButtonStatus('Letöltés GitHub-ról. <span style="font-size: 10px;color: gray;text-shadow: none !important;">Zárd be a launchert és futtasd a dmg fájlt, hogy frissíts!</span>', false, () => {
shell.openExternal(data.darwindownload)
})
} else {
settingsUpdateButtonStatus('Downloading..', true)
settingsUpdateButtonStatus('Letöltés...', true)
}
} else {
settingsUpdateTitle.innerHTML = 'You Are Running the Latest Version'
settingsUpdateTitle.innerHTML = 'A legfrissebb verziót használod!'
settingsUpdateChangelogCont.style.display = 'none'
populateVersionInformation(remote.app.getVersion(), settingsUpdateVersionValue, settingsUpdateVersionTitle, settingsUpdateVersionCheck)
settingsUpdateButtonStatus('Check for Updates', false, () => {
settingsUpdateButtonStatus('Frissítések keresése', false, () => {
if(!isDev){
ipcRenderer.send('autoUpdateAction', 'checkForUpdate')
settingsUpdateButtonStatus('Checking for Updates..', true)
settingsUpdateButtonStatus('Frissítések keresése...', true)
}
})
}
Expand Down
2 changes: 1 addition & 1 deletion app/login.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="loginCancelContainer" style="display: none;">
<button id="loginCancelButton">
<div id="loginCancelIcon">X</div>
<span id="loginCancelText">Cancel</span>
<span id="loginCancelText">Bezátás</span>
</button>
</div>
<div id="loginContent">
Expand Down
12 changes: 6 additions & 6 deletions app/overlay.ejs
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<div id="overlayContainer" style="display: none;">
<div id="serverSelectContent" style="display: none;">
<span id="serverSelectHeader">Available Servers</span>
<span id="serverSelectHeader">Elérhető szerverek</span>
<div id="serverSelectList">
<div id="serverSelectListScrollable">
<!-- Server listings populated here. -->
</div>
</div>
<div id="serverSelectActions">
<button id="serverSelectConfirm" class="overlayKeybindEnter" type="submit">Select</button>
<button id="serverSelectConfirm" class="overlayKeybindEnter" type="submit">Kiválasztás</button>
<div id="serverSelectCancelWrapper">
<button id="serverSelectCancel" class="overlayKeybindEsc">Cancel</button>
<button id="serverSelectCancel" class="overlayKeybindEsc">Mégse</button>
</div>
</div>
</div>
<div id="accountSelectContent" style="display: none;">
<span id="accountSelectHeader">Select an Account</span>
<span id="accountSelectHeader">Felhasználó Kiválasztás</span>
<div id="accountSelectList">
<div id="accountSelectListScrollable">
<!-- Accounts populated here. -->
</div>
</div>
<div id="accountSelectActions">
<button id="accountSelectConfirm" class="overlayKeybindEnter" type="submit">Select</button>
<button id="accountSelectConfirm" class="overlayKeybindEnter" type="submit">Kiválasztás</button>
<div id="accountSelectCancelWrapper">
<button id="accountSelectCancel" class="overlayKeybindEsc">Cancel</button>
<button id="accountSelectCancel" class="overlayKeybindEsc">Mégse</button>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit 95bb20d

Please sign in to comment.