Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 14:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 828a968d0d1d (bug 1730953) for causing browser-chrome failures. CLOSED TREE

Browse Source
This commit is contained in:
criss 2021-09-27 21:00:19 +03:00
parent 53a01f5fb9
commit fd452e339e
14 changed files with 44 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/browser-doctype.inc
View File

@ -1,4 +1,6 @@
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%brandDTD;
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
%browserDTD;
<!ENTITY % placesDTD SYSTEM "chrome://browser/locale/places/places.dtd">
%placesDTD;

8
browser/base/content/hiddenWindowMac.xhtml
View File

@ -17,10 +17,6 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
data-l10n-sync="true">
<linkset>
<html:link rel="localization" href="browser/appmenu.ftl"/>
</linkset>
#include macWindow.inc.xhtml
<!-- Dock menu -->
@ -31,9 +27,9 @@
<menupopup id="menu_mac_dockmenu" aria-hidden="true">
<!-- The command cannot be cmd_newNavigator because we need to activate
the application. -->
<menuitem data-l10n-id="appmenuitem-new-window" oncommand="OpenBrowserWindowFromDockMenu();"
<menuitem label="&newNavigatorCmd.label;" oncommand="OpenBrowserWindowFromDockMenu();"
id="macDockMenuNewWindow" />
<menuitem data-l10n-id="appmenuitem-new-private-window" oncommand="OpenBrowserWindowFromDockMenu({private: true});"
<menuitem label="&newPrivateWindow.label;" oncommand="OpenBrowserWindowFromDockMenu({private: true});"
id="macDockMenuNewPrivateWindow" />
</menupopup>
</popupset>

5
browser/base/content/webext-panels.xhtml
View File

@ -9,6 +9,11 @@
<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
%browserDTD;
]>
<window id="webextpanels-window"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

2
browser/components/places/content/bookmarksSidebar.xhtml
View File

@ -11,6 +11,8 @@
<!DOCTYPE window [
<!ENTITY % editMenuDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
%editMenuDTD;
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
%browserDTD;
]>
<window id="bookmarksPanel"

4
browser/components/places/content/historySidebar.xhtml
View File

@ -11,6 +11,8 @@
<!DOCTYPE window [
<!ENTITY % editMenuDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
%editMenuDTD;
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
%browserDTD;
]>
<window id="history-panel"
@ -20,7 +22,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="HistorySidebarInit();"
onunload="PlacesUIUtils.setMouseoverURL('', window);"
data-l10n-id="places-history">
aria-label="&historyButton.label;">
<script src="chrome://browser/content/places/historySidebar.js"/>
<script src="chrome://global/content/globalOverlay.js"/>

2
browser/components/places/content/places.xhtml
View File

@ -19,6 +19,8 @@
%placesDTD;
<!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
%editMenuOverlayDTD;
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
%browserDTD;
#ifdef XP_MACOSX
#include ../../../base/content/browser-doctype.inc
#endif

12
browser/components/search/content/searchbar.js
View File

@ -24,23 +24,25 @@
static get markup() {
return `
<stringbundle src="chrome://browser/locale/search.properties"></stringbundle>
<hbox class="searchbar-search-button" data-l10n-id="search-icon">
<hbox class="searchbar-search-button" tooltiptext="&searchIcon.tooltip;">
<image class="searchbar-search-icon"></image>
<image class="searchbar-search-icon-overlay"></image>
</hbox>
<html:input class="searchbar-textbox" is="autocomplete-input" type="search" data-l10n-id="search-input" autocompletepopup="PopupSearchAutoComplete" autocompletesearch="search-autocomplete" autocompletesearchparam="searchbar-history" maxrows="10" completeselectedindex="true" minresultsforpopup="0"/>
<html:input class="searchbar-textbox" is="autocomplete-input" type="search" placeholder="&searchInput.placeholder;" autocompletepopup="PopupSearchAutoComplete" autocompletesearch="search-autocomplete" autocompletesearchparam="searchbar-history" maxrows="10" completeselectedindex="true" minresultsforpopup="0"/>
<menupopup class="textbox-contextmenu"></menupopup>
<hbox class="search-go-container">
<image class="search-go-button urlbar-icon" hidden="true" onclick="handleSearchCommand(event);" data-l10n-id="content-search-submit"></image>
<image class="search-go-button urlbar-icon" hidden="true" onclick="handleSearchCommand(event);" tooltiptext="&contentSearchSubmit.tooltip;"></image>
</hbox>
`;
}
static get entities() {
return ["chrome://browser/locale/browser.dtd"];
}
constructor() {
super();
MozXULElement.insertFTLIfNeeded("browser/search.ftl");
this.destroy = this.destroy.bind(this);
this._setupEventListeners();
let searchbar = this;

2
browser/locales/en-US/browser/places.ftl
View File

@ -55,8 +55,6 @@ places-by-day-and-site =
places-history-search =
.placeholder = Search history
places-history =
.aria-label = History
places-bookmarks-search =
.placeholder = Search bookmarks

10
browser/locales/en-US/browser/search.ftl
View File

@ -18,13 +18,3 @@ opensearch-error-download-desc =
{ -brand-short-name } could not download the search plugin from: { $location-url }
##
searchbar-submit =
.tooltiptext = Submit search
# This string is displayed in the search box when the input field is empty
searchbar-input =
.placeholder = Search
searchbar-icon =
.tooltiptext = Search

17
browser/locales/en-US/chrome/browser/browser.dtd Normal file
View File

@ -0,0 +1,17 @@
<!-- 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/. -->
<!-- Toolbar items -->
<!ENTITY historyButton.label "History">
<!ENTITY newNavigatorCmd.label "New Window">
<!ENTITY newPrivateWindow.label "New Private Window">
<!ENTITY contentSearchSubmit.tooltip "Submit search">
<!-- LOCALIZATION NOTE (searchInput.placeholder):
This string is displayed in the search box when the input field is empty. -->
<!ENTITY searchInput.placeholder "Search">
<!ENTITY searchIcon.tooltip "Search">

1
browser/locales/jar.mn
View File

@ -21,6 +21,7 @@
locale/browser/accounts.properties (%chrome/browser/accounts.properties)
locale/browser/app-extension-fields.properties (%chrome/browser/app-extension-fields.properties)
locale/browser/browser.dtd (%chrome/browser/browser.dtd)
locale/browser/browser.properties (%chrome/browser/browser.properties)
locale/browser/customizableui/customizableWidgets.properties (%chrome/browser/customizableui/customizableWidgets.properties)
locale/browser/uiDensity.properties (%chrome/browser/uiDensity.properties)

2
devtools/client/locales/en-US/toolbox.properties
View File

@ -84,7 +84,7 @@ toolbox.previousTool.key=CmdOrCtrl+[
# LOCALIZATION NOTE (toolbox.zoom*.key)
# Key shortcuts used to zomm in/out or reset the toolbox
# Should match full-zoom-*-shortcut values from browserSets.ftl
# Should match fullZoom*Cmd.commandkey values from browser.dtd
toolbox.zoomIn.key=CmdOrCtrl+Plus
toolbox.zoomIn2.key=CmdOrCtrl+=

42
python/l10n/fluent_migrations/bug_1730953_browserDTD.py
View File

@ -1,42 +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, VARIABLE_REFERENCE
from fluent.migrate import REPLACE, COPY
def migrate(ctx):
"""Bug 1730953 - Migrate strings from browser.dtd to Fluent, part {index}"""
ctx.add_transforms(
"browser/browser/places.ftl",
"browser/browser/places.ftl",
transforms_from(
"""
places-history =
.aria-label = { COPY(from_path, "historyButton.label") }
""",
from_path="browser/chrome/browser/browser.dtd",
),
)
ctx.add_transforms(
"browser/browser/search.ftl",
"browser/browser/search.ftl",
transforms_from(
"""
searchbar-submit =
.tooltiptext = { COPY(from_path, "contentSearchSubmit.tooltip") }
searchbar-input =
.placeholder = { COPY(from_path, "searchInput.placeholder") }
searchbar-icon =
.tooltiptext = { COPY(from_path, "searchIcon.tooltip") }
""",
from_path="browser/chrome/browser/browser.dtd",
),
)

2
services/common/tests/unit/test_utils_makeURI.js
View File

@ -41,6 +41,8 @@ function _test_makeURI() {
Assert.equal(CommonUtils.makeURI(uric1).spec, uric1);
let uric2 = "chrome://browser/skin/browser.css";
Assert.equal(CommonUtils.makeURI(uric2).spec, uric2);
let uric3 = "chrome://browser/locale/browser.dtd";
Assert.equal(CommonUtils.makeURI(uric3).spec, uric3);
_("Check about uris");
let uria1 = "about:weave";