summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2014-12-04 13:56:38 +0300
committerAndrew Dolgov <[email protected]>2014-12-04 13:56:38 +0300
commit65dff43368188c7de29223133808fef91484496a (patch)
treeb98ee98196e8c84efe229bc7ed7daf527b01f145
parent810b88f652917875bab941d7355ed555980a285a (diff)
set article comments to a plural
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java2
-rw-r--r--org.fox.ttrss/src/main/res/values-cs/strings.xml4
-rw-r--r--org.fox.ttrss/src/main/res/values-de/strings.xml5
-rw-r--r--org.fox.ttrss/src/main/res/values-es/strings.xml6
-rw-r--r--org.fox.ttrss/src/main/res/values-fr/strings.xml6
-rw-r--r--org.fox.ttrss/src/main/res/values-it/strings.xml6
-rw-r--r--org.fox.ttrss/src/main/res/values-ja/strings.xml6
-rw-r--r--org.fox.ttrss/src/main/res/values-pl/strings.xml6
-rw-r--r--org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml6
-rw-r--r--org.fox.ttrss/src/main/res/values/strings.xml6
10 files changed, 43 insertions, 10 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 81d51256..930a322d 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -255,7 +255,7 @@ public class ArticleFragment extends Fragment {
if (m_activity.getApiLevel() >= 4 && m_article.comments_count > 0) {
comments.setTextSize(TypedValue.COMPLEX_UNIT_SP, articleSmallFontSize);
- String commentsTitle = getString(R.string.article_comments, m_article.comments_count);
+ String commentsTitle = getResources().getQuantityString(R.plurals.article_comments, m_article.comments_count, m_article.comments_count);
comments.setText(commentsTitle);
//comments.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
comments.setOnClickListener(new OnClickListener() {
diff --git a/org.fox.ttrss/src/main/res/values-cs/strings.xml b/org.fox.ttrss/src/main/res/values-cs/strings.xml
index 75869c33..54afd241 100644
--- a/org.fox.ttrss/src/main/res/values-cs/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-cs/strings.xml
@@ -145,7 +145,9 @@
<string name="offline_oldest_first">Zobrazit nejstarší články jako první</string>
<string name="prefs_dim_status_bar">Matný stavový proužek</string>
<string name="prefs_dim_status_bar_long">Schová stavový proužek při čtení</string>
- <string name="article_comments">%1$d komentáře</string>
+ <plurals name="article_comments">
+ <item quantity="other">%1$d komentáře</item>
+ </plurals>
<plurals name="trial_mode_prompt">
<item quantity="other">Trial verze, %1$d dní zbývá.</item>
</plurals>
diff --git a/org.fox.ttrss/src/main/res/values-de/strings.xml b/org.fox.ttrss/src/main/res/values-de/strings.xml
index 51f04320..26800dd3 100644
--- a/org.fox.ttrss/src/main/res/values-de/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-de/strings.xml
@@ -148,7 +148,10 @@
<string name="offline_oldest_first">Älteste Artikel zuerst anzeigen</string>
<string name="prefs_dim_status_bar">Statusleiste abdunkeln</string>
<string name="prefs_dim_status_bar_long">Statusleiste beim Lesen dunkler machen</string>
- <string name="article_comments">%1$d Kommentare</string>
+
+ <plurals name="article_comments">
+ <item quantity="other">%1$d Kommentare</item>
+ </plurals>
<plurals name="trial_mode_prompt">
<item quantity="one">Testversion, noch ein Tag übrig.</item>
diff --git a/org.fox.ttrss/src/main/res/values-es/strings.xml b/org.fox.ttrss/src/main/res/values-es/strings.xml
index 3c3bc1da..20859d13 100644
--- a/org.fox.ttrss/src/main/res/values-es/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-es/strings.xml
@@ -147,7 +147,11 @@
<string name="offline_oldest_first">Mostrar artículos más antiguos primero</string>
<string name="prefs_dim_status_bar">Oscurecer barra de estado</string>
<string name="prefs_dim_status_bar_long">Oscurecer barra de estado durante lectura</string>
- <string name="article_comments">%1$d comentarios</string>
+
+ <plurals name="article_comments">
+ <item quantity="other">%1$d comentarios</item>
+ </plurals>
+
<plurals name="trial_mode_prompt">
<item quantity="other">Período de prueba, queda(n) %1$d día(s).</item>
</plurals>
diff --git a/org.fox.ttrss/src/main/res/values-fr/strings.xml b/org.fox.ttrss/src/main/res/values-fr/strings.xml
index eae21dc3..148e501c 100644
--- a/org.fox.ttrss/src/main/res/values-fr/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-fr/strings.xml
@@ -147,7 +147,11 @@
<string name="offline_oldest_first">Afficher les plus anciens d\'abord</string>
<string name="prefs_dim_status_bar">Assombrir la barre de statut</string>
<string name="prefs_dim_status_bar_long">Assombrir la barre de satut pendant la lecture</string>
- <string name="article_comments">%1$d commentaires</string>
+
+ <plurals name="article_comments">
+ <item quantity="other">%1$d commentaires</item>
+ </plurals>
+
<plurals name="trial_mode_prompt">
<item quantity="one">Mode évaluation, un seul jour restant.</item>
<item quantity="other">Mode évaluation, %1$d jours restants.</item>
diff --git a/org.fox.ttrss/src/main/res/values-it/strings.xml b/org.fox.ttrss/src/main/res/values-it/strings.xml
index be7a3c6c..219d06f4 100644
--- a/org.fox.ttrss/src/main/res/values-it/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-it/strings.xml
@@ -146,7 +146,11 @@
<string name="offline_oldest_first">Mostra prima gli articoli più vecchi</string>
<string name="prefs_dim_status_bar">Oscura la barra di stato</string>
<string name="prefs_dim_status_bar_long">Oscura la barra di stato durante la lettura</string>
- <string name="article_comments">%1$d commenti</string>
+
+ <plurals name="article_comments">
+ <item quantity="other">%1$d commenti</item>
+ </plurals>
+
<plurals name="trial_mode_prompt">
<item quantity="other">Modalità demo, %1$d giorno/i rimanenti.</item>
</plurals>
diff --git a/org.fox.ttrss/src/main/res/values-ja/strings.xml b/org.fox.ttrss/src/main/res/values-ja/strings.xml
index d9234993..c273f51b 100644
--- a/org.fox.ttrss/src/main/res/values-ja/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-ja/strings.xml
@@ -148,7 +148,11 @@
<string name="offline_oldest_first">古い記事を先頭に表示する</string>
<string name="prefs_dim_status_bar">下部ソフトキーをぼかす</string>
<string name="prefs_dim_status_bar_long">記事表示中は下部ソフトキーをぼかす</string>
- <string name="article_comments">%1$d 件のコメント</string>
+
+ <plurals name="article_comments">
+ <item quantity="other">%1$d 件のコメント</item>
+ </plurals>
+
<plurals name="trial_mode_prompt">
<item quantity="other">試用期間中。残り %1$d 日間。</item>
</plurals>
diff --git a/org.fox.ttrss/src/main/res/values-pl/strings.xml b/org.fox.ttrss/src/main/res/values-pl/strings.xml
index 304c747b..70e17117 100644
--- a/org.fox.ttrss/src/main/res/values-pl/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-pl/strings.xml
@@ -163,7 +163,11 @@
<string name="offline_oldest_first">Wyświetl najpierw najstarsze artykuły</string>
<string name="prefs_dim_status_bar">Przyciemnij pasek statusu</string>
<string name="prefs_dim_status_bar_long">Przyciemnij pasek statusu podczas czytania</string>
- <string name="article_comments">%1$d komentarzy</string>
+
+ <plurals name="article_comments">
+ <item quantity="other">%1$d komentarzy</item>
+ </plurals>
+
<plurals name="trial_mode_prompt">
<item quantity="other">Tryb wersji testowej, pozostało dni: %1$d.</item>
</plurals>
diff --git a/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml b/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml
index ac5d44fa..8c85762a 100644
--- a/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml
+++ b/org.fox.ttrss/src/main/res/values-pt-rBR/strings.xml
@@ -147,7 +147,11 @@
<string name="offline_oldest_first">Mostrar artigos mais antigos primeiro</string>
<string name="prefs_dim_status_bar">Ocultar barra de status</string>
<string name="prefs_dim_status_bar_long">Ocultar barra de status durante a leitura</string>
- <string name="article_comments">%1$d comentários</string>
+
+ <plurals name="article_comments">
+ <item quantity="other">%1$d comentários</item>
+ </plurals>
+
<plurals name="trial_mode_prompt">
<item quantity="other">Modo de teste, resta(m) %1$d dia(s).</item>
</plurals>
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index f5353153..bdfaaad6 100644
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -148,7 +148,11 @@
<string name="offline_oldest_first">Show oldest articles first</string>
<string name="prefs_dim_status_bar">Dim status bar</string>
<string name="prefs_dim_status_bar_long">Dim status bar when reading</string>
- <string name="article_comments">%1$d comments</string>
+
+ <plurals name="article_comments">
+ <item quantity="one">%1$d comment</item>
+ <item quantity="other">%1$d comments</item>
+ </plurals>
<plurals name="trial_mode_prompt">
<item quantity="one">Trial mode, only one day left.</item>