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 77c0501e6f8f269d1cc0196002f9d969b952f60b..db4a52faff9e158040f0dea8bd0fddf010f9056a 100644 (file)
--- 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 d87b6896aa31ab34fea6af330b164ffa11928bd0..cb51317fc2db595e3bde4f5aba9fc65d687dbe98 100644 (file)
--- 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 a9bcbcecfb9aa94ffe12410a40c001dd5e050b3a..802bdcc737673171c6ee9188715f05cffbf299b3 100644 (file)
--- 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);
                }
        }