From: plaa <plaa@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Thu, 20 Jan 2011 06:28:33 +0000 (+0000)
Subject: l10n updates
X-Git-Tag: upstream/1.1.4^2~4
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=a4089666ebe03d900e0196e3526b5000ee27c6ef;p=debian%2Fopenrocket

l10n updates

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@101 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/doc/properties.txt b/doc/properties.txt
index 77c0501e..db4a52fa 100644
--- a/doc/properties.txt
+++ b/doc/properties.txt
@@ -2,6 +2,14 @@
 System properties used by OpenRocket:
 =====================================
 
+General options
+---------------
+
+openrocket.locale
+	Select the default locale to be used, for example "en_US".
+	If set to "xx", the logical keys will be displayed instead of the translated strings.
+
+
 
 Logging options
 ---------------
diff --git a/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java b/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java
index d87b6896..cb51317f 100644
--- a/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java
+++ b/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java
@@ -14,6 +14,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
 import java.util.List;
+import java.util.Locale;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
@@ -257,6 +258,7 @@ public class BugReportDialog extends JDialog {
 		sb.append("OpenRocket version: " + Prefs.getVersion() + "\n");
 		sb.append("OpenRocket source: " + Prefs.getBuildSource() + "\n");
 		sb.append("OpenRocket location: " + JarUtil.getCurrentJarFile() + "\n");
+		sb.append("Current default locale: " + Locale.getDefault() + "\n");
 		sb.append("System properties:\n");
 		
 		// Sort the keys
diff --git a/src/net/sf/openrocket/startup/Startup.java b/src/net/sf/openrocket/startup/Startup.java
index a9bcbcec..802bdcc7 100644
--- a/src/net/sf/openrocket/startup/Startup.java
+++ b/src/net/sf/openrocket/startup/Startup.java
@@ -104,11 +104,17 @@ public class Startup {
 
 	private static void checkDebugStatus() {
 		if (System.getProperty("openrocket.debug") != null) {
-			System.setProperty("openrocket.log.stdout", "VBOSE");
-			System.setProperty("openrocket.log.tracelevel", "VBOSE");
-			System.setProperty("openrocket.debug.menu", "true");
-			System.setProperty("openrocket.debug.mutexlocation", "true");
-			System.setProperty("openrocket.debug.motordigest", "true");
+			setPropertyIfNotSet("openrocket.log.stdout", "VBOSE");
+			setPropertyIfNotSet("openrocket.log.tracelevel", "VBOSE");
+			setPropertyIfNotSet("openrocket.debug.menu", "true");
+			setPropertyIfNotSet("openrocket.debug.mutexlocation", "true");
+			setPropertyIfNotSet("openrocket.debug.motordigest", "true");
+		}
+	}
+	
+	private static void setPropertyIfNotSet(String key, String value) {
+		if (System.getProperty(key) == null) {
+			System.setProperty(key, value);
 		}
 	}