From 0ed2fc139c3c5dfe0a1702ed8348987b3c6a5c9d Mon Sep 17 00:00:00 2001 From: codeanticode Date: Sat, 16 Feb 2019 03:05:34 +0900 Subject: [PATCH] load mode strings into language bundle --- app/src/processing/app/Language.java | 14 +++++++++++++- .../processing/app/contrib/ModeContribution.java | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/src/processing/app/Language.java b/app/src/processing/app/Language.java index 06be82fc5a..ee29756ce5 100644 --- a/app/src/processing/app/Language.java +++ b/app/src/processing/app/Language.java @@ -169,7 +169,19 @@ static public Language init() { return instance; } - + + static public void addModeStrings(Mode mode) { + String baseFilename = "languages/mode.properties"; + String langFilename = "languages/mode_" + instance.language + ".properties"; + File modeBaseFile = new File(mode.getFolder(), baseFilename); + File modeLangFile = new File(mode.getFolder(), langFilename); + if (modeBaseFile.exists() && modeLangFile.exists()) { + instance.bundle.read(modeBaseFile); + instance.bundle.read(modeLangFile); + } + } + + static private String get(String key) { LanguageBundle bundle = init().bundle; diff --git a/app/src/processing/app/contrib/ModeContribution.java b/app/src/processing/app/contrib/ModeContribution.java index 0005de2478..194a94d994 100644 --- a/app/src/processing/app/contrib/ModeContribution.java +++ b/app/src/processing/app/contrib/ModeContribution.java @@ -31,6 +31,7 @@ import java.util.List; import processing.app.Base; +import processing.app.Language; import processing.app.Messages; import processing.app.Mode; import processing.app.Util; @@ -89,6 +90,7 @@ public ModeContribution(Base base, File folder, Messages.log("Got mode class " + modeClass); Constructor con = modeClass.getConstructor(Base.class, File.class); mode = (Mode) con.newInstance(base, folder); + Language.addModeStrings(mode); mode.setClassLoader(loader); if (base != null) { mode.setupGUI();