git://git.nikiroo.be
/
jvcard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Colours are now taken from a .properties file
[jvcard.git]
/
src
/
be
/
nikiroo
/
jvcard
/
i18n
/
Trans.java
diff --git
a/src/be/nikiroo/jvcard/i18n/Trans.java
b/src/be/nikiroo/jvcard/i18n/Trans.java
index 1046d4cdbc982c06f061f0e36830a93305de8ff2..210cffca302dbe1cfb0d7d2eaf1ae53d2c2ea80f 100644
(file)
--- a/
src/be/nikiroo/jvcard/i18n/Trans.java
+++ b/
src/be/nikiroo/jvcard/i18n/Trans.java
@@
-3,6
+3,7
@@
package be.nikiroo.jvcard.i18n;
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.Locale;
import java.util.ResourceBundle;
+import be.nikiroo.jvcard.resources.Bundles;
import be.nikiroo.jvcard.tui.UiColors;
import com.googlecode.lanterna.input.KeyStroke;
import be.nikiroo.jvcard.tui.UiColors;
import com.googlecode.lanterna.input.KeyStroke;
@@
-65,7
+66,7
@@
public class Trans {
StringId id = stringId;
if (!UiColors.getInstance().isUnicode()) {
try {
StringId id = stringId;
if (!UiColors.getInstance().isUnicode()) {
try {
- id = StringId.valueOf(stringId.
toString
() + "_NOUTF");
+ id = StringId.valueOf(stringId.
name
() + "_NOUTF");
} catch (IllegalArgumentException iae) {
// no special _NOUTF version found
}
} catch (IllegalArgumentException iae) {
// no special _NOUTF version found
}
@@
-79,8
+80,8
@@
public class Trans {
return "[dummy]";
}
return "[dummy]";
}
- if (map.containsKey(id.
toString
())) {
- return map.getString(id.
toString
());
+ if (map.containsKey(id.
name
())) {
+ return map.getString(id.
name
());
}
return id.toString();
}
return id.toString();
@@
-146,7
+147,6
@@
public class Trans {
locale = Locale.forLanguageTag(lang);
}
locale = Locale.forLanguageTag(lang);
}
- map = ResourceBundle.getBundle(Trans.class.getPackage().getName()
- + ".resources", locale, new FixedResourceBundleControl());
+ map = Bundles.getBundle("resources", locale);
}
}
}
}