From 1630389391a3fc852bb3ba2323e60b6017a5cb1c Mon Sep 17 00:00:00 2001 From: Eric House Date: Fri, 22 May 2015 22:55:30 -0700 Subject: [PATCH] find and fix a few more places where language name needed translation or to be capitalized. --- .../src/org/eehouse/android/xw4/DictLangCache.java | 4 ++-- .../src/org/eehouse/android/xw4/DictsDelegate.java | 1 + .../src/org/eehouse/android/xw4/GameConfigDelegate.java | 5 +++-- .../XWords4/src/org/eehouse/android/xw4/LookupAlert.java | 3 ++- .../XWords4/src/org/eehouse/android/xw4/MultiService.java | 3 ++- .../src/org/eehouse/android/xw4/RefreshNamesTask.java | 8 ++++---- .../src/org/eehouse/android/xw4/StudyListDelegate.java | 7 ++++--- 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictLangCache.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictLangCache.java index 1c66db0e5..6feebd82f 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictLangCache.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictLangCache.java @@ -72,8 +72,8 @@ public class DictLangCache { String lang = getLangName( m_context, dal.name ); if ( null != lang && 0 != lang.length() ) { if ( ! m_map.containsValue( lang ) ) { - String locName = LocUtils.xlateLang( m_context, lang ); - locName = Utils.capitalize( locName ); + String locName = LocUtils.xlateLang( m_context, lang, + true ); m_map.put( locName, lang ); } } diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java index 4538a1981..c88187ba8 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java @@ -382,6 +382,7 @@ public class DictsDelegate extends ListDelegateBase }; String name = row.getText(); String lang = DictLangCache.getLangName( m_activity, name); + lang = xlateLang( lang ); message = getString( R.string.set_default_message_fmt, name, lang ); dialog = makeAlertBuilder() .setTitle( R.string.query_title ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java index 1ce00ad90..573606439 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java @@ -271,9 +271,10 @@ public class GameConfigDelegate extends DelegateBase }); break; case NO_NAME_FOUND: + String langName = DictLangCache.getLangName( m_activity, + m_gi.dictLang ); String msg = getString( R.string.no_name_found_fmt, - m_gi.nPlayers, DictLangCache. - getLangName( m_activity, m_gi.dictLang ) ); + m_gi.nPlayers, xlateLang( langName ) ); dialog = makeAlertBuilder() .setPositiveButton( R.string.button_ok, null ) // message added below since varies with language etc. diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/LookupAlert.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/LookupAlert.java index aaa2e77b9..bfe62683a 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/LookupAlert.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/LookupAlert.java @@ -326,7 +326,8 @@ public class LookupAlert extends LinearLayout s_urlsAdapter = new ArrayAdapter( context, LIST_LAYOUT, s_lookupNames ); s_lang = lang; - s_langName = DictLangCache.getLangNames( context )[lang]; + String langName = DictLangCache.getLangName( context, lang ); + s_langName = LocUtils.xlateLang( context, langName ); } } diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java index 090de2816..4ab83eeec 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java @@ -138,7 +138,8 @@ public class MultiService { String inviter = intent.getStringExtra( INVITER ); int msgID = (null == inviter) ? R.string.invite_dict_missing_body_noname_fmt : R.string.invite_dict_missing_body_fmt; - String msg = LocUtils.getString( context, msgID, inviter, dict, langStr ); + String msg = LocUtils.getString( context, msgID, inviter, dict, + LocUtils.xlateLang( context, langStr)); return LocUtils.makeAlertBuilder( context ) .setTitle( R.string.invite_dict_missing_title ) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RefreshNamesTask.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RefreshNamesTask.java index a37d61529..36f0b9df7 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/RefreshNamesTask.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/RefreshNamesTask.java @@ -57,11 +57,11 @@ public class RefreshNamesTask extends AsyncTask { m_lang = lang; m_nInGame = nInGame; + String langName = DictLangCache.getLangName( context, lang ); + langName = LocUtils.xlateLang( context, langName ); String msg = LocUtils.getString( context, R.string.public_names_progress_fmt, - nInGame, - DictLangCache.getLangName(context,lang) ); - m_progress = ProgressDialog.show( context, msg, null, true, - true ); + nInGame, langName ); + m_progress = ProgressDialog.show( context, msg, null, true, true ); } @Override diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListDelegate.java index d7d70096f..d403bccd9 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListDelegate.java @@ -253,8 +253,9 @@ public class StudyListDelegate extends ListDelegateBase makeAdapter(); - String langName = DictLangCache.getLangNames( m_activity )[lang]; - m_origTitle = getString( R.string.studylist_title_fmt, langName ); + String langName = DictLangCache.getLangName( m_activity, lang ); + m_origTitle = getString( R.string.studylist_title_fmt, + xlateLang( langName ) ); setTitleBar(); } @@ -284,7 +285,7 @@ public class StudyListDelegate extends ListDelegateBase String[] myNames = new String[m_langCodes.length]; for ( int ii = 0; ii < m_langCodes.length; ++ii ) { int lang = m_langCodes[ii]; - myNames[ii] = names[lang]; + myNames[ii] = xlateLang( names[lang], true ); if ( lang == startLang ) { startIndex = ii; }