Skip to content

Commit

Permalink
Development (#41)
Browse files Browse the repository at this point in the history
* Nightly title on Nightly Builds

* Update es_ES.toml

* Update package.json
  • Loading branch information
Crujera27 authored Jul 4, 2024
1 parent 874abd4 commit 36589a7
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 7 deletions.
6 changes: 3 additions & 3 deletions app/assets/lang/es_ES.toml
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ jvmOptsTitle = "Opciones Adicionales de JVM"
jvmOptsDesc = "Opciones que se proporcionarán a la JVM en tiempo de ejecución. <em>-Xms</em> y <em>-Xmx</em> no deben incluirse."
launcherTabHeaderText = "Configuración del launcher"
launcherTabHeaderDesc = "Opciones relacionadas con el launcher en sí."
allowPrereleaseTitle = "Canal de actualizaciones beta."
allowPrereleaseDesc = "Las versiones beta incluyen nuevas funciones que pueden no haber sido completamente probadas o integradas.<br>Esta opción será considerada como activa siempre que se esté en una versión beta"
allowPrereleaseTitle = "Canal de actualizaciones nightly."
allowPrereleaseDesc = "Las versiones nightly incluyen nuevas funciones que pueden no haber sido completamente probadas o integradas.<br>Esta opción será considerada como activa siempre que se esté en una versión nightly."
dataDirectoryTitle = "Directorio de Datos"
selectDataDirectory = "Seleccionar Directorio de Datos"
chooseFolder = "Elegir Carpeta"
Expand Down Expand Up @@ -301,7 +301,7 @@ requiresJava = "Requiere Java {major} x64."
availableOptions = "Opciones disponibles para Java {major} (VM HotSpot)"

[js.settings.about]
preReleaseTitle = "Versión beta"
preReleaseTitle = "Versión nightly"
stableReleaseTitle = "Versión estable"
releaseNotesFailed = "Error al cargar las notas de la versión."

Expand Down
1 change: 1 addition & 0 deletions app/assets/lang/settings.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

[ejs.app]
title = "VI Software Launcher"
title_nightly = "VI Software Launcher Nightly"

[ejs.landing]
mediaGitHubURL = "https://github.com/VI-Software"
Expand Down
5 changes: 5 additions & 0 deletions app/frame.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@
<% } else{ %>
<div id="frameContentWin">
<div id="frameTitleDock">
<% if (!isNightly) { %>
<span id="frameTitleText"><%= lang('app.title') %></span>
<% } else { %>
<span id="frameTitleText"><%= lang('app.title_nightly') %></span>
<% } %>
</div>
<div id="frameButtonDockWin">
<button class="frameButton fMb" id="frameButton_minimize" tabIndex="-1">
Expand Down
4 changes: 2 additions & 2 deletions app/landing.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</g>
</svg>
</a>
</div>
</div>
<div class="mediaContainer">
<a href="<%- lang('landing.mediaDiscordURL') %>" class="mediaURL" id="discordURL">
<svg id="discordSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500">
Expand All @@ -65,7 +65,7 @@
</g>
</svg>
</a>
</div>
</div>
</div>
</div>
</div>
Expand Down
7 changes: 6 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ const semver = require('semver')
const { pathToFileURL } = require('url')
const { AZURE_CLIENT_ID, MSFT_OPCODE, MSFT_REPLY_TYPE, MSFT_ERROR, SHELL_OPCODE } = require('./app/assets/js/ipcconstants')
const LangLoader = require('./app/assets/js/langloader')
const pjson = require('./package.json');


// Setup Lang
LangLoader.setupLanguage()
Expand Down Expand Up @@ -243,6 +245,8 @@ ipcMain.on(MSFT_OPCODE.OPEN_LOGOUT, (ipcEvent, uuid, isLastAccount) => {
let win

function createWindow() {
// Determine if the version includes 'nightly' to enable nightly features
const isNightly = pjson.version.includes('nightly');

win = new BrowserWindow({
width: 980,
Expand All @@ -260,7 +264,8 @@ function createWindow() {

const data = {
bkid: Math.floor((Math.random() * fs.readdirSync(path.join(__dirname, 'app', 'assets', 'images', 'backgrounds')).length)),
lang: (str, placeHolders) => LangLoader.queryEJS(str, placeHolders)
lang: (str, placeHolders) => LangLoader.queryEJS(str, placeHolders),
isNightly: isNightly
}
Object.entries(data).forEach(([key, val]) => ejse.data(key, val))

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vis-launcher",
"version": "1.16.0-beta.1",
"version": "1.16.0-nightly.3",
"productName": "VI Software Launcher",
"description": "VI Software Launcher",
"author": "VI Software",
Expand Down

0 comments on commit 36589a7

Please sign in to comment.