X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Fresources%2Fbundles%2FTransBundle.java;h=7199158bba8d227322e4cc00e4d3bc52af0dbcf2;hb=99f631de95f8b89bd716b8c4011308fc1aacaeaf;hp=4fe7c4b55ac82cfef32aaf662e4089635d823f9f;hpb=e119a1c1a924998b9315e46c96b1c750aab1deb9;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/resources/bundles/TransBundle.java b/src/be/nikiroo/jvcard/resources/bundles/TransBundle.java
index 4fe7c4b..7199158 100644
--- a/src/be/nikiroo/jvcard/resources/bundles/TransBundle.java
+++ b/src/be/nikiroo/jvcard/resources/bundles/TransBundle.java
@@ -42,11 +42,6 @@ public class TransBundle extends Bundle<StringId> {
 		setLanguage(language);
 	}
 
-	@Override
-	public String getString(StringId id) {
-		return getString(id, (Object[]) null);
-	}
-
 	/**
 	 * Translate the given {@link StringId} into user text.
 	 * 
@@ -81,7 +76,7 @@ public class TransBundle extends Bundle<StringId> {
 		}
 
 		if (values != null && values.length > 0)
-			return String.format(locale, result, (Object[]) values);
+			return String.format(locale, result, values);
 		else
 			return result;
 	}
@@ -105,6 +100,23 @@ public class TransBundle extends Bundle<StringId> {
 		this.utf = utf;
 	}
 
+	/**
+	 * Initialise the translation mappings for the given language.
+	 * 
+	 * @param language
+	 *            the language to initialise, in the form "en-GB" or "fr" for
+	 *            instance
+	 */
+	private void setLanguage(String language) {
+		locale = getLocaleFor(language);
+		map = getBundle(Target.resources, locale);
+	}
+
+	@Override
+	public String getString(StringId id) {
+		return getString(id, (Object[]) null);
+	}
+
 	@Override
 	protected File getUpdateFile(String path) {
 		String code = locale.toString();
@@ -136,16 +148,15 @@ public class TransBundle extends Bundle<StringId> {
 		StringId.writeHeader(writer, name);
 	}
 
-	/**
-	 * Initialise the translation mappings for the given language.
-	 * 
-	 * @param language
-	 *            the language to initialise, in the form "en-GB" or "fr" for
-	 *            instance
-	 */
-	private void setLanguage(String language) {
-		locale = getLocaleFor(language);
-		map = getBundle(Target.resources, locale);
+	@Override
+	protected void writeValue(Writer writer, StringId id) throws IOException {
+		super.writeValue(writer, id);
+
+		String name = id.name() + "_NOUTF";
+		if (map.containsKey(name)) {
+			String value = map.getString(name).trim();
+			writeValue(writer, name, value);
+		}
 	}
 
 	/**