From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Sat, 11 Feb 2017 17:30:35 +0000 (+0100)
Subject: Prefer language names built-in in Android.
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=3389791a1013da2765849c6da30aad3f11264387

Prefer language names built-in in Android.

At least 2.3 doesn't recognize e.g. cmn though,
so keep our own list still.
Fixes issue #55.
---

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;
     }