зеркало из https://github.com/mozilla/gecko-dev.git
Bug 451586 - Removing a bookmark using the Star dialog also removes all duplicates (same url) (r=marco, l10n-r=pike)
This commit is contained in:
Родитель
2a9a97d946
Коммит
24e11f581f
|
@ -191,6 +191,14 @@ var StarUI = {
|
|||
// if the cancel button/ESC does not remove the bookmark.
|
||||
this._element("editBookmarkPanelRemoveButton").hidden = this._batching;
|
||||
|
||||
// The label of the remove button differs if the URI is bookmarked
|
||||
// multiple times.
|
||||
var bookmarks = PlacesUtils.getBookmarksForURI(gBrowser.currentURI);
|
||||
var forms = bundle.getString("editBookmark.removeBookmarks.label");
|
||||
Cu.import("resource://gre/modules/PluralForm.jsm");
|
||||
var label = PluralForm.get(bookmarks.length, forms).replace("#1", bookmarks.length);
|
||||
this._element("editBookmarkPanelRemoveButton").label = label;
|
||||
|
||||
// unset the unstarred state, if set
|
||||
this._element("editBookmarkPanelStarIcon").removeAttribute("unstarred");
|
||||
|
||||
|
|
|
@ -136,7 +136,6 @@
|
|||
accesskey="&editBookmark.undo.accessKey;"/>
|
||||
<button id="editBookmarkPanelRemoveButton"
|
||||
oncommand="StarUI.removeBookmarkButtonCommand();"
|
||||
label="&editBookmark.removeBookmark.label;"
|
||||
accesskey="&editBookmark.removeBookmark.accessKey;"/>
|
||||
<button id="editBookmarkPanelEditButton"
|
||||
oncommand="StarUI.editButtonCommand();"
|
||||
|
|
|
@ -403,7 +403,6 @@ you can use these alternative items. Otherwise, their values should be empty. -
|
|||
|
||||
<!ENTITY editBookmark.done.label "Done">
|
||||
<!ENTITY editBookmark.cancel.label "Cancel">
|
||||
<!ENTITY editBookmark.removeBookmark.label "Remove Bookmark">
|
||||
<!ENTITY editBookmark.removeBookmark.accessKey "R">
|
||||
<!ENTITY editBookmark.undo.label "Undo">
|
||||
<!ENTITY editBookmark.undo.accessKey "U">
|
||||
|
|
|
@ -135,6 +135,11 @@ editBookmarkPanel.pageBookmarkedDescription=%S will always remember this page fo
|
|||
editBookmarkPanel.bookmarkedRemovedTitle=Bookmark Removed
|
||||
editBookmarkPanel.editBookmarkTitle=Edit This Bookmark
|
||||
|
||||
# LOCALIZATION NOTE (editBookmark.removeBookmarks.label)
|
||||
# Semi-colon list of plural forms. Replacement for #1 is
|
||||
# the number of bookmarks to be removed.
|
||||
editBookmark.removeBookmarks.label=Remove Bookmark;Remove Bookmarks (#1)
|
||||
|
||||
# Geolocation UI
|
||||
# LOCALIZATION NOTE (exactLocation, neighborhoodLocation): These do not have to be
|
||||
# exact value, instead approximations would be fine.
|
||||
|
|
Загрузка…
Ссылка в новой задаче