Merge pull request #90 from akrherz/of593

OF-593 LocaleUtils: convert dots to underscores

src/java/org/jivesoftware/util/LocaleUtils.java

@@ -474,7 +474,7 @@ public class LocaleUtils {
         if (locale == null) {
         	locale = JiveGlobals.getLocale();
         }
-        String i18nFile = pluginName + "_i18n";
+        String i18nFile = getI18nFile(pluginName);
 
         // Retrieve classloader from pluginName.
         final XMPPServer xmppServer = XMPPServer.getInstance();
@@ -511,7 +511,7 @@ public class LocaleUtils {
     public static ResourceBundle getPluginResourceBundle(String pluginName) throws Exception {
         final Locale locale = JiveGlobals.getLocale();
 
-        String i18nFile = pluginName + "_i18n";
+        String i18nFile = getI18nFile(pluginName);
 
         // Retrieve classloader from pluginName.
         final XMPPServer xmppServer = XMPPServer.getInstance();
@@ -525,6 +525,10 @@ public class LocaleUtils {
         return ResourceBundle.getBundle(i18nFile, locale, pluginClassLoader);
     }
 
+	private static String getI18nFile(String pluginName) {
+		return pluginName.replace('.', '_') + "_i18n";
+	}
+
     /**
      * Returns an internationalized string loaded from a resource bundle using
      * the passed in Locale substituting the passed in arguments. Substitution