diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java index 6931652b3..3726a6e4b 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java @@ -63,6 +63,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -134,12 +135,21 @@ public class DictsDelegate extends ListDelegateBase } } private static class LangInfo { - int m_numDicts; + int m_numDictsInst; + int m_numDictsAvail; int m_posn; - public LangInfo( int posn, int numDicts ) + public LangInfo( int posn, Collection objs ) { m_posn = posn; - m_numDicts = numDicts; + for ( Object obj : objs ) { + if ( obj instanceof DictInfo ) { + ++m_numDictsAvail; + } else if ( obj instanceof DictAndLoc ) { + ++m_numDictsInst; + } else { + Assert.failDbg(); + } + } } } private HashMap m_remoteInfo; @@ -173,7 +183,7 @@ public class DictsDelegate extends ListDelegateBase ArrayList items = makeLangItems( langName ); Assert.assertTrueNR( 0 < items.size() ); - alist.add( new LangInfo( ii, items.size() ) ); + alist.add( new LangInfo( ii, items ) ); if ( ! m_closedLangs.contains( langName ) ) { alist.addAll( items ); } @@ -194,12 +204,21 @@ public class DictsDelegate extends ListDelegateBase langName ); boolean expanded = ! m_closedLangs.contains( langName ); String locLangName = xlateLang( langName ); - String name = getQuantityString( R.plurals.lang_name_fmt, - info.m_numDicts, - locLangName, info.m_numDicts ); - name = Utils.capitalize( name ); + String details = null; + if ( 0 < info.m_numDictsInst && 0 < info.m_numDictsAvail ) { + details = getString( R.string.dict_lang_inst_and_avail, + info.m_numDictsInst, info.m_numDictsAvail ); + } else if ( 0 < info.m_numDictsAvail ) { + details = getString( R.string.dict_lang_avail, + info.m_numDictsAvail ); + } else if ( 0 < info.m_numDictsInst ) { + details = getString( R.string.dict_lang_inst, info.m_numDictsInst ); + } else { + Assert.failDbg(); + } + String title = Utils.capitalize( locLangName ) + " " + details; result = ListGroup.make( m_context, convertView, - DictsDelegate.this, groupPos, name, + DictsDelegate.this, groupPos, title, expanded ); } else { XWListItem item; diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index 306f29ff7..39b85fba7 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -2188,10 +2188,13 @@ Note: %1$s (None) Tap for details - - %1$s (one wordlist) - %1$s (%2$d wordlists) - + + (Available: %1$d) + (Installed: %1$d) + (Installed: %1$d; Available: %2$d) %1$s (%2$s/%3$d words) Unknown This screen lets you install new diff --git a/xwords4/android/res_src/values-ca/strings.xml b/xwords4/android/res_src/values-ca/strings.xml index 57b9b5f99..1242062ec 100644 --- a/xwords4/android/res_src/values-ca/strings.xml +++ b/xwords4/android/res_src/values-ca/strings.xml @@ -563,10 +563,6 @@ Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu Obtén construccions intermèdies S\'està comprovant S\'estan comprovant els diccionaris a %1$s… - - %1$s (%2$d diccionari) - %1$s (%2$d diccionaris) - %1$d hora %1$d hores diff --git a/xwords4/android/res_src/values-de/strings.xml b/xwords4/android/res_src/values-de/strings.xml index 0fe850eb5..816cba95a 100644 --- a/xwords4/android/res_src/values-de/strings.xml +++ b/xwords4/android/res_src/values-de/strings.xml @@ -605,10 +605,6 @@ Wortliste(n) löschen Herunterladbare anzeigen Für Details antippen - - %1$s (%2$d Wortliste) - %1$s (%2$d Wortlisten) - %1$s (%2$s/%3$d Wörter) Unbekannt Auf dieser Bildschirmseite können Sie neue Wortlisten installieren und die bereits installierten anzeigen. diff --git a/xwords4/android/res_src/values-fr/strings.xml b/xwords4/android/res_src/values-fr/strings.xml index 32dd8c2cc..30951b1ca 100644 --- a/xwords4/android/res_src/values-fr/strings.xml +++ b/xwords4/android/res_src/values-fr/strings.xml @@ -2454,12 +2454,6 @@ versions de %1$s maintenant ? (aucune) Appuyer pour les détails - - - - %1$s (une liste de mots) - %1$s (%2$d listes de mots) - %1$s (%2$s/%3$d mots) diff --git a/xwords4/android/res_src/values-it/strings.xml b/xwords4/android/res_src/values-it/strings.xml index c93d05deb..843a66edc 100644 --- a/xwords4/android/res_src/values-it/strings.xml +++ b/xwords4/android/res_src/values-it/strings.xml @@ -235,10 +235,6 @@ Modifica Questa partita non ha modo di collegarsi e non può essere salvata. Vuoi abbandonare le modifiche o modificarla per avere delle opzioni di connessione\? Ogni partita in linea deve avere almeno un modo per collegarsi. Se non hai un opzione di base impostata,ogni nuova partita dovrà essere configurata manualmente. - - %1$s (una lista parole) - %1$s (%2$d liste parole) - Tocca per dettagli (Nessuna) Note: %1$s diff --git a/xwords4/android/res_src/values-ja/strings.xml b/xwords4/android/res_src/values-ja/strings.xml index a9328e2ba..9a4283735 100644 --- a/xwords4/android/res_src/values-ja/strings.xml +++ b/xwords4/android/res_src/values-ja/strings.xml @@ -571,9 +571,6 @@ 注: %1$s (なし) 詳細はタップしてください - - %1$s (%2$d 単語リスト) - %1$s (%2$s/%3$d 語) 不明 この画面では、新しい単語リストをインストールしたり、既に持っているものを表示できます。 diff --git a/xwords4/android/res_src/values-nb-rNO/strings.xml b/xwords4/android/res_src/values-nb-rNO/strings.xml index fc90944e6..7863a7eb4 100644 --- a/xwords4/android/res_src/values-nb-rNO/strings.xml +++ b/xwords4/android/res_src/values-nb-rNO/strings.xml @@ -354,10 +354,6 @@ Vis nedlastbare Laster ned Trykk for detaljer - - %1$s (%2$d ordliste) - %1$s (%2$d ordlister) - %1$s (%2$s/%3$d ord) Ukjent Bruk brett- (side-ved-side) -oppsett? diff --git a/xwords4/android/res_src/values-nl/strings.xml b/xwords4/android/res_src/values-nl/strings.xml index 828e8775b..33b8bf97a 100644 --- a/xwords4/android/res_src/values-nl/strings.xml +++ b/xwords4/android/res_src/values-nl/strings.xml @@ -559,10 +559,6 @@ Notitie: %1$s (Geen) Druk om te downloaden - - %1$s (%2$d woordenlijst) - %1$s (%2$d woordenlijsten) - %1$s (%2$s/%3$d woorden) Onbekend Op dit scherm kun je nieuwe woordenlijsten installeren of woordenlijsten die je al hebt bekijken.\n\nWelke woordenlijsten je geïnstalleerd hebt bepaalt:\n• Welke talen je in kan spelen\n• Hoe slim de robotspeler is\n• Welke woorden je mag gebruiken.\n\nSchakel de \"Toon downloadbaar\" optie bovenaan in om te zien welke woordenlijsten beschikbaar zijn. diff --git a/xwords4/android/res_src/values-pl/strings.xml b/xwords4/android/res_src/values-pl/strings.xml index e395ef2bf..702c3cd3e 100644 --- a/xwords4/android/res_src/values-pl/strings.xml +++ b/xwords4/android/res_src/values-pl/strings.xml @@ -637,11 +637,6 @@ Uwaga: %1$s (Brak) Dotknij, aby poznać szczegóły - - %1$s (%2$d lista słów) - %1$s (%2$d listy słów) - %1$s (%2$d list słów) - %1$s (%2$s/%3$d słów) Nieznane Ten ekran pozwala zainstalować nowe listy słów i wyświetlić już zainstalowane. diff --git a/xwords4/android/res_src/values-pt-rBR/strings.xml b/xwords4/android/res_src/values-pt-rBR/strings.xml index bb809b4a9..04a9aedeb 100644 --- a/xwords4/android/res_src/values-pt-rBR/strings.xml +++ b/xwords4/android/res_src/values-pt-rBR/strings.xml @@ -538,10 +538,6 @@ \n \nCheque a caixa “Mostrar baixáveis” no topo para ver quais estão disponíveis. Desconhecido - - %1$s (uma lista de palavras) - %1$s (%2$d listas de palavras) - Toque para detalhes (Nenhum) Número de palavras: %1$d diff --git a/xwords4/android/res_src/values-pt/strings.xml b/xwords4/android/res_src/values-pt/strings.xml index 44367ef68..9a3142c46 100644 --- a/xwords4/android/res_src/values-pt/strings.xml +++ b/xwords4/android/res_src/values-pt/strings.xml @@ -1950,10 +1950,6 @@ \nCheque a caixa “Mostrar baixáveis” no topo para ver quais estão disponíveis. Desconhecido %1$s (%2$s de %3$d palavras) - - %1$s (uma lista de palavras) - %1$s (%2$d listas de palavras) - Toque para detalhes (Nenhum) Nota: %1$s