diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java index 01fe129b6..65cf1d8f5 100644 --- a/xwords4/android/XWords4/archive/R.java +++ b/xwords4/android/XWords4/archive/R.java @@ -841,6 +841,8 @@ public final class R { substituted for %1$s. */ public static final int chat_title_fmt=0x7f050170; + public static final int checking_for_fmt=0x7f0502f9; + public static final int checking_title=0x7f0502f8; public static final int checkupdates_none_found=0x7f050225; /** color of the "crosshairs", lines drawn vertically and horizontally through the square the user is currently diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index a3307f91f..b95dff2e6 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -2459,5 +2459,7 @@ Update between releases Get intermediate builds + Checking + Checking server for %1$s wordlists… diff --git a/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml b/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml index 7ac392900..14c2931e0 100644 --- a/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ba_CK/strings.xml @@ -2129,4 +2129,6 @@ Sferp detaler ot ppa-ni noitazilacol Etadpu neewteb sesaeler Teg etaidemretni sdliub + Gnikcehc + Gnikcehc revres rof %1$s stsildrow… diff --git a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml index b2870f28e..d78605d79 100644 --- a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml @@ -2129,4 +2129,6 @@ PREFS RELATED TO IN-APP LOCALIZATION UPDATE BETWEEN RELEASES GET INTERMEDIATE BUILDS + CHECKING + CHECKING SERVER FOR %1$s WORDLISTS… diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java index aa94e4fc2..505ba67a6 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java @@ -584,6 +584,7 @@ public class GamesListDelegate extends ListDelegateBase private String m_origTitle; private boolean m_nextIsSolo; private Button[] m_newGameButtons; + private boolean m_haveShownGetDict; public GamesListDelegate( ListDelegator delegator, Bundle sis ) { @@ -1903,8 +1904,11 @@ public class GamesListDelegate extends ListDelegateBase private void getDictForLangIf() { - if ( ! XWPrefs.getPrefsBoolean( m_activity, R.string.key_got_langdict, + if ( ! m_haveShownGetDict && + ! XWPrefs.getPrefsBoolean( m_activity, R.string.key_got_langdict, false ) ) { + m_haveShownGetDict = true; + String lc = Locale.getDefault().getLanguage(); if ( !lc.equals("en") ) { int code = LocUtils.codeForLangCode( m_activity, lc ); @@ -1917,14 +1921,15 @@ public class GamesListDelegate extends ListDelegateBase true ); } }; + OnGotLcDictListener lstnr = new OnGotLcDictListener() { public void gotDictInfo( boolean success, String lang, String name ) { + stopProgress(); if ( success ) { - String locLang = xlateLang( lang ); String msg = getString( R.string.confirm_get_locdict_fmt, - locLang ); + xlateLang( lang ) ); showConfirmThen( onNA, msg, R.string .button_download, Action.DWNLD_LOC_DICT, @@ -1932,6 +1937,11 @@ public class GamesListDelegate extends ListDelegateBase } } }; + + String langName = DictLangCache.getLangName( m_activity, code ); + String locLang = xlateLang( langName ); + String msg = getString( R.string.checking_for_fmt, locLang ); + startProgress( R.string.checking_title, msg ); DictsDelegate.downloadDefaultDict( m_activity, lc, lstnr ); } }