Updated locale handling

Author: rmraya

lib/xmljava.jar

@@ -27,15 +27,22 @@ private Messages() {
     }
 
     public static String getString(String key) {
+        String resourceName = "xmljava";
         try {
             if (props == null) {
                 Locale locale = Locale.getDefault();
-                String extension = "en".equals(locale.getLanguage()) ? ".properties"
-                        : "_" + locale.getLanguage() + ".properties";
-                if (Messages.class.getResource("xmljava" + extension) == null) {
+                String language = locale.getLanguage();
+                String extension = "_" + language + ".properties";
+                // check if there is a resource for full language code
+                if (Messages.class.getResource(resourceName + extension) == null) {
+                    // if not, check if there is a resource for language only
+                    extension = "_" + language.substring(0, 2) + ".properties";
+                }
+                if (Messages.class.getResource(resourceName + extension) == null) {
+                    // if not, use the default resource
                     extension = ".properties";
                 }
-                try (InputStream is = Messages.class.getResourceAsStream("xmljava" + extension)) {
+                try (InputStream is = Messages.class.getResourceAsStream(resourceName + extension)) {
                     try (InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
                         props = new Properties();
                         props.load(reader);