don't show wordlist note line unless present

This commit is contained in:
Eric House 2021-01-01 16:47:12 -08:00
parent ebe1c5a22d
commit 07c4deb185
9 changed files with 21 additions and 16 deletions

View file

@ -110,7 +110,6 @@ public class DictsDelegate extends ListDelegateBase
private String m_onServerStr;
private String m_lastLang;
private String m_lastDict;
private String m_noteNone;
private static interface SafePopup {
public void doPopup( Delegator dlgtor, View button,
@ -484,7 +483,6 @@ public class DictsDelegate extends ListDelegateBase
m_expandedItems = new HashSet<>();
m_locNames = getStringArray( R.array.loc_names );
m_noteNone = getString( R.string.note_none );
m_listView = getListView();
m_listView.setOnItemLongClickListener( this );
@ -1150,9 +1148,11 @@ public class DictsDelegate extends ListDelegateBase
} );
long kBytes = (info.m_nBytes + 999) / 1000;
String note = null == info.m_note ? m_noteNone : info.m_note;
String msg = getString( R.string.dict_info_fmt, info.m_nWords,
kBytes, note );
kBytes );
if ( ! TextUtils.isEmpty(info.m_note) ) {
msg += "\n" + getString( R.string.dict_info_note_fmt, info.m_note );
}
TextView summary = (TextView)view.findViewById( R.id.details );
summary.setText( msg );

View file

@ -2140,11 +2140,12 @@
version[s] of %1$s now?</string>
<string name="progress_title">Downloading</string>
<string name="dict_info_fmt">Number of words: %1$d\nDownload size:
%2$dK\nNote: %3$s</string>
%2$dK</string>
<string name="dict_info_note_fmt">Note: %1$s</string>
<string name="note_none">(None)</string>
<string name="dict_on_server">Tap for details</string>
<plurals name="lang_name_fmt">
<item quantity="one">%1$s (%2$d wordlist)</item>
<item quantity="one">%1$s (one wordlist)</item>
<item quantity="other">%1$s (%2$d wordlists)</item>
</plurals>
<string name="dict_desc_fmt">%1$s (%2$s/%3$d words)</string>

View file

@ -520,7 +520,8 @@ Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu
<string name="delete_dicts">Suprimeix els diccionaris</string>
<string name="show_remote">Mostra els baixables</string>
<string name="progress_title">S\'està baixant</string>
<string name="dict_info_fmt">Nombre de paraules: %1$d\nMida de la baixada: %2$dK\nNota: %3$s</string>
<string name="dict_info_fmt">Nombre de paraules: %1$d\nMida de la baixada: %2$dK</string>
<string name="dict_info_note_fmt">Nota: %1$s</string>
<string name="note_none">(Cap)</string>
<string name="dict_on_server">Toqueu per a baixar</string>
<string name="dict_desc_fmt">%1$s (%2$s/%3$d paraules)</string>

View file

@ -807,8 +807,8 @@
<string name="update_dicts_fmt">Es sind Aktualisierungen für mindestens eine installierte Wortliste verfügbar. Wollen Sie die neue(n) Version(en) von %1$s jetzt herunterladen?</string>
<string name="progress_title">Wird heruntergeladen</string>
<string name="dict_info_fmt">Wortanzahl: %1$d
\nDownload-Größe: %2$dK
\nHinweis: %3$s</string>
\nDownload-Größe: %2$dK</string>
<string name="dict_info_note_fmt">Hinweis: %1$s</string>
<string name="note_none">(Keiner)</string>
<string name="new_game">Neue Ein-Geräte-Partie</string>
<string name="disable_nag_solo_title">Erinnerungen für Solitair-Partien deaktivieren</string>

View file

@ -2472,7 +2472,8 @@ versions de %1$s maintenant ?</string>
<!--<string name="dict_info_fmt">Number of words: %1$d\nDownload size:
%2$dK\nNote: %3$s</string>-->
<string name="dict_info_fmt">Nombre de mots : %1$d\nTaille du
téléchargement : %2$dk\nNote : %3$s</string>
téléchargement : %2$dk</string>
<string name="dict_info_note_fmt">Note : %1$s</string>
<!--<string name="note_none">(None)</string>-->
<string name="note_none">(aucune)</string>
<!--<string name="dict_on_server">Tap to download</string>-->

View file

@ -571,7 +571,8 @@
<string name="show_remote">ダウンロード可能を表示</string>
<string name="update_dicts_fmt">1 つまたは複数のインストールされている単語リストに更新があります。%1$s の新しいバージョンを今すぐダウンロードしますか?</string>
<string name="progress_title">ダウンロードしています</string>
<string name="dict_info_fmt">単語の数: %1$d\nダウンロード サイズ: %2$dK\n注: %3$s</string>
<string name="dict_info_fmt">単語の数: %1$d\nダウンロード サイズ: %2$dK</string>
<string name="dict_info_note_fmt">注: %1$s</string>
<string name="note_none">(なし)</string>
<string name="dict_on_server">詳細はタップしてください</string>
<plurals name="lang_name_fmt">

View file

@ -614,8 +614,8 @@
<string name="remote_empty">Henter ordlisteinfo fra tjener…</string>
<string name="remote_no_net">Klarte ikke å hente ordlisteinfo fra tjener.</string>
<string name="dict_info_fmt">Antall ord: %1$d
\nNedlastingsstørrelse: %2$dK
\nMerk: %3$s</string>
\nNedlastingsstørrelse: %2$dK</string>
<string name="dict_info_note_fmt">Merk: %1$s</string>
<string name="note_none">(Ingen)</string>
<string name="nag_title">Påminnelse: Det er din tur</string>
<plurals name="nag_minutes_fmt">

View file

@ -559,7 +559,8 @@
<string name="show_remote">Toon downloadbaar</string>
<string name="update_dicts_fmt">Updates zijn beschikbaar voor een of meer geïnstalleerde woordenlijsten. Wil je de nieuwe versie[s] van %1$s nu downloaden?</string>
<string name="progress_title">Downloaden</string>
<string name="dict_info_fmt">Hoeveelheid woorden: %1$d\nDownloadgrootte: %2$dK\nNotitie: %3$s</string>
<string name="dict_info_fmt">Hoeveelheid woorden: %1$d\nDownloadgrootte: %2$dK</string>
<string name="dict_info_note_fmt">Notitie: %1$s</string>
<string name="note_none">(Geen)</string>
<string name="dict_on_server">Druk om te downloaden</string>
<plurals name="lang_name_fmt">

View file

@ -637,8 +637,8 @@
<string name="update_dicts_fmt">Aktualizacje są dostępne dla jednej lub więcej zainstalowanych list słów. Czy chcesz teraz pobrać nową wersję z %1$s\?</string>
<string name="progress_title">Pobieranie</string>
<string name="dict_info_fmt">Liczba słów: %1$d
\nRozmiar pliku do pobrania: %2$dK
\nUwaga: %3$s</string>
\nRozmiar pliku do pobrania: %2$dK</string>
<string name="dict_info_note_fmt">Uwaga: %1$s</string>
<string name="note_none">(Brak)</string>
<string name="dict_on_server">Dotknij, aby poznać szczegóły</string>
<plurals name="lang_name_fmt">