From bed9837967e2c7d3009c70b6aae77325db67cd67 Mon Sep 17 00:00:00 2001
From: catbref <misc-github@talk2dom.com>
Date: Tue, 29 Sep 2020 10:56:27 +0100
Subject: [PATCH] Added settings entry "localeLang" for controlling core
 language (not-API)

---
 src/main/java/org/qortal/globalization/Translator.java | 4 ++--
 src/main/java/org/qortal/settings/Settings.java        | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/qortal/globalization/Translator.java b/src/main/java/org/qortal/globalization/Translator.java
index 8f0b6136..6481dde7 100644
--- a/src/main/java/org/qortal/globalization/Translator.java
+++ b/src/main/java/org/qortal/globalization/Translator.java
@@ -10,12 +10,12 @@ import java.util.Set;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.qortal.settings.Settings;
 
 public enum Translator {
 	INSTANCE;
 
 	private static final Logger LOGGER = LogManager.getLogger(Translator.class);
-	private static final String DEFAULT_LANG = Locale.getDefault().getLanguage();
 
 	private static final Map<String, ResourceBundle> resourceBundles = new HashMap<>();
 
@@ -34,7 +34,7 @@ public enum Translator {
 	}
 
 	public String translate(String className, String key) {
-		return this.translate(className, DEFAULT_LANG, key);
+		return this.translate(className, Settings.getInstance().getLocaleLang(), key);
 	}
 
 	public Set<String> keySet(String className, String lang) {
diff --git a/src/main/java/org/qortal/settings/Settings.java b/src/main/java/org/qortal/settings/Settings.java
index 38a5f3c6..9a12e880 100644
--- a/src/main/java/org/qortal/settings/Settings.java
+++ b/src/main/java/org/qortal/settings/Settings.java
@@ -5,6 +5,7 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
+import java.util.Locale;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -41,6 +42,9 @@ public class Settings {
 	// Settings, and other config files
 	private String userPath;
 
+	// General
+	private String localeLang = Locale.getDefault().getLanguage();
+
 	// Common to all networking (API/P2P)
 	private String bindAddress = "::"; // Use IPv6 wildcard to listen on all local addresses
 
@@ -261,6 +265,10 @@ public class Settings {
 		return this.userPath;
 	}
 
+	public String getLocaleLang() {
+		return this.localeLang;
+	}
+
 	public int getUiServerPort() {
 		return this.uiPort;
 	}