mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 49509cff8c94 (bug 1624713) for causing bc failures in nsAtom.h CLOSED TREE

This commit is contained in:
Noemi Erli 2020-03-26 20:46:07 +02:00
Родитель 9dc61d1cf7
Коммит 0f8207e011
9 изменённых файлов: 48 добавлений и 109 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
browser/base/content/browser-doctype.inc
Просмотреть файл

@ -16,3 +16,5 @@
%syncBrandDTD;
<!ENTITY % brandingsDTD SYSTEM "chrome://browser/locale/brandings.dtd">
%brandingsDTD;
<!ENTITY % editBookmarkOverlayDTD SYSTEM "chrome://browser/locale/places/editBookmarkOverlay.dtd">
%editBookmarkOverlayDTD;

1
browser/base/content/browser-places.js
Просмотреть файл

@ -303,7 +303,6 @@ var StarUI = {
_createPanelIfNeeded() {
// Lazy load the editBookmarkPanel the first time we need to display it.
if (!this._element("editBookmarkPanel")) {
MozXULElement.insertFTLIfNeeded("browser/editBookmarkOverlay.ftl");
let template = this._element("editBookmarkPanelTemplate");
let clone = template.content.cloneNode(true);
template.replaceWith(clone);

9
browser/components/places/content/bookmarkProperties.xhtml
Просмотреть файл

@ -9,7 +9,10 @@
<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
<!DOCTYPE window>
<!DOCTYPE window [
<!ENTITY % editBookmarkOverlayDTD SYSTEM "chrome://browser/locale/places/editBookmarkOverlay.dtd">
%editBookmarkOverlayDTD;
]>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
@ -22,10 +25,6 @@
buttons="accept, cancel"
buttoniconaccept="save">
<linkset>
<html:link rel="localization" href="browser/editBookmarkOverlay.ftl"/>
</linkset>
<stringbundleset id="stringbundleset">
<stringbundle id="stringBundle"
src="chrome://browser/locale/places/bookmarkProperties.properties"/>

32
browser/components/places/content/editBookmarkPanel.inc.xhtml
Просмотреть файл

@ -10,7 +10,8 @@
<vbox id="editBookmarkPanelRows">
<vbox id="editBMPanel_nameRow"
collapsed="true">
<label data-l10n-id="bookmark-overlay-name"
<label value="&editBookmarkOverlay.name.label;"
accesskey="&editBookmarkOverlay.name.accesskey;"
control="editBMPanel_namePicker"/>
<html:input id="editBMPanel_namePicker"
onchange="gEditItemOverlay.onNamePickerChange().catch(Cu.reportError);"/>
@ -18,7 +19,8 @@
<vbox id="editBMPanel_locationRow"
collapsed="true">
<label data-l10n-id="bookmark-overlay-location"
<label value="&editBookmarkOverlay.location.label;"
accesskey="&editBookmarkOverlay.location.accesskey;"
control="editBMPanel_locationField"/>
<html:input id="editBMPanel_locationField"
class="uri-element"
@ -27,7 +29,7 @@
<vbox id="editBMPanel_folderRow"
collapsed="true">
<label data-l10n-id="bookmark-overlay-folder"
<label value="&editBookmarkOverlay.folder.label;"
control="editBMPanel_folderMenuList"/>
<hbox flex="1" align="center">
<menulist id="editBMPanel_folderMenuList"
@ -44,15 +46,16 @@
class="menuitem-iconic folder-icon"/>
<menuseparator id="editBMPanel_chooseFolderSeparator"/>
<menuitem id="editBMPanel_chooseFolderMenuItem"
data-l10n-id="bookmark-overlay-choose"
label="&editBookmarkOverlay.choose.label;"
class="menuitem-iconic folder-icon"/>
<menuseparator id="editBMPanel_foldersSeparator" hidden="true"/>
</menupopup>
</menulist>
<button id="editBMPanel_foldersExpander"
class="expander-down panel-button"
data-l10n-id="bookmark-overlay-folders-expander"
data-l10n-attrs="tooltiptextdown, tooltiptextup"
tooltiptext="&editBookmarkOverlay.foldersExpanderDown.tooltip;"
tooltiptextdown="&editBookmarkOverlay.foldersExpanderDown.tooltip;"
tooltiptextup="&editBookmarkOverlay.expanderUp.tooltip;"
oncommand="gEditItemOverlay.toggleFolderTreeVisibility();"/>
</hbox>
</vbox>
@ -61,15 +64,17 @@
collapsed="true">
<!-- editBMPanel_folderTree will go here when this is shown -->
<hbox id="editBMPanel_newFolderBox">
<button data-1l0n-id="bookmark-overlay-new-folder-button"
<button label="&editBookmarkOverlay.newFolderButton.label;"
id="editBMPanel_newFolderButton"
accesskey="&editBookmarkOverlay.newFolderButton.accesskey;"
oncommand="gEditItemOverlay.newFolder().catch(Cu.reportError);"/>
</hbox>
</vbox>
<vbox id="editBMPanel_tagsRow"
collapsed="true">
<label data-l10n-id="bookmark-overlay-tags"
<label value="&editBookmarkOverlay.tags.label;"
accesskey="&editBookmarkOverlay.tags.accesskey;"
control="editBMPanel_tagsField"/>
<hbox flex="1" align="center" role="combobox">
<html:input id="editBMPanel_tagsField"
@ -80,13 +85,13 @@
completedefaultindex="true"
completeselectedindex="true"
tabscrolling="true"
data-l10n-id="bookmark-overlay-tags-empty-description"
data-l10n-attrs="placeholder"
placeholder="&editBookmarkOverlay.tagsEmptyDesc.label;"
onchange="gEditItemOverlay.onTagsFieldChange();"/>
<button id="editBMPanel_tagsSelectorExpander"
class="expander-down panel-button"
data-l10n-id="bookmark-overlay-tags-expander"
data-l10n-attrs="tooltiptextdown, tooltiptextup"
tooltiptext="&editBookmarkOverlay.tagsExpanderDown.tooltip;"
tooltiptextdown="&editBookmarkOverlay.tagsExpanderDown.tooltip;"
tooltiptextup="&editBookmarkOverlay.expanderUp.tooltip;"
oncommand="gEditItemOverlay.toggleTagsSelector().catch(Cu.reportError);"/>
<popupset>
<panel is="autocomplete-richlistbox-popup"
@ -111,7 +116,8 @@
<vbox id="editBMPanel_keywordRow"
collapsed="true">
<label data-l10n-id="bookmark-overlay-keyword"
<label value="&editBookmarkOverlay.keyword.label;"
accesskey="&editBookmarkOverlay.keyword.accesskey;"
control="editBMPanel_keywordField"/>
<html:input id="editBMPanel_keywordField"
onchange="gEditItemOverlay.onKeywordFieldChange();"/>

3
browser/components/places/content/places.xhtml
Просмотреть файл

@ -23,6 +23,8 @@
%editMenuOverlayDTD;
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
%browserDTD;
<!ENTITY % editBookmarkOverlayDTD SYSTEM "chrome://browser/locale/places/editBookmarkOverlay.dtd">
%editBookmarkOverlayDTD;
#ifdef XP_MACOSX
#include ../../../base/content/browser-doctype.inc
#endif
@ -43,7 +45,6 @@
<linkset>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/>
<html:link rel="localization" href="browser/browserSets.ftl"/>
<html:link rel="localization" href="browser/editBookmarkOverlay.ftl"/>
</linkset>
<script src="chrome://browser/content/places/places.js"/>

42
browser/locales/en-US/browser/editBookmarkOverlay.ftl
Просмотреть файл

@ -1,42 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
bookmark-overlay-name =
.value = Name:
.accesskey = N
bookmark-overlay-location =
.value = Location:
.accesskey = L
bookmark-overlay-folder =
.value = Folder:
bookmark-overlay-choose =
.label = Choose…
bookmark-overlay-folders-expander =
.tooltiptext = Show all the bookmarks folders
.tooltiptextdown = { bookmark-overlay-folders-expander.tooltiptext }
.tooltiptextup = Hide
bookmark-overlay-new-folder-button =
.label = New Folder
.accesskey = o
bookmark-overlay-tags =
.value = Tags:
.accesskey = T
bookmark-overlay-tags-empty-description =
.placeholder = Separate tags with commas
bookmark-overlay-tags-expander =
.tooltiptext = Show all tags
.tooltiptextdown = { bookmark-overlay-tags-expander.tooltiptext }
.tooltiptextup = Hide
bookmark-overlay-keyword =
.value = Keyword:
.accesskey = K

20
browser/locales/en-US/chrome/browser/places/editBookmarkOverlay.dtd Normal file
Просмотреть файл

@ -0,0 +1,20 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!ENTITY editBookmarkOverlay.name.label "Name:">
<!ENTITY editBookmarkOverlay.name.accesskey "N">
<!ENTITY editBookmarkOverlay.location.label "Location:">
<!ENTITY editBookmarkOverlay.location.accesskey "L">
<!ENTITY editBookmarkOverlay.folder.label "Folder:">
<!ENTITY editBookmarkOverlay.foldersExpanderDown.tooltip "Show all the bookmarks folders">
<!ENTITY editBookmarkOverlay.expanderUp.tooltip "Hide">
<!ENTITY editBookmarkOverlay.tags.label "Tags:">
<!ENTITY editBookmarkOverlay.tags.accesskey "T">
<!ENTITY editBookmarkOverlay.tagsEmptyDesc.label "Separate tags with commas">
<!ENTITY editBookmarkOverlay.keyword.label "Keyword:">
<!ENTITY editBookmarkOverlay.keyword.accesskey "K">
<!ENTITY editBookmarkOverlay.tagsExpanderDown.tooltip "Show all tags">
<!ENTITY editBookmarkOverlay.choose.label "Choose…">
<!ENTITY editBookmarkOverlay.newFolderButton.label "New Folder">
<!ENTITY editBookmarkOverlay.newFolderButton.accesskey "o">

1
browser/locales/jar.mn
Просмотреть файл

@ -38,6 +38,7 @@
locale/browser/downloads/downloads.properties (%chrome/browser/downloads/downloads.properties)
locale/browser/places/places.dtd (%chrome/browser/places/places.dtd)
locale/browser/places/places.properties (%chrome/browser/places/places.properties)
locale/browser/places/editBookmarkOverlay.dtd (%chrome/browser/places/editBookmarkOverlay.dtd)
locale/browser/places/bookmarkProperties.properties (%chrome/browser/places/bookmarkProperties.properties)
locale/browser/safebrowsing/safebrowsing.properties (%chrome/browser/safebrowsing/safebrowsing.properties)
locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties)

47
python/l10n/fluent_migrations/bug_1624713_editBookmarkOverlay.py
Просмотреть файл

@ -1,47 +0,0 @@
# coding=utf8
# Any copyright is dedicated to the Public Domain.
# http://creativecommons.org/publicdomain/zero/1.0/
from __future__ import absolute_import
import fluent.syntax.ast as FTL
from fluent.migrate.helpers import transforms_from
def migrate(ctx):
"""Bug 1624713 - Convert editBookmarkOverlay to Fluent, part {index}."""
ctx.add_transforms(
"browser/browser/editBookmarkOverlay.ftl",
"browser/browser/editBookmarkOverlay.ftl",
transforms_from(
"""
bookmark-overlay-name =
.value = { COPY(from_path, "editBookmarkOverlay.name.label") }
.accesskey = { COPY(from_path, "editBookmarkOverlay.name.accesskey") }
bookmark-overlay-location =
.value = { COPY(from_path, "editBookmarkOverlay.location.label") }
.accesskey = { COPY(from_path, "editBookmarkOverlay.location.accesskey") }
bookmark-overlay-folder =
.value = { COPY(from_path, "editBookmarkOverlay.folder.label") }
bookmark-overlay-choose =
.label = { COPY(from_path, "editBookmarkOverlay.choose.label") }
bookmark-overlay-folders-expander =
.tooltiptext = { COPY(from_path, "editBookmarkOverlay.foldersExpanderDown.tooltip") }
.tooltiptextdown = { bookmark-overlay-folders-expander.tooltiptext }
.tooltiptextup = { COPY(from_path, "editBookmarkOverlay.expanderUp.tooltip") }
bookmark-overlay-new-folder-button =
.label = { COPY(from_path, "editBookmarkOverlay.newFolderButton.label") }
.accesskey = { COPY(from_path, "editBookmarkOverlay.newFolderButton.accesskey") }
bookmark-overlay-tags =
.value = { COPY(from_path, "editBookmarkOverlay.tags.label") }
.accesskey ={ COPY(from_path, "editBookmarkOverlay.tags.accesskey") }
bookmark-overlay-tags-empty-description =
.placeholder = { COPY(from_path, "editBookmarkOverlay.tagsEmptyDesc.label") }
bookmark-overlay-tags-expander =
.tooltiptext = { COPY(from_path, "editBookmarkOverlay.tagsExpanderDown.tooltip") }
.tooltiptextdown = { bookmark-overlay-tags-expander.tooltiptext }
.tooltiptextup = { COPY(from_path, "editBookmarkOverlay.expanderUp.tooltip") }
bookmark-overlay-keyword =
.value = { COPY(from_path, "editBookmarkOverlay.keyword.label") }
.accesskey = { COPY(from_path, "editBookmarkOverlay.keyword.accesskey") }
""", from_path="browser/chrome/browser/places/editBookmarkOverlay.dtd"))