made some lang keys far more logical

Most of these are from back when Viper was originally started, I also
removed a few keys as they were no longer in use, but were forgotten
about, most of these are from pre-v1.0.0 aka, the old smaller UI

6 files changed, 27 insertions, 27 deletions

diff --git a/src/modules/gamepath.js b/src/modules/gamepath.js
index 1ec5838..6555cbd 100644
--- a/src/modules/gamepath.js
+++ b/src/modules/gamepath.js
@@ -58,7 +58,7 @@ gamepath.set = async (win, force_dialog) => {
 				return;
 			}
 
-			await win_show.alert(lang("general.missingpath"));
+			await win_show.alert(lang("general.missing_path"));
 		}
 
 		// fallback to GUI/manual selection
diff --git a/src/modules/launch.js b/src/modules/launch.js
index 8801d1b..24ea4b2 100644
--- a/src/modules/launch.js
+++ b/src/modules/launch.js
@@ -15,8 +15,8 @@ console = require("./console");
 function launch(game_version) {
 	// return early, and show error message if on Linux
 	if (process.platform == "linux") {
-		win.alert(lang("cli.launch.linuxerror"));
-		console.error(lang("cli.launch.linuxerror"));
+		win.alert(lang("cli.launch.linux_error"));
+		console.error(lang("cli.launch.linux_error"));
 		cli.exit(1);
 		return;
 	}
diff --git a/src/modules/mods.js b/src/modules/mods.js
index 95b7e06..50db011 100644
--- a/src/modules/mods.js
+++ b/src/modules/mods.js
@@ -34,8 +34,8 @@ mods.list = () => {
 
 	// make sure Northstar is actually installed
 	if (version.northstar() == "unknown") {
-		win.log(lang("general.notinstalled"));
-		console.error(lang("general.notinstalled"));
+		win.log(lang("general.not_installed"));
+		console.error(lang("general.not_installed"));
 		cli.exit(1);
 		return false;
 	}
@@ -180,8 +180,8 @@ mods.get = (mod) => {
 
 	// make sure Northstar is actually installed
 	if (version.northstar() == "unknown") {
-		win.log(lang("general.notinstalled"));
-		console.error(lang("general.notinstalled"));
+		win.log(lang("general.not_installed"));
+		console.error(lang("general.not_installed"));
 		cli.exit(1);
 		return false;
 	}
@@ -314,15 +314,15 @@ mods.install = (mod, opts) => {
 	}
 
 	if (version.northstar() == "unknown") {
-		win.log(lang("general.notinstalled"));
-		console.error(lang("general.notinstalled"));
+		win.log(lang("general.not_installed"));
+		console.error(lang("general.not_installed"));
 		cli.exit(1);
 		return false;
 	}
 
 	let notamod = () => {
-		win.log(lang("gui.mods.notamod"));
-		console.error(lang("cli.mods.notamod"));
+		win.log(lang("gui.mods.not_a_mod"));
+		console.error(lang("cli.mods.not_a_mod"));
 		cli.exit(1);
 		return false;
 	}
@@ -561,8 +561,8 @@ mods.remove = (mod) => {
 
 	// make sure Northstar is actually installed
 	if (version.northstar() == "unknown") {
-		win.log(lang("general.notinstalled"));
-		console.error(lang("general.notinstalled"));
+		win.log(lang("general.not_installed"));
+		console.error(lang("general.not_installed"));
 		cli.exit(1);
 		return false;
 	}
@@ -580,7 +580,7 @@ mods.remove = (mod) => {
 	let mod_name = mod_data.folder_name;
 
 	if (! mod_name) {
-		console.error(lang("cli.mods.cantfind"));
+		console.error(lang("cli.mods.cant_find"));
 		cli.exit(1);
 		return;
 	}
@@ -633,8 +633,8 @@ mods.toggle = (mod, fork) => {
 
 	// make sure Northstar is actually installed
 	if (version.northstar() == "unknown") {
-		win.log(lang("general.notinstalled"));
-		console.error(lang("general.notinstalled"));
+		win.log(lang("general.not_installed"));
+		console.error(lang("general.not_installed"));
 		cli.exit(1);
 		return false;
 	}
@@ -646,7 +646,7 @@ mods.toggle = (mod, fork) => {
 			mods.toggle(modlist[i].name, true); // enable mod
 		}
 
-		console.ok(lang("cli.mods.toggledall"));
+		console.ok(lang("cli.mods.toggled_all"));
 		cli.exit(0);
 		return
 	}
diff --git a/src/modules/requests.js b/src/modules/requests.js
index 6841fe2..94639fa 100644
--- a/src/modules/requests.js
+++ b/src/modules/requests.js
@@ -123,7 +123,7 @@ async function getNsReleaseNotes() {
                     resolve( cache[NORTHSTAR_RELEASE_NOTES_KEY]["body"] );
                 } else {
                     console.error("Couldn't fetch Northstar release notes, cache is empty.");
-                    resolve( [lang("request.northstar.noReleaseNotes")] );
+                    resolve( [lang("request.no_ns_release_notes")] );
                 }
             });
         }
@@ -174,7 +174,7 @@ async function getVpReleaseNotes() {
                     resolve( cache[VIPER_RELEASE_NOTES_KEY]["body"] );
                 } else {
                     console.error("Couldn't fetch Viper release notes, cache is empty.");
-                    resolve( [lang("request.viper.noReleaseNotes")] );
+                    resolve( [lang("request.no_vp_release_notes")] );
                 }
             });
         }
diff --git a/src/modules/settings.js b/src/modules/settings.js
index 94f6414..5476404 100644
--- a/src/modules/settings.js
+++ b/src/modules/settings.js
@@ -49,7 +49,7 @@ if (fs.existsSync("viper.json")) {
 		settings.nsargs = fs.readFileSync(args, "utf8");
 	}
 } else {
-	console.error(lang("general.missingpath"));
+	console.error(lang("general.missing_path"));
 }
 
 // as to not have to do the same one liner a million times, this
diff --git a/src/modules/update.js b/src/modules/update.js
index eb6e540..c6c92d7 100644
--- a/src/modules/update.js
+++ b/src/modules/update.js
@@ -59,23 +59,23 @@ update.northstar_autoupdate = () => {
 	async function _checkForUpdates() {
 		is_auto_updating = true;
 
-		console.info(lang("cli.autoupdates.checking"));
+		console.info(lang("cli.auto_updates.checking"));
 
 		// checks if NS is outdated
 		if (await northstar_update_available()) {
-			console.ok(lang("cli.autoupdates.available"));
+			console.ok(lang("cli.auto_updates.available"));
 			if (await is_running.game()) {
-				console.error(lang("general.autoupdates.gamerunning"));
+				console.error(lang("general.auto_updates.game_running"));
 				new Notification({
 					title: lang("gui.nsupdate.gaming.title"),
 					body: lang("gui.nsupdate.gaming.body")
 				}).show();
 			} else {
-				console.info(lang("cli.autoupdates.updatingns"));
+				console.info(lang("cli.auto_updates.updating_ns"));
 				update.northstar();
 			}
 		} else {
-			console.info(lang("cli.autoupdates.noupdate"));
+			console.info(lang("cli.auto_updates.no_update"));
 		}
 
 		setTimeout(
@@ -152,7 +152,7 @@ update.viper = (autoinstall) => {
 // unzip module does not support excluding files directly.
 update.northstar = async () => {
 	if (await is_running.game()) {
-		console.error(lang("general.autoupdates.gamerunning"));
+		console.error(lang("general.auto_updates.game_running"));
 		return false;
 	}
 
@@ -227,7 +227,7 @@ update.northstar = async () => {
 
 			win.log(lang("gui.update.extracting"));
 			ipcMain.emit("ns-update-event", "gui.update.extracting");
-			console.ok(lang("cli.update.downloaddone"));
+			console.ok(lang("cli.update.download_done"));
 			// extracts the zip, this is the part where we're actually
 			// installing Northstar.
 			extract.pipe(unzip.Extract({path: settings.gamepath}))