From 3138b04741154b984e9ae15cf9f9ed665c7c2e96 Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Sat, 15 Jun 2013 12:41:46 +0000 Subject: [PATCH] translation tool: if language already has translated strings, load them git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@690 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/util/StringsModel.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/micropolisj/util/StringsModel.java b/src/micropolisj/util/StringsModel.java index 1569aa5..efe631c 100644 --- a/src/micropolisj/util/StringsModel.java +++ b/src/micropolisj/util/StringsModel.java @@ -157,8 +157,13 @@ class StringsModel extends AbstractTableModel for (String file : FILES) { Properties p = new Properties(); - if (localeCode == null) { - p.load(getClass().getResourceAsStream("/micropolisj/"+file+".properties")); + { + // load strings from our jar file + String s = "/micropolisj/"+file+(localeCode != null ? "_"+localeCode : "") + ".properties"; + InputStream in = getClass().getResourceAsStream(s); + if (in != null) { + p.load(in); + } } File f = getPFile(file, localeCode); if (f.exists()) {