TRUNK-3142: Fixed LocaleUtility to work with JDK 7

openmrs · Mar 29, 2013 · 2ff133f · 2ff133f
1 parent df9ab34
commit 2ff133f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/api/src/main/java/org/openmrs/util/LocaleUtility.java b/api/src/main/java/org/openmrs/util/LocaleUtility.java
@@ -19,6 +19,7 @@
 import java.util.MissingResourceException;
 import java.util.Set;
 
+import org.apache.commons.lang.LocaleUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.GlobalProperty;
@@ -219,13 +220,13 @@ public boolean supportsPropertyName(String propertyName) {
 	/**
 	 * Checks if specified locale object is valid
 	 * 
-	 * @param locale
-	 *            object for validation
+	 * @param locale object for validation
 	 * @return true if locale is available
 	 */
 	public static boolean isValid(Locale locale) {
 		try {
-			return locale.getISO3Language() != null && locale.getISO3Country() != null;
+			//Check if the language is available and then verify the country separately, because e.g. fr_RW combination is not among available locales.
+			return LocaleUtils.isAvailableLocale(new Locale(locale.getLanguage())) && locale.getISO3Country() != null;
 		}
 		catch (MissingResourceException e) {
 			return false;