Commit 1a2602d
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,6 +36,7 @@ | |||
| 36 | 36 | public class Language { | |
| 37 | 37 | static private final String FILE = "processing.app.languages.PDE"; | |
| 38 | 38 | static private final String LISTING = "processing/app/languages/languages.txt"; | |
| 39 | + static protected final String PREF = "language"; | ||
| 39 | 40 | ||
| 40 | 41 | /** Single instance of this Language class */ | |
| 41 | 42 | static private Language instance = null; | |
@@ -50,9 +51,15 @@ public class Language { | |||
| 50 | 51 | ||
| 51 | 52 | ||
| 52 | 53 | private Language() { | |
| 53 | - // Get system language | ||
| 54 | - this.language = Locale.getDefault().getLanguage(); | ||
| 55 | - | ||
| 54 | + String systemLanguage = Locale.getDefault().getLanguage(); | ||
| 55 | + String language = Preferences.get(PREF); | ||
| 56 | + boolean writePrefs = false; | ||
| 57 | + | ||
| 58 | + if (language == null) { | ||
| 59 | + language = systemLanguage; | ||
| 60 | + writePrefs = true; | ||
| 61 | + } | ||
| 62 | + | ||
| 56 | 63 | // Set available languages | |
| 57 | 64 | languages = new HashMap<String, String>(); | |
| 58 | 65 | for (String code : listSupported()) { | |
@@ -62,22 +69,27 @@ private Language() { | |||
| 62 | 69 | // Set default language | |
| 63 | 70 | if (!languages.containsKey(language)) { | |
| 64 | 71 | language = "en"; | |
| 72 | + writePrefs = true; | ||
| 65 | 73 | } | |
| 66 | 74 | ||
| 67 | - // Get saved language | ||
| 68 | - try { | ||
| 69 | - File file = Base.getContentFile("lib/language.txt"); | ||
| 70 | - if (file.exists()) { | ||
| 71 | - String language = PApplet.loadStrings(file)[0]; | ||
| 72 | - language = language.trim().toLowerCase(); | ||
| 73 | - if (!language.equals("")) { | ||
| 74 | - this.language = language; | ||
| 75 | - } else { | ||
| 76 | - Base.saveFile(this.language, file); | ||
| 77 | - } | ||
| 78 | - } | ||
| 79 | - } catch (Exception e) { | ||
| 80 | - e.printStackTrace(); | ||
| 75 | + // // Get saved language | ||
| 76 | + // try { | ||
| 77 | + // File file = Base.getSettingsFile("language.txt"); | ||
| 78 | + // if (file.exists()) { | ||
| 79 | + // String language = PApplet.loadStrings(file)[0]; | ||
| 80 | + // language = language.trim().toLowerCase(); | ||
| 81 | + // if (!language.equals("")) { | ||
| 82 | + // this.language = language; | ||
| 83 | + // } else { | ||
| 84 | + // Base.saveFile(this.language, file); | ||
| 85 | + // } | ||
| 86 | + // } | ||
| 87 | + // } catch (Exception e) { | ||
| 88 | + // e.printStackTrace(); | ||
| 89 | + // } | ||
| 90 | + | ||
| 91 | + if (writePrefs) { | ||
| 92 | + Preferences.save(); | ||
| 81 | 93 | } | |
| 82 | 94 | ||
| 83 | 95 | // Get bundle with translations (processing.app.language.PDE) | |
@@ -86,7 +98,7 @@ private Language() { | |||
| 86 | 98 | ||
| 87 | 99 | ||
| 88 | 100 | String[] listSupported() { | |
| 89 | - // // List of languages in alphabetical order. New additions go here. | ||
| 101 | + // // Old list of languages in alphabetical order. | ||
| 90 | 102 | // final String[] SUPPORTED = { | |
| 91 | 103 | // "de", // de, German, Deutsch | |
| 92 | 104 | // "en", // en, English, English | |
@@ -140,15 +152,15 @@ static public String getLanguage() { | |||
| 140 | 152 | } | |
| 141 | 153 | ||
| 142 | 154 | ||
| 143 | - /** Set new language */ | ||
| 144 | - static public void setLanguage(String language) { | ||
| 145 | - try { | ||
| 146 | - File file = Base.getContentFile("lib/language.txt"); | ||
| 147 | - Base.saveFile(language, file); | ||
| 148 | - } catch (Exception e) { | ||
| 149 | - e.printStackTrace(); | ||
| 150 | - } | ||
| 151 | - } | ||
| 155 | + // /** Set new language */ | ||
| 156 | + // static public void setLanguage(String language) { | ||
| 157 | + // try { | ||
| 158 | + // File file = Base.getContentFile("lib/language.txt"); | ||
| 159 | + // Base.saveFile(language, file); | ||
| 160 | + // } catch (Exception e) { | ||
| 161 | + // e.printStackTrace(); | ||
| 162 | + // } | ||
| 163 | + // } | ||
| 152 | 164 | ||
| 153 | 165 | ||
| 154 | 166 | /** | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -810,13 +810,14 @@ protected void applyFrame() { | |||
| 810 | 810 | Map<String, String> languages = Language.getLanguages(); | |
| 811 | 811 | String language = ""; | |
| 812 | 812 | for (Map.Entry<String, String> lang : languages.entrySet()) { | |
| 813 | - if (lang.getValue().equals( String.valueOf(languageSelectionBox.getSelectedItem()))) { | ||
| 813 | + if (lang.getValue().equals(String.valueOf(languageSelectionBox.getSelectedItem()))) { | ||
| 814 | 814 | language = lang.getKey().trim().toLowerCase(); | |
| 815 | 815 | break; | |
| 816 | 816 | } | |
| 817 | 817 | } | |
| 818 | 818 | if (!language.equals(Language.getLanguage()) && !language.equals("")) { | |
| 819 | - Language.setLanguage(language); | ||
| 819 | + //Language.setLanguage(language); | ||
| 820 | + set(Language.PREF, language); | ||
| 820 | 821 | } | |
| 821 | 822 | ||
| 822 | 823 | int oldDisplayIndex = getInteger("run.display"); //$NON-NLS-1$ | |
0 commit comments