Author: dmaliarevich Date: 2010-08-27 07:29:48 -0400 (Fri, 27 Aug 2010) New Revision: 24490 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java Log: https://jira.jboss.org/browse/JBIDE-6729 , locale country string is manually transformed to upper case. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2010-08-27 09:04:36 UTC (rev 24489) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2010-08-27 11:29:48 UTC (rev 24490) @@ -55,6 +55,7 @@ import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.i18n.MainLocaleProvider; +import org.jboss.tools.vpe.editor.util.Constants; public class BundleMap { @@ -271,8 +272,19 @@ String resultUri = uri.replace('.','/'); ResourceBundle bundle = getBundleByUrl(uri, locale); String localeString = bundle.getLocale().toString(); - if ((null != localeString) && (localeString.length() > 0)){ - resultUri += "_" + localeString; //$NON-NLS-1$ + if ((null != localeString) && (localeString.length() > 0)) { + /* + * getLanguage() method in ResourceBundle could return "en_us" string. + * Bundle's file is case sensitive thus country name + * should be transformed to UpperCase. + */ + String[] parts = localeString.split(Constants.UNDERSCORE); + if (parts.length == 2) { + parts[1] = parts[1].toUpperCase(); + } + for (String part : parts) { + resultUri += Constants.UNDERSCORE + part; + } } resultUri += ".properties"; //$NON-NLS-1$ return resultUri;