From 151d9e217d6448102c0d690d3fa4c30da2bd56b2 Mon Sep 17 00:00:00 2001
From: Rechee Jozil <recheejozil@hotmail.com>
Date: Sun, 26 Feb 2017 18:00:52 -0500
Subject: [PATCH] Fix Issue #131

---
 .../uhabits/commands/ArchiveHabitsCommand.java       | 12 ++++++++++--
 .../isoron/uhabits/commands/DeleteHabitsCommand.java | 12 ++++++++++--
 .../uhabits/commands/UnarchiveHabitsCommand.java     | 12 ++++++++++--
 app/src/main/res/values/strings.xml                  | 10 +++++++---
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/commands/ArchiveHabitsCommand.java b/app/src/main/java/org/isoron/uhabits/commands/ArchiveHabitsCommand.java
index 51993e7c7..b366f741d 100644
--- a/app/src/main/java/org/isoron/uhabits/commands/ArchiveHabitsCommand.java
+++ b/app/src/main/java/org/isoron/uhabits/commands/ArchiveHabitsCommand.java
@@ -49,13 +49,21 @@ public class ArchiveHabitsCommand extends Command
     @Override
     public Integer getExecuteStringId()
     {
-        return R.string.toast_habit_archived;
+        if(selectedHabits.size() == 1){
+            return R.string.toast_habit_archived;
+        }
+
+        return R.string.toast_habits_archived;
     }
 
     @Override
     public Integer getUndoStringId()
     {
-        return R.string.toast_habit_unarchived;
+        if(selectedHabits.size() == 1){
+            return R.string.toast_habit_unarchived;
+        }
+
+        return R.string.toast_habits_unarchived;
     }
 
     @Override
diff --git a/app/src/main/java/org/isoron/uhabits/commands/DeleteHabitsCommand.java b/app/src/main/java/org/isoron/uhabits/commands/DeleteHabitsCommand.java
index ca184d8bf..fc4f4cb54 100644
--- a/app/src/main/java/org/isoron/uhabits/commands/DeleteHabitsCommand.java
+++ b/app/src/main/java/org/isoron/uhabits/commands/DeleteHabitsCommand.java
@@ -49,7 +49,11 @@ public class DeleteHabitsCommand extends Command
     @Override
     public Integer getExecuteStringId()
     {
-        return R.string.toast_habit_deleted;
+        if(this.habits.size() == 1){
+            return R.string.toast_habit_deleted;
+        }
+
+        return R.string.toast_habits_deleted;
     }
 
     public List<Habit> getHabits()
@@ -60,7 +64,11 @@ public class DeleteHabitsCommand extends Command
     @Override
     public Integer getUndoStringId()
     {
-        return R.string.toast_habit_restored;
+        if(this.habits.size() == 1){
+            return R.string.toast_habit_restored;
+        }
+
+        return R.string.toast_habits_restored;
     }
 
     @Override
diff --git a/app/src/main/java/org/isoron/uhabits/commands/UnarchiveHabitsCommand.java b/app/src/main/java/org/isoron/uhabits/commands/UnarchiveHabitsCommand.java
index 6e45cda7b..9a903d510 100644
--- a/app/src/main/java/org/isoron/uhabits/commands/UnarchiveHabitsCommand.java
+++ b/app/src/main/java/org/isoron/uhabits/commands/UnarchiveHabitsCommand.java
@@ -56,12 +56,20 @@ public class UnarchiveHabitsCommand extends Command
     @Override
     public Integer getExecuteStringId()
     {
-        return R.string.toast_habit_unarchived;
+        if(habits.size() == 1){
+            return R.string.toast_habit_unarchived;
+        }
+
+        return R.string.toast_habits_unarchived;
     }
 
     @Override
     public Integer getUndoStringId()
     {
-        return R.string.toast_habit_archived;
+        if(habits.size() == 1){
+            return R.string.toast_habit_archived;
+        }
+
+        return R.string.toast_habits_archived;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 04b2c20bc..0b1206a10 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,14 +31,18 @@
     <string name="color_picker_default_title">Change color</string>
 
     <string name="toast_habit_created">Habit created</string>
-    <string name="toast_habit_deleted">Habits deleted</string>
+    <string name="toast_habit_deleted">Habit deleted</string>
+    <string name="toast_habits_deleted">Habits deleted</string>
     <string name="toast_habit_restored">Habits restored</string>
+    <string name="toast_habits_restored">Habits restored</string>
     <string name="toast_nothing_to_undo">Nothing to undo</string>
     <string name="toast_nothing_to_redo">Nothing to redo</string>
     <string name="toast_habit_changed">Habit changed</string>
     <string name="toast_habit_changed_back">Habit changed back</string>
-    <string name="toast_habit_archived">Habits archived</string>
-    <string name="toast_habit_unarchived">Habits unarchived</string>
+    <string name="toast_habit_archived">Habit archived</string>
+    <string name="toast_habits_archived">Habits archived</string>
+    <string name="toast_habit_unarchived">Habit unarchived</string>
+    <string name="toast_habits_unarchived">Habits unarchived</string>
 
     <string name="title_activity_show_habit" translatable="false"/>
     <string name="overview">Overview</string>