Bug 1464489 - When creating a new bookmark, the bookmark panel should be titled "New Bookmark" instead of "Page Bookmarked". draft
authorDão Gottwald <dao@mozilla.com>
Fri, 25 May 2018 20:22:35 +0200
changeset 800026 d2f17573fe4ae194bbf0e569dd04602d369bd48e
parent 800025 94d7f0e1c4d0390450028972cfeb65e0550b9892
push id111234
push userdgottwald@mozilla.com
push dateFri, 25 May 2018 18:23:05 +0000
bugs1464489
milestone62.0a1
Bug 1464489 - When creating a new bookmark, the bookmark panel should be titled "New Bookmark" instead of "Page Bookmarked". MozReview-Commit-ID: 1OeIdsf3bx
browser/base/content/browser-places.js
browser/base/content/test/general/browser_bookmark_popup.js
browser/components/places/tests/browser/browser_bookmark_add_tags.js
browser/locales/en-US/chrome/browser/browser.properties
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -228,17 +228,17 @@ var StarUI = {
   async _doShowEditBookmarkPanel(aNode, aAnchorElement, aPosition, aUrl) {
     if (this.panel.state != "closed")
       return;
 
     this._blockCommands(); // un-done in the popuphidden handler
 
     this._element("editBookmarkPanelTitle").value =
       this._isNewBookmark ?
-        gNavigatorBundle.getString("editBookmarkPanel.pageBookmarkedTitle") :
+        gNavigatorBundle.getString("editBookmarkPanel.newBookmarkTitle") :
         gNavigatorBundle.getString("editBookmarkPanel.editBookmarkTitle");
 
     // No description; show the Done, Remove;
     this._element("editBookmarkPanelBottomButtons").hidden = false;
     this._element("editBookmarkPanelContent").hidden = false;
 
     this._itemGuids = [];
     await PlacesUtils.bookmarks.fetch({url: aUrl},
--- a/browser/base/content/test/general/browser_bookmark_popup.js
+++ b/browser/base/content/test/general/browser_bookmark_popup.js
@@ -57,17 +57,17 @@ async function test_bookmarks_popup({isN
         await popupEditFn();
       }
       let bookmarks = [];
       await PlacesUtils.bookmarks.fetch({url: TEST_URL}, bm => bookmarks.push(bm));
       Assert.equal(bookmarks.length, 1, "Only one bookmark should exist");
       Assert.equal(bookmarkStar.getAttribute("starred"), "true", "Page is starred");
       Assert.equal(bookmarkPanelTitle.value,
         isNewBookmark ?
-          gNavigatorBundle.getString("editBookmarkPanel.pageBookmarkedTitle") :
+          gNavigatorBundle.getString("editBookmarkPanel.newBookmarkTitle") :
           gNavigatorBundle.getString("editBookmarkPanel.editBookmarkTitle"),
         "title should match isEditingBookmark state");
       Assert.equal(bookmarkRemoveButton.label,
         isNewBookmark ?
           gNavigatorBundle.getString("editBookmarkPanel.cancel.label") :
           PluralForm.get(1, gNavigatorBundle.getString("editBookmark.removeBookmarks.label")).replace("#1", 1),
         "remove/cancel button label should match isEditingBookmark state");
 
--- a/browser/components/places/tests/browser/browser_bookmark_add_tags.js
+++ b/browser/components/places/tests/browser/browser_bookmark_add_tags.js
@@ -38,17 +38,17 @@ add_task(async function test_add_bookmar
   });
 
   let bookmarkPanelTitle = document.getElementById("editBookmarkPanelTitle");
 
   // The bookmarks panel is expected to auto-close after this step.
   await hideBookmarksPanel(async () => {
     // Click the bookmark star to bookmark the page.
     await clickBookmarkStar();
-    Assert.equal(bookmarkPanelTitle.value, gNavigatorBundle.getString("editBookmarkPanel.pageBookmarkedTitle"), "Bookmark title is correct");
+    Assert.equal(bookmarkPanelTitle.value, gNavigatorBundle.getString("editBookmarkPanel.newBookmarkTitle"), "Bookmark title is correct");
     Assert.equal(bookmarkStar.getAttribute("starred"), "true", "Page is starred");
   });
 
   // Click the bookmark star again to add tags.
   await clickBookmarkStar();
   Assert.equal(bookmarkPanelTitle.value, gNavigatorBundle.getString("editBookmarkPanel.editBookmarkTitle"), "Bookmark title is correct");
   let promiseNotification = PlacesTestUtils.waitForNotification("onItemAdded", (id, parentId, index, type, itemUrl) => {
     if (itemUrl !== null) {
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -533,19 +533,17 @@ trackingProtection.intro.description2=Wh
 # LOCALIZATION NOTE (trackingProtection.intro.step1of3): Indicates that the intro panel is step one of three in a tour.
 trackingProtection.intro.step1of3=1 of 3
 trackingProtection.intro.nextButton.label=Next
 
 trackingProtection.icon.activeTooltip=Tracking attempts blocked
 trackingProtection.icon.disabledTooltip=Tracking content detected
 
 # Edit Bookmark UI
-editBookmarkPanel.pageBookmarkedTitle=Page Bookmarked
-editBookmarkPanel.pageBookmarkedDescription=%S will always remember this page for you.
-editBookmarkPanel.bookmarkedRemovedTitle=Bookmark Removed
+editBookmarkPanel.newBookmarkTitle=New Bookmark
 editBookmarkPanel.editBookmarkTitle=Edit This Bookmark
 editBookmarkPanel.cancel.label=Cancel
 editBookmarkPanel.cancel.accesskey=C
 
 # LOCALIZATION NOTE (editBookmark.removeBookmarks.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Replacement for #1 is the number of bookmarks to be removed.
 # If this causes problems with localization you can also do "Remove Bookmarks (#1)"