Merge 151d9e217d into 2dd14dbf04

app/src/main/java/org/isoron/uhabits/commands/ArchiveHabitsCommand.java

@@ -53,13 +53,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

app/src/main/java/org/isoron/uhabits/commands/DeleteHabitsCommand.java

@@ -55,7 +55,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> getSelected()
@@ -66,7 +70,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

app/src/main/java/org/isoron/uhabits/commands/UnarchiveHabitsCommand.java

@@ -54,13 +54,21 @@ 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;
     }
 
     @Override

app/src/main/res/values/strings.xml

@@ -30,14 +30,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>