Fix #488 add utf8 support to i18n helper

Author: jknack

handlebars-maven-plugin/src/test/resources/i230.properties

@@ -1 +1 @@
-pagination_top_of_page = Inicio de la página
+pagination_top_of_page = Inicio de la página

handlebars/src/main/java/com/github/jknack/handlebars/Handlebars.java

@@ -17,6 +17,7 @@
  */
 package com.github.jknack.handlebars;
 
+import com.github.jknack.handlebars.helper.I18nHelper;
 import static org.apache.commons.lang3.Validate.isTrue;
 import static org.apache.commons.lang3.Validate.notEmpty;
 import static org.apache.commons.lang3.Validate.notNull;
@@ -1369,6 +1370,8 @@ public Handlebars setCharset(final Charset charset) {
     this.charset = notNull(charset, "Charset required.");
     registry.setCharset(charset);
     loader.setCharset(charset);
+    I18nHelper.i18n.setCharset(charset);
+    I18nHelper.i18nJs.setCharset(charset);
     return this;
   }
 

handlebars/src/main/java/com/github/jknack/handlebars/helper/I18nHelper.java

@@ -23,11 +23,16 @@
 import static org.apache.commons.lang3.Validate.notNull;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
+import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -158,7 +163,7 @@ public Object apply(final String key, final Options options) throws IOException
       String baseName = options.hash("bundle", defaultBundle);
       ClassLoader classLoader = options.hash("classLoader", getClass().getClassLoader());
       I18nSource localSource = source == null
-          ? new DefI18nSource(baseName, locale, classLoader) : source;
+          ? new DefI18nSource(charset, baseName, locale, classLoader) : source;
 
       return localSource.message(key, locale, options.params);
     }
@@ -232,7 +237,7 @@ public Object apply(final String localeName, final Options options) throws IOExc
       String baseName = options.hash("bundle", defaultBundle);
       ClassLoader classLoader = options.hash("classLoader", getClass().getClassLoader());
       I18nSource localSource = source == null
-          ? new DefI18nSource(baseName, locale, classLoader) : source;
+          ? new DefI18nSource(charset, baseName, locale, classLoader) : source;
       StringBuilder buffer = new StringBuilder();
       Boolean wrap = options.hash("wrap", true);
       if (wrap) {
@@ -292,6 +297,20 @@ private String message(final String message) {
   /** The message source to use. */
   protected I18nSource source;
 
+  /** Charset. **/
+  protected Charset charset = StandardCharsets.UTF_8;
+
+  /**
+   * Set the charset to use.
+   *
+   * NotThreadSafe Make sure to call this method ONCE at start time.
+   *
+   * @param charset Charset. Required.
+   */
+  public void setCharset(final Charset charset) {
+    this.charset = notNull(charset, "Charset required.");
+  }
+
   /**
    * Set the message source.
    *
@@ -332,18 +351,60 @@ public void setDefaultLocale(final Locale locale) {
 /** Default implementation of I18nSource. */
 class DefI18nSource implements I18nSource {
 
+  /**
+   * UTF8 resource bundle control.
+   *
+   * Source: Source: ckoverflow.com/questions/4659929
+   *
+   * @author edgar
+   *
+   */
+  public static class UTF8Control extends ResourceBundle.Control {
+    /** Charset. */
+    private final Charset charset;
+
+    /**
+     * Creates a new utf8 control.
+     *
+     * @param charset Charset.
+     */
+    public UTF8Control(final Charset charset) {
+      this.charset = charset;
+    }
+    @Override
+    public ResourceBundle newBundle(final String baseName, final Locale locale, final String format,
+        final ClassLoader loader, final boolean reload) throws IOException {
+      // The below is a copy of the default implementation.
+      String bundleName = toBundleName(baseName, locale);
+      String resourceName = toResourceName(bundleName, "properties");
+      InputStream stream = null;
+      try  {
+        stream = loader.getResourceAsStream(resourceName);
+        PropertyResourceBundle bundle = new PropertyResourceBundle(
+            new InputStreamReader(stream, charset));
+        return bundle;
+      } finally {
+        if (stream != null) {
+          stream.close();
+        }
+      }
+    }
+  }
+
   /** The resource bundle. */
   private ResourceBundle bundle;
 
   /**
    * Creates a new {@link DefI18nSource}.
    *
+   * @param charset Charset to use.
    * @param baseName The base name.
    * @param locale The locale.
    * @param classLoader The classloader.
    */
-  public DefI18nSource(final String baseName, final Locale locale, final ClassLoader classLoader) {
-    bundle = ResourceBundle.getBundle(baseName, locale, classLoader);
+  public DefI18nSource(final Charset charset, final String baseName, final Locale locale,
+      final ClassLoader classLoader) {
+    bundle = ResourceBundle.getBundle(baseName, locale, classLoader, new UTF8Control(charset));
   }
 
   @Override

handlebars/src/test/java/com/github/jknack/handlebars/Issue488.java

@@ -0,0 +1,31 @@
+package com.github.jknack.handlebars;
+
+import com.github.jknack.handlebars.helper.I18nHelper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Locale;
+
+public class Issue488 extends AbstractTest {
+
+  @Before
+  public void overrideDefaults() {
+    I18nHelper.i18n.setDefaultBundle("i488");
+    I18nHelper.i18n.setDefaultLocale(Locale.ENGLISH);
+  }
+
+  @After
+  public void defaults() {
+    I18nHelper.i18n.setDefaultBundle("messages");
+    I18nHelper.i18n.setDefaultLocale(Locale.getDefault());
+  }
+
+  @Test
+  public void utf8() throws IOException {
+    shouldCompileTo("{{i18n \"utf8\"}}", $, "Bonjour à tous.");
+  }
+
+
+}

handlebars/src/test/resources/i488.properties

@@ -0,0 +1 @@
+utf8=Bonjour à tous.