X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryApplication.java;fp=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryApplication.java;h=53e4175d595b14a819666479ff7d2f00081ac217;hb=3389791a1013da2765849c6da30aad3f11264387;hp=6d125830d8a77b5295338d3e0ba7007e568ad84a;hpb=8d74020cb96fdb05b5d88dba1aa0dfe6462a8051;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index 6d12583..53e4175 100644
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -487,10 +487,17 @@ public class DictionaryApplication extends Application {
     final Map<String, String> fileToNameCache = new HashMap<String, String>();
 
     public String isoCodeToLocalizedLanguageName(final String isoCode) {
+        String lang = new Locale(isoCode).getDisplayLanguage();
+        if (!lang.equals("") && !lang.equals(isoCode))
+        {
+            return lang;
+        }
         final Language.LanguageResources languageResources = isoCodeToResources
                 .get(isoCode);
-        final String lang = languageResources != null ? getApplicationContext().getString(
-                                languageResources.nameId) : isoCode;
+        if (languageResources != null)
+        {
+            lang = getApplicationContext().getString(languageResources.nameId);
+        }
         return lang;
     }