nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1838632 - fix edit bookmarks dialog's use of non-standard fluent attributes to use more straightforward switches between messages, r=jsudiaman,fluent-reviewers,flod

Browse source 
Depends on D181229

Differential Revision: https://phabricator.services.mozilla.com/D181230
This commit is contained in:
Gijs Kruitbosch 2023-06-19 16:30:16 +00:00
parent 2766aa90e5
commit 38e5e607ec
4 changed files with 42 additions and 23 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

23
browser/components/places/content/editBookmark.js
View file

@ -808,9 +808,9 @@ var gEditItemOverlay = {
expander.classList.toggle("expander-up", wasHidden);
expander.classList.toggle("expander-down", !wasHidden);
if (!wasHidden) {
expander.setAttribute(
"tooltiptext",
expander.getAttribute("tooltiptextdown")
document.l10n.setAttributes(
expander,
"bookmark-overlay-folders-expander2"
);
folderTreeRow.hidden = true;
this._element("chooseFolderSeparator").hidden = this._element(
@ -823,9 +823,9 @@ var gEditItemOverlay = {
// want to pay for live updates while the view is not visible.
this._folderTree.view = null;
} else {
expander.setAttribute(
"tooltiptext",
expander.getAttribute("tooltiptextup")
document.l10n.setAttributes(
expander,
"bookmark-overlay-folders-expander-hide"
);
folderTreeRow.hidden = false;
@ -1032,9 +1032,9 @@ var gEditItemOverlay = {
expander.classList.toggle("expander-up", tagsSelectorRow.hidden);
expander.classList.toggle("expander-down", !tagsSelectorRow.hidden);
if (tagsSelectorRow.hidden) {
expander.setAttribute(
"tooltiptext",
expander.getAttribute("tooltiptextup")
document.l10n.setAttributes(
expander,
"bookmark-overlay-tags-expander-hide"
);
tagsSelectorRow.hidden = false;
await this._rebuildTagsSelectorList();
@ -1043,10 +1043,7 @@ var gEditItemOverlay = {
tagsSelector.addEventListener("mousedown", this);
tagsSelector.addEventListener("keypress", this);
} else {
expander.setAttribute(
"tooltiptext",
expander.getAttribute("tooltiptextdown")
);
document.l10n.setAttributes(expander, "bookmark-overlay-tags-expander2");
tagsSelectorRow.hidden = true;
// This is a no-op if we've removed the listener.

6
browser/components/places/content/editBookmarkPanel.inc.xhtml
View file

@ -48,8 +48,7 @@
</menulist>
<button id="editBMPanel_foldersExpander"
class="expander-down panel-button"
data-l10n-id="bookmark-overlay-folders-expander"
data-l10n-attrs="tooltiptextdown, tooltiptextup"
data-l10n-id="bookmark-overlay-folders-expander2"
oncommand="gEditItemOverlay.toggleFolderTreeVisibility();"/>
</hbox>
@ -94,8 +93,7 @@
</popupset>
<button id="editBMPanel_tagsSelectorExpander"
class="expander-down panel-button"
data-l10n-id="bookmark-overlay-tags-expander"
data-l10n-attrs="tooltiptextdown, tooltiptextup"
data-l10n-id="bookmark-overlay-tags-expander2"
oncommand="gEditItemOverlay.toggleTagsSelector().catch(Cu.reportError);"/>
</hbox>

14
browser/locales/en-US/browser/editBookmarkOverlay.ftl
View file

@ -19,10 +19,11 @@ bookmark-overlay-location-2 =
bookmark-overlay-choose =
.label = Choose…
bookmark-overlay-folders-expander =
bookmark-overlay-folders-expander2 =
.tooltiptext = Show all the bookmarks folders
.tooltiptextdown = { bookmark-overlay-folders-expander.tooltiptext }
.tooltiptextup = Hide
bookmark-overlay-folders-expander-hide =
.tooltiptext = Hide
bookmark-overlay-new-folder-button =
.label = New Folder
@ -35,10 +36,11 @@ bookmark-overlay-tags-2 =
bookmark-overlay-tags-empty-description =
.placeholder = Separate tags with commas
bookmark-overlay-tags-expander =
bookmark-overlay-tags-expander2 =
.tooltiptext = Show all tags
.tooltiptextdown = { bookmark-overlay-tags-expander.tooltiptext }
.tooltiptextup = Hide
bookmark-overlay-tags-expander-hide =
.tooltiptext = Hide
bookmark-overlay-keyword-2 =
.value = Keyword

22
python/l10n/fluent_migrations/bug_1838632_remove_use_of_arbitrary_attributes_from_fluent_users.py
View file

@ -24,3 +24,25 @@ connection-proxy-autologin-checkbox =
from_path=connection_ftl,
),
)
edit_bookmarks_ftl = "browser/browser/editBookmarkOverlay.ftl"
ctx.add_transforms(
edit_bookmarks_ftl,
edit_bookmarks_ftl,
transforms_from(
"""
bookmark-overlay-folders-expander2 =
.tooltiptext = {COPY_PATTERN(from_path, "bookmark-overlay-folders-expander.tooltiptext")}
bookmark-overlay-folders-expander-hide =
.tooltiptext = {COPY_PATTERN(from_path, "bookmark-overlay-folders-expander.tooltiptextup")}
bookmark-overlay-tags-expander2 =
.tooltiptext = {COPY_PATTERN(from_path, "bookmark-overlay-tags-expander.tooltiptext")}
bookmark-overlay-tags-expander-hide =
.tooltiptext = {COPY_PATTERN(from_path, "bookmark-overlay-tags-expander.tooltiptextup")}
""",
from_path=edit_bookmarks_ftl,
),
)