From 6ba125ee218817e29b490c6747ff7b65ca3cf4ed Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Mon, 28 Jan 2019 14:44:07 +0100
Subject: [PATCH] Fixed translations failing lint check
---
.../quasseldroid/ui/info/channellist/ChannelListAdapter.kt | 4 +++-
app/src/main/res/values-de/strings.xml | 6 +++++-
app/src/main/res/values-it/strings.xml | 7 +++++++
app/src/main/res/values/strings.xml | 6 +++++-
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/info/channellist/ChannelListAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/info/channellist/ChannelListAdapter.kt
index 73cae2779..6b9d849b5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/info/channellist/ChannelListAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/info/channellist/ChannelListAdapter.kt
@@ -107,7 +107,9 @@ class ChannelListAdapter @Inject constructor(
fun bind(data: IrcListHelper.ChannelDescription) {
name.text = data.channelName
topic.text = contentFormatter.formatContent(data.topic, networkId = data.netId)
- users.text = itemView.context.getString(R.string.label_user_count_display, data.userCount.toInt())
+ users.text = itemView.context.resources.getQuantityString(R.plurals.label_user_count,
+ data.userCount.toInt(),
+ data.userCount.toInt())
this.data = data
}
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 888094451..f3af62058 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -128,7 +128,6 @@
<string name="label_unknown_sender"><Unbekannt></string>
<string name="label_update_user_password">Benutzernamen/Passwort ändern</string>
<string name="label_use_default">Standardwerte benutzen</string>
- <string name="label_user_count_display">%1$d Nutzer</string>
<string name="label_user_count">Anzahl Nutzer</string>
<string name="label_website">Webseite</string>
<string name="label_whitelist">Ignorieren</string>
@@ -143,6 +142,11 @@
<string name="label_whois_long">Nutzerinformationen aktualisieren</string>
<string name="label_yes">Ja</string>
+ <plurals name="label_user_count">
+ <item quantity="one">%1$d Benutzer</item>
+ <item quantity="other">%1$d Benutzer</item>
+ </plurals>
+
<string name="label_feature_synchronizedmarkerline">Benötigt um die vorherige Position in Chats zu synchronisieren</string>
<string name="label_feature_saslauthentication">Benötigt für SASL</string>
<string name="label_feature_saslexternal">Benötigt für SASL mit Zertifikaten</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 031753735..70a48487b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -27,12 +27,14 @@
<string name="label_about">Informazioni</string>
<string name="label_accept">Accetta</string>
+ <string name="label_ascending">Ascendente</string>
<string name="label_autocomplete">Completamento automatico</string>
<string name="label_avatar">Avatar</string>
<string name="label_back">Indietro</string>
<string name="label_buffer_name">Nome della chat</string>
<string name="label_cancel">Annulla</string>
<string name="label_certificates">Certificati</string>
+ <string name="label_channel_name">Nome del canale</string>
<string name="label_clear_search">Pulisci cerca</string>
<string name="label_close">Chiudi</string>
<string name="label_colors_custom">Personalizzato</string>
@@ -45,6 +47,7 @@
<string name="label_crashes_empty">Nessun rapporto di arresto anomalo trovato</string>
<string name="label_delete">Elimina</string>
<string name="label_delete_all">Elimina tutto</string>
+ <string name="label_descending">Discendente</string>
<string name="label_disconnect">Disconnetti</string>
<string name="label_edit_core">Modifica account</string>
<string name="label_edit_nick">Modifica nickname</string>
@@ -58,6 +61,7 @@
<string name="label_ignore_long">Aggiungi o rimuovi un utente dalla lista ignorati</string>
<string name="label_info">Dettagli</string>
<string name="label_info_channel">Dettagli del canale</string>
+ <string name="label_info_channellist">Elenco dei canali</string>
<string name="label_info_core">Dettagli del core</string>
<string name="label_info_user">Dettagli dell’utente</string>
<string name="label_input_history">Storico dei messaggi</string>
@@ -103,6 +107,7 @@
<string name="label_saving">Salvataggio…</string>
<string name="label_search">Cerca…</string>
<string name="label_search_buffer">Cerca chat</string>
+ <string name="label_search_channels">Cerca canali</string>
<string name="label_select">Seleziona</string>
<string name="label_send">Invia</string>
<string name="label_service_connection_failed">Impossibile stabilire la connessione, controlla le impostazioni di risparmio della batteria. Consulta dontkillmyapp.com per maggiori informazioni.</string>
@@ -115,6 +120,7 @@
<string name="label_shortcut">Scorciatoia</string>
<string name="label_shortcut_long">Crea scorciatoia nella schermata Home</string>
<string name="label_show_hidden">Mostra nascosti</string>
+ <string name="label_sort">Ordina</string>
<string name="label_source">Sorgente</string>
<string name="label_topic">Argomento del canale</string>
<string name="label_translators">Traduttori</string>
@@ -122,6 +128,7 @@
<string name="label_unknown_sender"><Sconosciuto></string>
<string name="label_update_user_password">Aggiorna il nome utente e la password</string>
<string name="label_use_default">Utilizza i valori predefiniti</string>
+ <string name="label_user_count">Utenti totali</string>
<string name="label_website">Sito web</string>
<string name="label_whitelist">Ignora</string>
<string name="label_whitelist_certificates">Certificati</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b2402009e..4de34c032 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -128,7 +128,6 @@
<string name="label_unknown_sender"><Unknown></string>
<string name="label_update_user_password">Update User/Password</string>
<string name="label_use_default">Use Default</string>
- <string name="label_user_count_display">%1$d users</string>
<string name="label_user_count">User Count</string>
<string name="label_website">Website</string>
<string name="label_whitelist">Ignore</string>
@@ -143,6 +142,11 @@
<string name="label_whois_long">Update user information</string>
<string name="label_yes">Yes</string>
+ <plurals name="label_user_count">
+ <item quantity="one">%1$d user</item>
+ <item quantity="other">%1$d users</item>
+ </plurals>
+
<string name="label_feature_synchronizedmarkerline">Required for synchronizing the last position in channels</string>
<string name="label_feature_saslauthentication">Required for SASL</string>
<string name="label_feature_saslexternal">Required for SASL with certificates</string>
--
GitLab