From b7141f3e0aaa9d73bf9caf27e9beed7aa1a07819 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <stefan.niedermann@googlemail.com>
Date: Mon, 8 Feb 2016 22:52:53 +0100
Subject: #68 integrate a singular and plural version of <string
 name="ab_selected">

---
 .../owncloud/notes/android/activity/NotesListViewActivity.java    | 7 +++----
 app/src/main/res/values-fr/plurals.xml                            | 8 ++++++++
 app/src/main/res/values/plurals.xml                               | 7 +++++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/values-fr/plurals.xml
 create mode 100644 app/src/main/res/values/plurals.xml

(limited to 'app')

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
index 29304695..85e1e30f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
@@ -308,8 +308,8 @@ public class NotesListViewActivity extends AppCompatActivity implements
             } else {
                 v.setSelected(true);
             }
-            mActionMode.setTitle(String.valueOf(adapter.getSelected().size())
-                    + " " + getString(R.string.ab_selected));
+            int size = adapter.getSelected().size();
+            mActionMode.setTitle(String.valueOf(getResources().getQuantityString(R.plurals.ab_selected, size, size)));
             int checkedItemCount = adapter.getSelected().size();
             boolean hasCheckedItems = checkedItemCount > 0;
 
@@ -350,8 +350,7 @@ public class NotesListViewActivity extends AppCompatActivity implements
             v.setSelected(selected);
             mActionMode = startSupportActionMode(new MultiSelectedActionModeCallback());
             int checkedItemCount = adapter.getSelected().size();
-            mActionMode.setTitle(String.valueOf(checkedItemCount)
-                    + " " + getString(R.string.ab_selected));
+            mActionMode.setTitle(getResources().getQuantityString(R.plurals.ab_selected, checkedItemCount, checkedItemCount));
         }
         return selected;
     }
diff --git a/app/src/main/res/values-fr/plurals.xml b/app/src/main/res/values-fr/plurals.xml
new file mode 100644
index 00000000..10d39f3d
--- /dev/null
+++ b/app/src/main/res/values-fr/plurals.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals
+        name="ab_selected">
+        <item quantity="one">%d selected fr</item>
+        <item quantity="other">%d selected fr</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml
new file mode 100644
index 00000000..5c239b3e
--- /dev/null
+++ b/app/src/main/res/values/plurals.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals
+        name="ab_selected">
+        <item quantity="other">%d selected</item>
+    </plurals>
+</resources>
\ No newline at end of file
-- 
cgit v1.2.3