author | Edouard Oger <eoger@fastmail.com> |
Mon, 11 Apr 2016 11:49:34 -0700 | |
changeset 292792 | 88a5069742fee445e11923ad865f8a9bf88a25eb |
parent 292791 | b98d8b88dfc702363e8974a230b590ce79bc920d |
child 292793 | 60ea379dd10231fd7970b7244b656ccd0af0b6a6 |
push id | 74979 |
push user | cbook@mozilla.com |
push date | Tue, 12 Apr 2016 11:53:25 +0000 |
treeherder | mozilla-inbound@cb2b8b7bc47f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | flod |
bugs | 1263441 |
milestone | 48.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/components/customizableui/CustomizableWidgets.jsm +++ b/browser/components/customizableui/CustomizableWidgets.jsm @@ -306,26 +306,24 @@ const CustomizableWidgets = [ obnode.setAttribute("element", "sync-status"); obnode.setAttribute("attribute", "syncstatus"); aNode.appendChild(obnode); // A somewhat complicated dance to format the mobilepromo label. let bundle = doc.getElementById("bundle_browser"); let formatArgs = ["android", "ios"].map(os => { let link = doc.createElement("label"); - link.textContent = bundle.getString(`appMenuRemoteTabs.mobilePromo.${os}`) + link.textContent = bundle.getString(`appMenuRemoteTabs.mobilePromo.${os}`); link.setAttribute("mobile-promo-os", os); link.className = "text-link remotetabs-promo-link"; return link.outerHTML; }); let promoParentElt = doc.getElementById("PanelUI-remotetabs-mobile-promo"); - let fxAccountsBrand = promoParentElt.getAttribute("fxAccountsBrand"); - formatArgs.push(fxAccountsBrand); // Put it all together... - let contents = bundle.getFormattedString("appMenuRemoteTabs.mobilePromo.text", formatArgs); + let contents = bundle.getFormattedString("appMenuRemoteTabs.mobilePromo.text2", formatArgs); promoParentElt.innerHTML = contents; // We manually manage the "click" event to open the promo links because // allowing the "text-link" widget handle it has 2 problems: (1) it only // supports button 0 and (2) it's tricky to intercept when it does the // open and auto-close the panel. (1) can probably be fixed, but (2) is // trickier without hard-coding here the knowledge of exactly what buttons // it does support. // So we allow left and middle clicks to open the link in a new tab and
--- a/browser/components/syncedtabs/SyncedTabsDeckView.js +++ b/browser/components/syncedtabs/SyncedTabsDeckView.js @@ -63,27 +63,24 @@ SyncedTabsDeckView.prototype = { _getBrowserBundle() { return getChromeWindow(this._window).document.getElementById("bundle_browser"); }, _generateDevicePromo() { let bundle = this._getBrowserBundle(); let formatArgs = ["android", "ios"].map(os => { let link = this._doc.createElement("a"); - link.textContent = bundle.getString(`appMenuRemoteTabs.mobilePromo.${os}`) + link.textContent = bundle.getString(`appMenuRemoteTabs.mobilePromo.${os}`); link.className = `${os}-link text-link`; link.setAttribute("href", "#"); return link.outerHTML; }); - let promoParentElt = this.container.querySelector(".device-promo"); - let fxAccountsBrand = promoParentElt.getAttribute("fxAccountsBrand"); - formatArgs.push(fxAccountsBrand); // Put it all together... - let contents = bundle.getFormattedString("appMenuRemoteTabs.mobilePromo.text", formatArgs); - promoParentElt.innerHTML = contents; + let contents = bundle.getFormattedString("appMenuRemoteTabs.mobilePromo.text2", formatArgs); + this.container.querySelector(".device-promo").innerHTML = contents; }, destroy() { this._tabListComponent.uninit(); this.container.remove(); }, update(state) {
--- a/browser/locales/en-US/chrome/browser/browser.properties +++ b/browser/locales/en-US/chrome/browser/browser.properties @@ -681,25 +681,24 @@ appmenu.updateFailed.description = Backg appmenu.restartBrowserButton.label = Restart %S appmenu.downloadUpdateButton.label = Download Update # LOCALIZATION NOTE : FILE Reader View is a feature name and therefore typically used as a proper noun. readingList.promo.firstUse.readerView.title = Reader View readingList.promo.firstUse.readerView.body = Remove clutter so you can focus exactly on what you want to read. -# LOCALIZATION NOTE (appMenuRemoteTabs.mobilePromo.text): +# LOCALIZATION NOTE (appMenuRemoteTabs.mobilePromo.text2): # %1$S will be replaced with a link, the text of which is # appMenuRemoteTabs.mobilePromo.android and the link will be to # https://www.mozilla.org/firefox/android/. # %2$S will be replaced with a link, the text of which is # appMenuRemoteTabs.mobilePromo.ios # and the link will be to https://www.mozilla.org/firefox/ios/. -# %3$S will be replace by the content of syncBrand.fxAccount.label (Firefox Account) -appMenuRemoteTabs.mobilePromo.text = Download %1$S or %2$S and connect them to your %3$S. +appMenuRemoteTabs.mobilePromo.text2 = Download %1$S or %2$S and connect them to your Firefox Account. appMenuRemoteTabs.mobilePromo.android = Firefox for Android appMenuRemoteTabs.mobilePromo.ios = Firefox for iOS # LOCALIZATION NOTE (e10s.offerPopup.mainMessage # e10s.offerPopup.highlight1 # e10s.offerPopup.highlight2 # e10s.offerPopup.enableAndRestart.label # e10s.offerPopup.enableAndRestart.accesskey