=== modified file 'dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/resourcebundle/DefaultResourceBundleManager.java'
--- dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/resourcebundle/DefaultResourceBundleManager.java	2012-03-19 08:17:24 +0000
+++ dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/resourcebundle/DefaultResourceBundleManager.java	2012-03-19 09:00:29 +0000
@@ -199,7 +199,7 @@
     private Locale getLocaleFromName( String name )
     {
         Pattern pattern = Pattern.compile( "^" + globalResourceBundleName
-            + "(?:(_|-)([a-z]{2})(?:_([A-Z]{2})(?:_(.+))?)?)?" + EXT_RESOURCE_BUNDLE + "$" );
+            + "(?:_([a-z]{2})(?:_([A-Z]{2})(?:_(.+))?)?)?" + EXT_RESOURCE_BUNDLE + "$" );
 
         Matcher matcher = pattern.matcher( name );