wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1078345 - Change references from Firefox WebRTC to Firefox Hello in the standalone UI, as well as fix some strings that weren't being passed the replacement arguments. r=MattN

Browse Source
This commit is contained in:
Jared Wein 2014-10-10 01:41:18 -04:00
parent 55f0da6d69
commit 8a004ac333
4 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
browser/components/loop/standalone/content/js/webapp.js
View File

@ -25,7 +25,7 @@ loop.webapp = (function($, _, OT, mozL10n) {
var HomeView = React.createClass({displayName: 'HomeView',
render: function() {
return (
React.DOM.p(null, mozL10n.get("welcome"))
React.DOM.p(null, mozL10n.get("welcome", {clientShortname: mozL10n.get("clientShortname2")}))
);
}
});
@ -37,13 +37,13 @@ loop.webapp = (function($, _, OT, mozL10n) {
render: function() {
var useLatestFF = mozL10n.get("use_latest_firefox", {
"firefoxBrandNameLink": React.renderComponentToStaticMarkup(
React.DOM.a({target: "_blank", href: "https://www.mozilla.org/firefox/"}, "Firefox")
React.DOM.a({target: "_blank", href: mozL10n.get("brand_website")}, mozL10n.get("brandShortname"))
)
});
return (
React.DOM.div(null,
React.DOM.h2(null, mozL10n.get("incompatible_browser")),
React.DOM.p(null, mozL10n.get("powered_by_webrtc")),
React.DOM.p(null, mozL10n.get("powered_by_webrtc", {clientShortname: mozL10n.get("clientShortname2")})),
React.DOM.p({dangerouslySetInnerHTML: {__html: useLatestFF}})
)
);
@ -58,8 +58,8 @@ loop.webapp = (function($, _, OT, mozL10n) {
return (
React.DOM.div(null,
React.DOM.h2(null, mozL10n.get("incompatible_device")),
React.DOM.p(null, mozL10n.get("sorry_device_unsupported")),
React.DOM.p(null, mozL10n.get("use_firefox_windows_mac_linux"))
React.DOM.p(null, mozL10n.get("sorry_device_unsupported", {clientShortname: mozL10n.get("clientShortname2")})),
React.DOM.p(null, mozL10n.get("use_firefox_windows_mac_linux", {brandShortname: mozL10n.get("brandShortname")}))
)
);
}
@ -79,11 +79,11 @@ loop.webapp = (function($, _, OT, mozL10n) {
}
return (
React.DOM.div({className: "promote-firefox"},
React.DOM.h3(null, mozL10n.get("promote_firefox_hello_heading")),
React.DOM.h3(null, mozL10n.get("promote_firefox_hello_heading", {brandShortname: mozL10n.get("brandShortname")})),
React.DOM.p(null,
React.DOM.a({className: "btn btn-large btn-accept",
href: "https://www.mozilla.org/firefox/"},
mozL10n.get("get_firefox_button")
href: mozL10n.get("brand_website")},
mozL10n.get("get_firefox_button", {brandShortname: mozL10n.get("brandShortname")})
)
)
)
@ -232,7 +232,9 @@ loop.webapp = (function($, _, OT, mozL10n) {
return (
React.DOM.header({className: "standalone-header header-box container-box"},
ConversationBranding(null),
React.DOM.div({className: "loop-logo", title: "Firefox WebRTC! logo"}),
React.DOM.div({className: "loop-logo",
title: mozL10n.get("client_alttext",
{clientShortname: mozL10n.get("clientShortname2")})}),
React.DOM.h3({className: "call-url"},
conversationUrl
),
@ -248,7 +250,9 @@ loop.webapp = (function($, _, OT, mozL10n) {
render: function() {
return (
React.DOM.div({className: "standalone-footer container-box"},
React.DOM.div({title: "Mozilla Logo", className: "footer-logo"})
React.DOM.div({title: mozL10n.get("vendor_alttext",
{vendorShortname: mozL10n.get("vendorShortname")}),
className: "footer-logo"})
)
);
}
@ -454,10 +458,11 @@ loop.webapp = (function($, _, OT, mozL10n) {
var privacyNoticeName = mozL10n.get("privacy_notice_link_text");
var tosHTML = mozL10n.get("legal_text_and_links", {
"terms_of_use_url": "<a target=_blank href='/legal/terms/'>" +
"terms_of_use_url": "<a target=_blank href='" +
mozL10n.get("legal_website") + "'>" +
tosLinkName + "</a>",
"privacy_notice_url": "<a target=_blank href='" +
"https://www.mozilla.org/privacy/'>" + privacyNoticeName + "</a>"
mozL10n.get("privacy_website") + "'>" + privacyNoticeName + "</a>"
});
var tosClasses = React.addons.classSet({

29
browser/components/loop/standalone/content/js/webapp.jsx
View File

@ -25,7 +25,7 @@ loop.webapp = (function($, _, OT, mozL10n) {
var HomeView = React.createClass({
render: function() {
return (
<p>{mozL10n.get("welcome")}</p>
<p>{mozL10n.get("welcome", {clientShortname: mozL10n.get("clientShortname2")})}</p>
);
}
});
@ -37,13 +37,13 @@ loop.webapp = (function($, _, OT, mozL10n) {
render: function() {
var useLatestFF = mozL10n.get("use_latest_firefox", {
"firefoxBrandNameLink": React.renderComponentToStaticMarkup(
<a target="_blank" href="https://www.mozilla.org/firefox/">Firefox</a>
<a target="_blank" href={mozL10n.get("brand_website")}>{mozL10n.get("brandShortname")}</a>
)
});
return (
<div>
<h2>{mozL10n.get("incompatible_browser")}</h2>
<p>{mozL10n.get("powered_by_webrtc")}</p>
<p>{mozL10n.get("powered_by_webrtc", {clientShortname: mozL10n.get("clientShortname2")})}</p>
<p dangerouslySetInnerHTML={{__html: useLatestFF}}></p>
</div>
);
@ -58,8 +58,8 @@ loop.webapp = (function($, _, OT, mozL10n) {
return (
<div>
<h2>{mozL10n.get("incompatible_device")}</h2>
<p>{mozL10n.get("sorry_device_unsupported")}</p>
<p>{mozL10n.get("use_firefox_windows_mac_linux")}</p>
<p>{mozL10n.get("sorry_device_unsupported", {clientShortname: mozL10n.get("clientShortname2")})}</p>
<p>{mozL10n.get("use_firefox_windows_mac_linux", {brandShortname: mozL10n.get("brandShortname")})}</p>
</div>
);
}
@ -79,11 +79,11 @@ loop.webapp = (function($, _, OT, mozL10n) {
}
return (
<div className="promote-firefox">
<h3>{mozL10n.get("promote_firefox_hello_heading")}</h3>
<h3>{mozL10n.get("promote_firefox_hello_heading", {brandShortname: mozL10n.get("brandShortname")})}</h3>
<p>
<a className="btn btn-large btn-accept"
href="https://www.mozilla.org/firefox/">
{mozL10n.get("get_firefox_button")}
href={mozL10n.get("brand_website")}>
{mozL10n.get("get_firefox_button", {brandShortname: mozL10n.get("brandShortname")})}
</a>
</p>
</div>
@ -232,7 +232,9 @@ loop.webapp = (function($, _, OT, mozL10n) {
return (
<header className="standalone-header header-box container-box">
<ConversationBranding />
<div className="loop-logo" title="Firefox WebRTC! logo"></div>
<div className="loop-logo"
title={mozL10n.get("client_alttext",
{clientShortname: mozL10n.get("clientShortname2")})}></div>
<h3 className="call-url">
{conversationUrl}
</h3>
@ -248,7 +250,9 @@ loop.webapp = (function($, _, OT, mozL10n) {
render: function() {
return (
<div className="standalone-footer container-box">
<div title="Mozilla Logo" className="footer-logo"></div>
<div title={mozL10n.get("vendor_alttext",
{vendorShortname: mozL10n.get("vendorShortname")})}
className="footer-logo"></div>
</div>
);
}
@ -454,10 +458,11 @@ loop.webapp = (function($, _, OT, mozL10n) {
var privacyNoticeName = mozL10n.get("privacy_notice_link_text");
var tosHTML = mozL10n.get("legal_text_and_links", {
"terms_of_use_url": "<a target=_blank href='/legal/terms/'>" +
"terms_of_use_url": "<a target=_blank href='" +
mozL10n.get("legal_website") + "'>" +
tosLinkName + "</a>",
"privacy_notice_url": "<a target=_blank href='" +
"https://www.mozilla.org/privacy/'>" + privacyNoticeName + "</a>"
mozL10n.get("privacy_website") + "'>" + privacyNoticeName + "</a>"
});
var tosClasses = React.addons.classSet({

12
browser/components/loop/standalone/content/l10n/loop.en-US.properties
View File

@ -49,6 +49,14 @@ brandShortname=Firefox
## LOCALIZATION NOTE(clientShortname2): This should not be localized and
## should remain "Firefox Hello" for all locales.
clientShortname2=Firefox Hello
## LOCALIZATION NOTE(vendorShortname): This should not be localized and
## should remain "Mozilla" for all locales.
vendorShortname=Mozilla
## LOCALIZATION NOTE(client_alttext): {{clientShortname}} will be replaced with the
## value of the clientShortname2 string above.
client_alttext={{clientShortname}} logo
vendor_alttext={{vendorShortname}} logo
## LOCALIZATION NOTE (call_url_creation_date_label): Example output: (from May 26, 2014)
call_url_creation_date_label=(from {{call_url_creation_date}})
@ -107,3 +115,7 @@ rooms_room_full_call_to_action_nonFx_label=Download {{brandShortname}} to start
rooms_room_full_call_to_action_label=Learn more about {{clientShortname}} »
rooms_room_joined_label=Someone has joined the conversation!
rooms_room_join_label=Join the conversation
brand_website=https://www.mozilla.org/firefox/
privacy_website=https://www.mozilla.org/privacy/
legal_website=/legal/terms/

4
browser/components/loop/standalone/content/legal/terms/index.html
View File

@ -7,7 +7,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>WebRTC: Terms of Service</title>
<title>Firefox Hello: Terms of Service</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
@ -21,7 +21,7 @@
<p class="error browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
<header id="legal-header">
<h3>WebRTC</h3>
<h3>Firefox Hello</h3>
<h1 id="webrtc-tos-header">Terms of Service</h1>
</header>