X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fresources%2FTransBundle.java;h=51101b0441ed56ee7648a9f4543ebfc4b53d44d9;hb=487926f7ddbf951064dac50cc468afceb8b0b232;hp=a3804401034692909302f04c50c39cdcad828e6d;hpb=80383c142f85a7850d0fbea418689608fdccac05;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/resources/TransBundle.java b/src/be/nikiroo/utils/resources/TransBundle.java
index a380440..51101b0 100644
--- 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 be.nikiroo.utils.resources.Bundles;
-
 /**
  * This class manages a translation-dedicated Bundle.
  * <p>
@@ -171,12 +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);
-		setBundle(name, locale);
+		setBundle(name, locale, false);
 	}
 
 	@Override
-	public void reload() {
-		setBundle(name, locale);
+	public void reload(boolean resetToDefault) {
+		setBundle(name, locale, resetToDefault);
 	}
 
 	@Override
@@ -199,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();
+		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);
+			if (lang.equals(prev)) {
+				restoreSnapshot(status);
+			}
 			super.updateFile(path);
 		}
 
 		setLanguage(prev);
+		restoreSnapshot(status);
 	}
 
 	@Override