git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bundle: some fixes + update tests
[nikiroo-utils.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 61bc92259de48c9a90164b69df8c4e93799f2253..51101b0441ed56ee7648a9f4543ebfc4b53d44d9 100644
(file)
--- a/
src/be/nikiroo/utils/resources/TransBundle.java
+++ b/
src/be/nikiroo/utils/resources/TransBundle.java
@@
-8,8
+8,6
@@
import java.util.List;
import java.util.Locale;
import java.util.regex.Pattern;
import java.util.Locale;
import java.util.regex.Pattern;
-import be.nikiroo.utils.resources.Bundles;
-
/**
* This class manages a translation-dedicated Bundle.
* <p>
/**
* This class manages a translation-dedicated Bundle.
* <p>
@@
-171,7
+169,12
@@
public class TransBundle<E extends Enum<E>> extends Bundle<E> {
private void setLanguage(String language) {
defaultLocale = (language == null || language.length() == 0);
locale = getLocaleFor(language);
private void setLanguage(String language) {
defaultLocale = (language == null || language.length() == 0);
locale = getLocaleFor(language);
- setBundle(name, locale);
+ setBundle(name, locale, false);
+ }
+
+ @Override
+ public void reload(boolean resetToDefault) {
+ setBundle(name, locale, resetToDefault);
}
@Override
}
@Override
@@
-194,16
+197,26
@@
public class TransBundle<E extends Enum<E>> extends Bundle<E> {
@Override
public void updateFile(String path) throws IOException {
String prev = locale.getLanguage();
@Override
public void updateFile(String path) throws IOException {
String prev = locale.getLanguage();
+ Object status = takeSnapshot();
- setLanguage(null); // default locale
+ // default locale
+ setLanguage(null);
+ if (prev.equals(getLocaleFor(null).getLanguage())) {
+ // restore snapshot if default locale = current locale
+ restoreSnapshot(status);
+ }
super.updateFile(path);
for (String lang : getKnownLanguages()) {
setLanguage(lang);
super.updateFile(path);
for (String lang : getKnownLanguages()) {
setLanguage(lang);
+ if (lang.equals(prev)) {
+ restoreSnapshot(status);
+ }
super.updateFile(path);
}
setLanguage(prev);
super.updateFile(path);
}
setLanguage(prev);
+ restoreSnapshot(status);
}
@Override
}
@Override