git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'subtree'
[fanfix.git]
/
src
/
be
/
nikiroo
/
utils
/
resources
/
TransBundle.java
diff --git
a/src/be/nikiroo/utils/resources/TransBundle.java
b/src/be/nikiroo/utils/resources/TransBundle.java
index 28fa2802e215eab074ff51405d7488b733f84459..7b2edb1ca919b4bc9f31e85d968ca8ee771d538f 100644
(file)
--- a/
src/be/nikiroo/utils/resources/TransBundle.java
+++ b/
src/be/nikiroo/utils/resources/TransBundle.java
@@
-138,6
+138,9
@@
public class TransBundle<E extends Enum<E>> extends Bundle<E> {
result = "[" + key.toLowerCase() + "]";
} else if (containsKey(key)) {
result = getString(key, null);
result = "[" + key.toLowerCase() + "]";
} else if (containsKey(key)) {
result = getString(key, null);
+ if (result == null) {
+ result = getMetaDef(id.name());
+ }
} else {
result = null;
}
} else {
result = null;
}
@@
-326,6
+329,9
@@
public class TransBundle<E extends Enum<E>> extends Bundle<E> {
String name = id.name() + "_NOUTF";
if (containsKey(name)) {
String value = getString(name, null);
String name = id.name() + "_NOUTF";
if (containsKey(name)) {
String value = getString(name, null);
+ if (value == null) {
+ value = getMetaDef(id.name());
+ }
boolean set = isSet(id, false);
writeValue(writer, name, value, set);
}
boolean set = isSet(id, false);
writeValue(writer, name, value, set);
}