Bug 1412823 - Change the message to display when deleting a bookmark folder/item r?maliu draft
authorNevin Chen <cnevinchen@gmail.com>
Tue, 31 Oct 2017 14:46:15 +0800
changeset 689172 bf93d38e01254c9bc898f292669c11aebb1dd057
parent 689081 083a9c84fbd09a6ff9bfecabbf773650842fe1c0
child 738253 0fa7f947fd06a5f100c8bc507e734cfd54a10f83
push id86949
push userbmo:cnevinchen@gmail.com
push dateTue, 31 Oct 2017 06:50:59 +0000
reviewersmaliu
bugs1412823
milestone58.0a1
Bug 1412823 - Change the message to display when deleting a bookmark folder/item r?maliu MozReview-Commit-ID: Hg5AR2FT78a
mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/strings.xml.in
--- a/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java
@@ -548,19 +548,24 @@ public abstract class HomeFragment exten
         }
 
         @Override
         public void onPostExecute(Void result) {
             final Activity activity = activityWeakReference.get();
             if (activity == null || activity.isFinishing()) {
                 return;
             }
-
+            final int message;
+            if (info.isFolder) {
+                message = R.string.folder_removed;
+            } else {
+                message = R.string.page_removed;
+            }
             SnackbarBuilder.builder(activity)
-                    .message(R.string.page_removed)
+                    .message(message)
                     .duration(Snackbar.LENGTH_LONG)
                     .buildAndShow();
         }
 
         private void removeBookmark(ContentResolver cr) {
             SavedReaderViewHelper rch = SavedReaderViewHelper.getSavedReaderViewHelper(context);
             final boolean isReaderViewPage = rch.isURLCached(info.url);
 
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -534,16 +534,17 @@
      2 narrower (compact) columns are used for tabs in the tabs tray in portrait mode on phones. -->
 <!ENTITY pref_compact_tabs "Compact tabs">
 <!ENTITY pref_compact_tabs_summary2 "Arrange tabs in two columns in portrait mode">
 
 <!-- Localization note (page_removed): This string appears in a toast message when
      any page is removed frome about:home. This includes pages that are in history,
      bookmarks, or reading list. -->
 <!ENTITY page_removed "Page removed">
+<!ENTITY folder_removed "Folder removed">
 
 <!ENTITY bookmark_edit_title "Edit Bookmark">
 <!ENTITY bookmark_edit_folder_title "Edit Folder">
 <!ENTITY bookmark_edit_name "Name">
 <!ENTITY bookmark_edit_location "Location">
 <!ENTITY bookmark_edit_keyword "Keyword">
 <!ENTITY bookmark_select_folder "Select folder">
 
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -409,16 +409,17 @@
 
   <string name="pref_scroll_title_bar2">&pref_scroll_title_bar2;</string>
   <string name="pref_scroll_title_bar_summary">&pref_scroll_title_bar_summary2;</string>
 
   <string name="pref_compact_tabs">&pref_compact_tabs;</string>
   <string name="pref_compact_tabs_summary">&pref_compact_tabs_summary2;</string>
 
   <string name="page_removed">&page_removed;</string>
+  <string name="folder_removed">&folder_removed;</string>
 
   <string name="bookmark_edit_title">&bookmark_edit_title;</string>
   <string name="bookmark_edit_folder_title">&bookmark_edit_folder_title;</string>
   <string name="bookmark_edit_name">&bookmark_edit_name;</string>
   <string name="bookmark_edit_location">&bookmark_edit_location;</string>
   <string name="bookmark_edit_keyword">&bookmark_edit_keyword;</string>
   <string name="bookmark_select_folder">&bookmark_select_folder;</string>