November 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'ticket32386'
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit aebde73629d3df191beccd8afd794a8f05d3dfa5 Merge: 58d7f9e68 de4ffebcf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 6 18:29:16 2019 -0500 Merge branch 'ticket32386' Doxyfile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[donate/master] Added version query to font and styling files to uncache stylings.
by skirtiadi＠torproject.org 06 Nov '19

06 Nov '19

commit ad6ba60f8598317611fbf80e91b804cab7090cb4 Author: Stephanie Kirtiadi <skirtiadi(a)giantrabbit.com> Date: Tue Oct 29 14:27:25 2019 -0700 Added version query to font and styling files to uncache stylings. Sometimes styling requires hard refresh to appear right from browsers where the site is visited before and look broken to the visitors. This line of code avoids that. Issue #43514 --- templates/ubiquitous.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/ubiquitous.twig b/templates/ubiquitous.twig index aa821ca5..4bed184f 100644 --- a/templates/ubiquitous.twig +++ b/templates/ubiquitous.twig @@ -5,8 +5,8 @@ <title>{% block title %}{% endblock %}</title> <meta content="{{ block('title') }}" property="og:title"> <meta content="width=device-width, initial-scale=1" name="viewport"> - <link href="/dist/index.css" rel="stylesheet" type="text/css"> - <link href="/css/fonts.css" rel="stylesheet" type="text/css"> + <link href="/dist/index.css?v=1" rel="stylesheet" type="text/css"> + <link href="/css/fonts.css?v=1" rel="stylesheet" type="text/css"> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/images/favicon-pdr/apple-touch-icon-144x144.png" /> <link rel="apple-touch-icon-precomposed" sizes="152x152" href="/images/favicon-pdr/apple-touch-icon-152x152.png" /> <link rel="icon" type="image/png" href="/images/favicon-pdr/favicon-32x32.png" sizes="32x32" />

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 32220: Improve the letterboxing experience
by gk＠torproject.org 06 Nov '19

06 Nov '19

commit ff8083901a19421e9a3f0dba5346bd6873fee956 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Oct 28 17:42:17 2019 -0700 Bug 32220: Improve the letterboxing experience CSS and JS changes to alter the UX surrounding letterboxing. The browser element containing page content is now anchored to the bottom of the toolbar, and the remaining letterbox margin is the same color as the firefox chrome. The letterbox margin and border are tied to the currently selected theme. Also adds a 'needsLetterbox' property to tabbrowser.xml to fix a race condition present when using the 'isEmpty' property. Using 'isEmpty' as a proxy for 'needsLetterbox' resulted in over-zealous/unnecessary letterboxing of about:blank tabs. --- browser/base/content/browser.css | 7 ++ browser/base/content/tabbrowser.xml | 10 +++ browser/themes/shared/tabs.inc.css | 6 ++ .../components/resistfingerprinting/RFPHelper.jsm | 94 +++++++++++++++++++--- 4 files changed, 105 insertions(+), 12 deletions(-) diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index 8137435f9ed6..c5ca3de4a67f 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -70,6 +70,13 @@ min-width: 25px; } +.browserStack > browser.letterboxing { + border-color: var(--chrome-content-separator-color); + border-style: solid; + border-width : 1px; + border-top: none; +} + %ifdef MENUBAR_CAN_AUTOHIDE #toolbar-menubar[autohide="true"] { overflow: hidden; diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 3430b8a1d69d..dc1baa71f6c4 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -2090,6 +2090,16 @@ </getter> </property> + <property name="needsLetterbox" readonly="true"> + <getter> + let browser = this.linkedBrowser; + if (isBlankPageURL(browser.currentURI.spec)) + return false; + + return true; + </getter> + </property> + <property name="lastAccessed"> <getter> return this._lastAccessed == Infinity ? Date.now() : this._lastAccessed; diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css index 7fc107e8d997..1e05b592d6c8 100644 --- a/browser/themes/shared/tabs.inc.css +++ b/browser/themes/shared/tabs.inc.css @@ -33,6 +33,12 @@ background-color: #f9f9fa; } +/* extend down the toolbar's colors when letterboxing is enabled*/ +#tabbrowser-tabpanels.letterboxing { + background-color: var(--toolbar-bgcolor); + background-image: var(--toolbar-bgimage); +} + :root[privatebrowsingmode=temporary] #tabbrowser-tabpanels { /* Value for --in-content-page-background in aboutPrivateBrowsing.css */ background-color: #25003e; diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index f73ccf1797b0..6c9306dc7bb3 100644 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -41,6 +41,7 @@ class _RFPHelper { // ============================================================================ constructor() { this._initialized = false; + this._borderDimensions = null; } init() { @@ -348,6 +349,24 @@ class _RFPHelper { }); } + getBorderDimensions(aBrowser) { + if (this._borderDimensions) { + return this._borderDimensions; + } + + const win = aBrowser.ownerGlobal; + const browserStyle = win.getComputedStyle(aBrowser); + + this._borderDimensions = { + top : parseInt(browserStyle.borderTopWidth), + right: parseInt(browserStyle.borderRightWidth), + bottom : parseInt(browserStyle.borderBottomWidth), + left : parseInt(browserStyle.borderLeftWidth), + }; + + return this._borderDimensions; + } + _addOrClearContentMargin(aBrowser) { let tab = aBrowser.getTabBrowser().getTabForBrowser(aBrowser); @@ -356,9 +375,13 @@ class _RFPHelper { return; } + // we add the letterboxing class even if the content does not need letterboxing + // in which case margins are set such that the borders are hidden + aBrowser.classList.add("letterboxing"); + // We should apply no margin around an empty tab or a tab with system // principal. - if (tab.isEmpty || aBrowser.contentPrincipal.isSystemPrincipal) { + if (!tab.needsLetterbox || aBrowser.contentPrincipal.isSystemPrincipal) { this._clearContentViewMargin(aBrowser); } else { this._roundContentView(aBrowser); @@ -523,10 +546,29 @@ class _RFPHelper { // Calculating the margins around the browser element in order to round the // content viewport. We will use a 200x100 stepping if the dimension set // is not given. - let margins = calcMargins(containerWidth, containerHeight); + + const borderDimensions = this.getBorderDimensions(aBrowser); + const marginDims = calcMargins(containerWidth, containerHeight - borderDimensions.top); + + let margins = { + top : 0, + right : 0, + bottom : 0, + left : 0, + }; + + // snap browser element to top + margins.top = 0; + // and leave 'double' margin at the bottom + margins.bottom = 2 * marginDims.height - borderDimensions.bottom; + // identical margins left and right + margins.right = marginDims.width - borderDimensions.right; + margins.left = marginDims.width - borderDimensions.left; + + const marginStyleString = `${margins.top}px ${margins.right}px ${margins.bottom}px ${margins.left}px`; // If the size of the content is already quantized, we do nothing. - if (aBrowser.style.margin == `${margins.height}px ${margins.width}px`) { + if (aBrowser.style.margin === marginStyleString) { log("_roundContentView[" + logId + "] is_rounded == true"); if (this._isLetterboxingTesting) { log( @@ -547,19 +589,35 @@ class _RFPHelper { "_roundContentView[" + logId + "] setting margins to " + - margins.width + - " x " + - margins.height + marginStyleString ); - // One cannot (easily) control the color of a margin unfortunately. - // An initial attempt to use a border instead of a margin resulted - // in offset event dispatching; so for now we use a colorless margin. - aBrowser.style.margin = `${margins.height}px ${margins.width}px`; + + // The margin background color is determined by the background color of the + // window's tabpanels#tabbrowser-tabpanels element + aBrowser.style.margin = marginStyleString; }); } _clearContentViewMargin(aBrowser) { + const borderDimensions = this.getBorderDimensions(aBrowser); + // set the margins such that the browser elements border is visible up top, but + // are rendered off-screen on the remaining sides + let margins = { + top : 0, + right : -borderDimensions.right, + bottom : -borderDimensions.bottom, + left : -borderDimensions.left, + }; + const marginStyleString = `${margins.top}px ${margins.right}px ${margins.bottom}px ${margins.left}px`; + + aBrowser.ownerGlobal.requestAnimationFrame(() => { + aBrowser.style.margin = marginStyleString; + }); + } + + _removeLetterboxing(aBrowser) { aBrowser.ownerGlobal.requestAnimationFrame(() => { + aBrowser.classList.remove("letterboxing"); aBrowser.style.margin = ""; }); } @@ -581,6 +639,11 @@ class _RFPHelper { this ); + const tabPanel = aWindow.document.getElementById("tabbrowser-tabpanels"); + if (tabPanel) { + tabPanel.classList.add("letterboxing"); + } + // Rounding the content viewport. this._updateMarginsForTabsInWindow(aWindow); } @@ -608,10 +671,17 @@ class _RFPHelper { this ); - // Clear all margins and tooltip for all browsers. + // revert tabpanel's background colors to default + const tabPanel = aWindow.document.getElementById("tabbrowser-tabpanels"); + if (tabPanel) { + tabPanel.classList.remove("letterboxing"); + } + + // and revert each browser element to default, + // restore default margins and remove letterboxing class for (let tab of tabBrowser.tabs) { let browser = tab.linkedBrowser; - this._clearContentViewMargin(browser); + this._removeLetterboxing(browser); } }

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 06 Nov '19

06 Nov '19

commit c34510f0e6b6910030a693f5d353d5fb2f552d80 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 21:53:53 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 21c4d3511..7c545818c 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -9409,7 +9409,7 @@ msgstr "Se o Tor está sendo usado ou não." #: templates/layout.html:5 msgid "" "Defend yourself against tracking and surveillance. Circumvent censorship." -msgstr "Defenda-se contra rastreamento e vigilância. Drible a censura." +msgstr "Defenda-se contra rastreamento e vigilância. Contorne a censura." #: templates/layout.html:10 msgid "Tor Project | Support"

1 0

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 06 Nov '19

06 Nov '19

commit 99434fed3dd8fc0e9f337f75c5097df6fce880f4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 21:53:27 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+pt-BR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 4ea281126..a5b5a79d8 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -14,9 +14,9 @@ # Chacal E., 2019 # Emma Peel, 2019 # m tk, 2019 -# Communia <ameaneantie(a)riseup.net>, 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2019 +# Communia <ameaneantie(a)riseup.net>, 2019 # msgid "" msgstr "" @@ -24,7 +24,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-06 15:48+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2019\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -496,7 +496,7 @@ msgid "" "order for its users to access the open web." msgstr "" "Em 2007, a organização começou a desenvolver pontes à rede Tor para " -"enfrentar a censura, tais como a necessidade de driblar firewalls " +"enfrentar a censura, tais como a necessidade de contornar firewalls " "governamentais para prover acesso de seus usuários à internet aberta." #: https//www.torproject.org/about/history/ @@ -1162,7 +1162,7 @@ msgstr "Pesquise com liberdade." #: templates/hero-home.html:8 templates/meta.html:5 templates/meta.html:12 msgid "" "Defend yourself against tracking and surveillance. Circumvent censorship." -msgstr "Defenda-se contra rastreamento e vigilância. Drible a censura." +msgstr "Defenda-se contra rastreamento e vigilância. Contorne a censura." #: templates/home.html:7 msgid "Block Trackers"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 06 Nov '19

06 Nov '19

commit 925653f8d0f46d8088f09af85d7fd9a5d281d786 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 21:53:17 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+pt-BR.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 5df85e23c..86738fa14 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -14,9 +14,9 @@ # Chacal E., 2019 # Emma Peel, 2019 # m tk, 2019 -# Communia <ameaneantie(a)riseup.net>, 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 # Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2019 +# Communia <ameaneantie(a)riseup.net>, 2019 # msgid "" msgstr "" @@ -24,7 +24,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-06 15:48+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Alexei Gonçalves de Oliveira <alexis(a)gessicahellmann.com>, 2019\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -92,8 +92,8 @@ msgid "" msgstr "" "Precisa de ajuda? Visite nosso [Portal de " "Suporte](https://support.torproject.org/pt-BR/) para consultar as respostas " -"às perguntas mais frequentes sobre conexão pelo Tor, como driblar a censura," -" como usar serviços onion, e mais." +"às perguntas mais frequentes sobre conexão pelo Tor, como contornar a " +"censura, como usar serviços onion, e mais." #: https//www.torproject.org/download/ #: (content/download/contents+en.lrpage.title) @@ -551,7 +551,7 @@ msgid "" "order for its users to access the open web." msgstr "" "Em 2007, a organização começou a desenvolver pontes à rede Tor para " -"enfrentar a censura, tais como a necessidade de driblar firewalls " +"enfrentar a censura, tais como a necessidade de contornar firewalls " "governamentais para prover acesso de seus usuários à internet aberta." #: https//www.torproject.org/about/history/ @@ -1287,7 +1287,7 @@ msgstr "Pesquise com liberdade." #: templates/hero-home.html:8 templates/meta.html:5 templates/meta.html:12 msgid "" "Defend yourself against tracking and surveillance. Circumvent censorship." -msgstr "Defenda-se contra rastreamento e vigilância. Drible a censura." +msgstr "Defenda-se contra rastreamento e vigilância. Contorne a censura." #: templates/home.html:7 msgid "Block Trackers"

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 06 Nov '19

06 Nov '19

commit 96657df544ea5b5e6b2b550b19fb2e4e9b7da096 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 21:50:22 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+pt-BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 63edc6504..1f25a68c5 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -756,7 +756,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.title) msgid "CIRCUMVENTION" -msgstr "DRIBLAR A CENSURA" +msgstr "CONTORNAR A CENSURA" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.description)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 06 Nov '19

06 Nov '19

commit de8c7946196f941349475f936355b0d8847badf8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 21:50:11 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 3f2333c53..a435382a2 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -475,8 +475,8 @@ msgstr "" " rede Tor. Se você não acredita que seja o caso, selecione “Não”. Se você " "souber que a sua conexão é cesurada ou se você tiver tentado mas não " "conseguido se conectar à rede Tor, e que nenhuma solução tiver dado certo, " -"selecione “Sim”. A tela [Driblar a censura](/circumvention) será aberta para" -" que você configure um transportador plugável." +"selecione “Sim”. A tela [Contornar a censura](/circumvention) será aberta " +"para que você configure um transportador plugável." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -843,7 +843,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.title) msgid "CIRCUMVENTION" -msgstr "DRIBLAR A CENSURA" +msgstr "CONTORNAR A CENSURA" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.description) @@ -861,7 +861,7 @@ msgid "" msgstr "" "Pode acontecer de o acesso direto à rede Tor ser bloqueado pelo seu provedor" " de serviço de Internet ou por algum governo. O Navegador Tor inclui algumas" -" ferramentas anticensura para driblar esses bloqueios. Essas ferramentas " +" ferramentas anticensura para contornar esses bloqueios. Essas ferramentas " "são chamadas \"transportadores plugáveis\". Consulte a página " "[Transportadores Plugáveis](/en-US/transports) para saber mais sobre os " "tipos de transportadores atualmente disponíveis." @@ -2098,7 +2098,7 @@ msgid "" msgstr "" "Se você continua não conseguindo se conectar, seu Provedor de Serviço " "Internet pode estar censurando conexões ao Navegador Tor. Leia a seção de " -"[Driblar a censura](/circumvention) para possíveis soluções." +"[Contornar a censura](/circumvention) para possíveis soluções." #: https//tb-manual.torproject.org/troubleshooting/ #: (content/troubleshooting/contents+en.lrtopic.body)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 06 Nov '19

06 Nov '19

commit 2d4cf4de0049a94876ed3d51cb8bf031948ec814 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 21:23:44 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-BR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 4dac1c4e9..21c4d3511 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -9,9 +9,9 @@ # Emma Peel, 2019 # Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 # m tk, 2019 -# Communia <ameaneantie(a)riseup.net>, 2019 # Danton Medrado, 2019 # dark crystal <darc.krystal(a)insicuri.net>, 2019 +# Communia <ameaneantie(a)riseup.net>, 2019 # msgid "" msgstr "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-06 16:24+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: dark crystal <darc.krystal(a)insicuri.net>, 2019\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -182,7 +182,7 @@ msgid "" "://tb-manual.torproject.org/transports/)." msgstr "" "Em lugares onde há censura forte, temos várias opções disponíveis para " -"driblá-la, incluindo [transportadores plugáveis](https://tb-" +"contorná-la, incluindo [transportadores plugáveis](https://tb-" "manual.torproject.org/transports/)" #: https//support.torproject.org/faq/faq-2/ @@ -7090,7 +7090,7 @@ msgid "" msgstr "" "Às vezes, o acesso direto à [rede Tor](#tor-/-tor-network/-core-tor) está " "bloqueado por seu [Provedor de Internet](#internet-service-provider-isp) ou " -"por um governo. O Navegador Tor inclui algumas ferramentas para driblar " +"por um governo. O Navegador Tor inclui algumas ferramentas para contornar " "esses bloqueios, incluindo [bridges](#bridge), [transportadores plugáveis" "](#pluggable-transports), e [GetTor](#gettor). "

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Revert "Bug 30683: Prevent detection of locale via some *.properties"
by gk＠torproject.org 06 Nov '19

06 Nov '19

commit cb255f2504b37916160e886a181f1a02f85dba7c Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Nov 5 10:53:21 2019 +0100 Revert "Bug 30683: Prevent detection of locale via some *.properties" This reverts commit ab53cf71411a60ca56d5f6e24ec118802b8788df. --- browser/installer/package-manifest.in | 3 --- dom/base/nsContentUtils.cpp | 17 ++++------------- dom/base/nsContentUtils.h | 4 ---- dom/html/HTMLSelectElement.cpp | 2 +- dom/html/HTMLTextAreaElement.cpp | 6 +++--- dom/html/MediaDocument.cpp | 4 +--- dom/html/MediaDocument.h | 3 --- dom/html/input/CheckableInputTypes.cpp | 4 ++-- dom/html/input/DateTimeInputTypes.cpp | 6 +++--- dom/html/input/FileInputType.cpp | 2 +- dom/html/input/InputType.cpp | 16 ++++++++-------- dom/html/input/NumericInputTypes.cpp | 8 ++++---- dom/html/input/SingleLineTextInputTypes.cpp | 6 +++--- dom/locales/moz.build | 6 ------ mobile/android/installer/package-manifest.in | 3 --- parser/htmlparser/nsParserMsgUtils.cpp | 6 ------ parser/htmlparser/nsParserMsgUtils.h | 3 --- 17 files changed, 30 insertions(+), 69 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 1825397678d1..1a2a24f9b5b9 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -345,9 +345,6 @@ @RESPATH@/res/dtd/* @RESPATH@/res/language.properties @RESPATH@/res/locale/layout/HtmlForm.properties -@RESPATH@/res/locale/layout/MediaDocument.properties -@RESPATH@/res/locale/layout/xmlparser.properties -@RESPATH@/res/locale/dom/dom.properties #ifdef XP_MACOSX @RESPATH@/res/MainMenu.nib/ #endif diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index cfae3ef224b3..9c60c1befe1e 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -3575,9 +3575,7 @@ static const char* gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = { "chrome://global/locale/security/security.properties", "chrome://necko/locale/necko.properties", "chrome://global/locale/layout/HtmlForm.properties", - "resource://gre/res/locale/layout/HtmlForm.properties", - "chrome://global/locale/dom/dom.properties", - "resource://gre/res/locale/dom/dom.properties"}; + "resource://gre/res/locale/layout/HtmlForm.properties"}; /* static */ nsresult nsContentUtils::EnsureStringBundle(PropertiesFile aFile) { @@ -3626,8 +3624,7 @@ void nsContentUtils::AsyncPrecreateStringBundles() { } } -/* static */ -bool nsContentUtils::SpoofLocaleEnglish() { +static bool SpoofLocaleEnglish() { // 0 - will prompt // 1 - don't spoof // 2 - spoof @@ -3638,12 +3635,9 @@ bool nsContentUtils::SpoofLocaleEnglish() { nsresult nsContentUtils::GetLocalizedString(PropertiesFile aFile, const char* aKey, nsAString& aResult) { - // When we spoof English, use en-US properties in strings that are accessible - // by content. + // When we spoof English, use en-US default strings in HTML forms. if (aFile == eFORMS_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) { aFile = eFORMS_PROPERTIES_en_US; - } else if (aFile == eDOM_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) { - aFile = eDOM_PROPERTIES_en_US; } nsresult rv = EnsureStringBundle(aFile); @@ -3658,12 +3652,9 @@ nsresult nsContentUtils::FormatLocalizedString(PropertiesFile aFile, const char16_t** aParams, uint32_t aParamsLength, nsAString& aResult) { - // When we spoof English, use en-US properties in strings that are accessible - // by content. + // When we spoof English, use en-US default strings in HTML forms. if (aFile == eFORMS_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) { aFile = eFORMS_PROPERTIES_en_US; - } else if (aFile == eDOM_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) { - aFile = eDOM_PROPERTIES_en_US; } nsresult rv = EnsureStringBundle(aFile); diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 2bf27250e68b..ee23a540871d 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1119,8 +1119,6 @@ class nsContentUtils { eNECKO_PROPERTIES, eFORMS_PROPERTIES_MAYBESPOOF, eFORMS_PROPERTIES_en_US, - eDOM_PROPERTIES_MAYBESPOOF, - eDOM_PROPERTIES_en_US, PropertiesFile_COUNT }; static nsresult ReportToConsole( @@ -1134,8 +1132,6 @@ class nsContentUtils { static void LogMessageToConsole(const char* aMsg); - static bool SpoofLocaleEnglish(); - /** * Get the localized string named |aKey| in properties file |aFile|. */ diff --git a/dom/html/HTMLSelectElement.cpp b/dom/html/HTMLSelectElement.cpp index afa01ee224ba..76f21db23b31 100644 --- a/dom/html/HTMLSelectElement.cpp +++ b/dom/html/HTMLSelectElement.cpp @@ -1539,7 +1539,7 @@ nsresult HTMLSelectElement::GetValidationMessage(nsAString& aValidationMessage, case VALIDITY_STATE_VALUE_MISSING: { nsAutoString message; nsresult rv = nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationSelectMissing", + nsContentUtils::eDOM_PROPERTIES, "FormValidationSelectMissing", message); aValidationMessage = message; return rv; diff --git a/dom/html/HTMLTextAreaElement.cpp b/dom/html/HTMLTextAreaElement.cpp index 2844267b9bb8..0d1ba35c8b59 100644 --- a/dom/html/HTMLTextAreaElement.cpp +++ b/dom/html/HTMLTextAreaElement.cpp @@ -1001,7 +1001,7 @@ nsresult HTMLTextAreaElement::GetValidationMessage( const char16_t* params[] = {strMaxLength.get(), strTextLength.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationTextTooLong", params, + nsContentUtils::eDOM_PROPERTIES, "FormValidationTextTooLong", params, message); aValidationMessage = message; } break; @@ -1017,13 +1017,13 @@ nsresult HTMLTextAreaElement::GetValidationMessage( const char16_t* params[] = {strMinLength.get(), strTextLength.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationTextTooShort", params, + nsContentUtils::eDOM_PROPERTIES, "FormValidationTextTooShort", params, message); aValidationMessage = message; } break; case VALIDITY_STATE_VALUE_MISSING: { nsAutoString message; - rv = nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, + rv = nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES, "FormValidationValueMissing", message); aValidationMessage = message; diff --git a/dom/html/MediaDocument.cpp b/dom/html/MediaDocument.cpp index 7ec66b31e63d..196adddc0f38 100644 --- a/dom/html/MediaDocument.cpp +++ b/dom/html/MediaDocument.cpp @@ -125,9 +125,7 @@ nsresult MediaDocument::Init() { nsCOMPtr<nsIStringBundleService> stringService = mozilla::services::GetStringBundleService(); if (stringService) { - stringService->CreateBundle(nsContentUtils::SpoofLocaleEnglish() - ? NSMEDIADOCUMENT_PROPERTIES_URI_en_US - : NSMEDIADOCUMENT_PROPERTIES_URI, + stringService->CreateBundle(NSMEDIADOCUMENT_PROPERTIES_URI, getter_AddRefs(mStringBundle)); } diff --git a/dom/html/MediaDocument.h b/dom/html/MediaDocument.h index 37e005c7fffa..e11fd2ec8551 100644 --- a/dom/html/MediaDocument.h +++ b/dom/html/MediaDocument.h @@ -16,9 +16,6 @@ #define NSMEDIADOCUMENT_PROPERTIES_URI \ "chrome://global/locale/layout/MediaDocument.properties" -#define NSMEDIADOCUMENT_PROPERTIES_URI_en_US \ - "resource://gre/res/locale/layout/MediaDocument.properties" - namespace mozilla { namespace dom { diff --git a/dom/html/input/CheckableInputTypes.cpp b/dom/html/input/CheckableInputTypes.cpp index f0306b69cbd0..f55000c766ea 100644 --- a/dom/html/input/CheckableInputTypes.cpp +++ b/dom/html/input/CheckableInputTypes.cpp @@ -23,7 +23,7 @@ bool CheckboxInputType::IsValueMissing() const { } nsresult CheckboxInputType::GetValueMissingMessage(nsAString& aMessage) { - return nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, + return nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES, "FormValidationCheckboxMissing", aMessage); } @@ -32,5 +32,5 @@ nsresult CheckboxInputType::GetValueMissingMessage(nsAString& aMessage) { nsresult RadioInputType::GetValueMissingMessage(nsAString& aMessage) { return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationRadioMissing", aMessage); + nsContentUtils::eDOM_PROPERTIES, "FormValidationRadioMissing", aMessage); } diff --git a/dom/html/input/DateTimeInputTypes.cpp b/dom/html/input/DateTimeInputTypes.cpp index 0efbe9a9121a..11dfc9e541b9 100644 --- a/dom/html/input/DateTimeInputTypes.cpp +++ b/dom/html/input/DateTimeInputTypes.cpp @@ -138,7 +138,7 @@ nsresult DateTimeInputTypeBase::GetRangeOverflowMessage(nsAString& aMessage) { const char16_t* params[] = {maxStr.get()}; return nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationDateTimeRangeOverflow", + nsContentUtils::eDOM_PROPERTIES, "FormValidationDateTimeRangeOverflow", params, aMessage); } @@ -148,7 +148,7 @@ nsresult DateTimeInputTypeBase::GetRangeUnderflowMessage(nsAString& aMessage) { const char16_t* params[] = {minStr.get()}; return nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationDateTimeRangeUnderflow", + nsContentUtils::eDOM_PROPERTIES, "FormValidationDateTimeRangeUnderflow", params, aMessage); } @@ -194,7 +194,7 @@ nsresult DateInputType::GetBadInputMessage(nsAString& aMessage) { } return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationInvalidDate", aMessage); + nsContentUtils::eDOM_PROPERTIES, "FormValidationInvalidDate", aMessage); } bool DateInputType::ConvertStringToNumber( diff --git a/dom/html/input/FileInputType.cpp b/dom/html/input/FileInputType.cpp index 82a4c2de8659..2536a875b2ca 100644 --- a/dom/html/input/FileInputType.cpp +++ b/dom/html/input/FileInputType.cpp @@ -22,5 +22,5 @@ bool FileInputType::IsValueMissing() const { nsresult FileInputType::GetValueMissingMessage(nsAString& aMessage) { return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationFileMissing", aMessage); + nsContentUtils::eDOM_PROPERTIES, "FormValidationFileMissing", aMessage); } diff --git a/dom/html/input/InputType.cpp b/dom/html/input/InputType.cpp index f7a28f4c1a3a..210daeafad14 100644 --- a/dom/html/input/InputType.cpp +++ b/dom/html/input/InputType.cpp @@ -167,7 +167,7 @@ nsresult InputType::GetValidationMessage( const char16_t* params[] = {strMaxLength.get(), strTextLength.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationTextTooLong", params, + nsContentUtils::eDOM_PROPERTIES, "FormValidationTextTooLong", params, message); aValidationMessage = message; break; @@ -185,7 +185,7 @@ nsresult InputType::GetValidationMessage( const char16_t* params[] = {strMinLength.get(), strTextLength.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationTextTooShort", params, + nsContentUtils::eDOM_PROPERTIES, "FormValidationTextTooShort", params, message); aValidationMessage = message; @@ -216,7 +216,7 @@ nsresult InputType::GetValidationMessage( nsAutoString title; mInputElement->GetAttr(kNameSpaceID_None, nsGkAtoms::title, title); if (title.IsEmpty()) { - rv = nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, + rv = nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES, "FormValidationPatternMismatch", message); } else { @@ -227,7 +227,7 @@ nsresult InputType::GetValidationMessage( } const char16_t* params[] = {title.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, + nsContentUtils::eDOM_PROPERTIES, "FormValidationPatternMismatchWithTitle", params, message); } aValidationMessage = message; @@ -279,12 +279,12 @@ nsresult InputType::GetValidationMessage( if (valueLowStr.Equals(valueHighStr)) { const char16_t* params[] = {valueLowStr.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, + nsContentUtils::eDOM_PROPERTIES, "FormValidationStepMismatchOneValue", params, message); } else { const char16_t* params[] = {valueLowStr.get(), valueHighStr.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationStepMismatch", + nsContentUtils::eDOM_PROPERTIES, "FormValidationStepMismatch", params, message); } } else { @@ -293,7 +293,7 @@ nsresult InputType::GetValidationMessage( const char16_t* params[] = {valueLowStr.get()}; rv = nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, + nsContentUtils::eDOM_PROPERTIES, "FormValidationStepMismatchOneValue", params, message); } @@ -319,7 +319,7 @@ nsresult InputType::GetValidationMessage( nsresult InputType::GetValueMissingMessage(nsAString& aMessage) { return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationValueMissing", aMessage); + nsContentUtils::eDOM_PROPERTIES, "FormValidationValueMissing", aMessage); } nsresult InputType::GetTypeMismatchMessage(nsAString& aMessage) { diff --git a/dom/html/input/NumericInputTypes.cpp b/dom/html/input/NumericInputTypes.cpp index ab0f6f36eb95..6332e028c17e 100644 --- a/dom/html/input/NumericInputTypes.cpp +++ b/dom/html/input/NumericInputTypes.cpp @@ -73,7 +73,7 @@ nsresult NumericInputTypeBase::GetRangeOverflowMessage(nsAString& aMessage) { const char16_t* params[] = {maxStr.get()}; return nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationNumberRangeOverflow", + nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeOverflow", params, aMessage); } @@ -90,7 +90,7 @@ nsresult NumericInputTypeBase::GetRangeUnderflowMessage(nsAString& aMessage) { const char16_t* params[] = {minStr.get()}; return nsContentUtils::FormatLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationNumberRangeUnderflow", + nsContentUtils::eDOM_PROPERTIES, "FormValidationNumberRangeUnderflow", params, aMessage); } @@ -150,13 +150,13 @@ bool NumberInputType::HasBadInput() const { } nsresult NumberInputType::GetValueMissingMessage(nsAString& aMessage) { - return nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, + return nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES, "FormValidationBadInputNumber", aMessage); } nsresult NumberInputType::GetBadInputMessage(nsAString& aMessage) { - return nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, + return nsContentUtils::GetLocalizedString(nsContentUtils::eDOM_PROPERTIES, "FormValidationBadInputNumber", aMessage); } diff --git a/dom/html/input/SingleLineTextInputTypes.cpp b/dom/html/input/SingleLineTextInputTypes.cpp index c879276c86da..15cbe65a1941 100644 --- a/dom/html/input/SingleLineTextInputTypes.cpp +++ b/dom/html/input/SingleLineTextInputTypes.cpp @@ -117,7 +117,7 @@ bool URLInputType::HasTypeMismatch() const { nsresult URLInputType::GetTypeMismatchMessage(nsAString& aMessage) { return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationInvalidURL", aMessage); + nsContentUtils::eDOM_PROPERTIES, "FormValidationInvalidURL", aMessage); } /* input type=email */ @@ -155,12 +155,12 @@ bool EmailInputType::HasBadInput() const { nsresult EmailInputType::GetTypeMismatchMessage(nsAString& aMessage) { return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationInvalidEmail", aMessage); + nsContentUtils::eDOM_PROPERTIES, "FormValidationInvalidEmail", aMessage); } nsresult EmailInputType::GetBadInputMessage(nsAString& aMessage) { return nsContentUtils::GetLocalizedString( - nsContentUtils::eDOM_PROPERTIES_MAYBESPOOF, "FormValidationInvalidEmail", aMessage); + nsContentUtils::eDOM_PROPERTIES, "FormValidationInvalidEmail", aMessage); } /* static */ diff --git a/dom/locales/moz.build b/dom/locales/moz.build index 51f4b88ccd47..b2bcd271de7c 100644 --- a/dom/locales/moz.build +++ b/dom/locales/moz.build @@ -62,10 +62,4 @@ JAR_MANIFESTS += ['jar.mn'] RESOURCE_FILES.locale.layout += [ 'en-US/chrome/layout/HtmlForm.properties', - 'en-US/chrome/layout/MediaDocument.properties', - 'en-US/chrome/layout/xmlparser.properties', -] - -RESOURCE_FILES.locale.dom += [ - 'en-US/chrome/dom/dom.properties', ] diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 33e0175a624e..2002a894fc51 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -203,9 +203,6 @@ @BINPATH@/res/dtd/* @BINPATH@/res/language.properties @BINPATH@/res/locale/layout/HtmlForm.properties -@BINPATH@/res/locale/layout/MediaDocument.properties -@BINPATH@/res/locale/layout/xmlparser.properties -@BINPATH@/res/locale/dom/dom.properties #ifndef MOZ_ANDROID_EXCLUDE_FONTS @BINPATH@/res/fonts/* diff --git a/parser/htmlparser/nsParserMsgUtils.cpp b/parser/htmlparser/nsParserMsgUtils.cpp index 47749732839e..3e369893d4f7 100644 --- a/parser/htmlparser/nsParserMsgUtils.cpp +++ b/parser/htmlparser/nsParserMsgUtils.cpp @@ -9,7 +9,6 @@ #include "nsParserMsgUtils.h" #include "nsNetCID.h" #include "mozilla/Services.h" -#include "nsContentUtils.h" static nsresult GetBundle(const char* aPropFileName, nsIStringBundle** aBundle) { @@ -22,11 +21,6 @@ static nsresult GetBundle(const char* aPropFileName, mozilla::services::GetStringBundleService(); if (!stringService) return NS_ERROR_FAILURE; - if (nsContentUtils::SpoofLocaleEnglish() && - strcmp(aPropFileName, XMLPARSER_PROPERTIES) == 0) { - aPropFileName = XMLPARSER_PROPERTIES_en_US; - } - return stringService->CreateBundle(aPropFileName, aBundle); } diff --git a/parser/htmlparser/nsParserMsgUtils.h b/parser/htmlparser/nsParserMsgUtils.h index 3645610385c1..b4ec4784d65f 100644 --- a/parser/htmlparser/nsParserMsgUtils.h +++ b/parser/htmlparser/nsParserMsgUtils.h @@ -11,9 +11,6 @@ #define XMLPARSER_PROPERTIES \ "chrome://global/locale/layout/xmlparser.properties" -#define XMLPARSER_PROPERTIES_en_US \ - "resource://gre/res/locale/layout/xmlparser.properties" - class nsParserMsgUtils { nsParserMsgUtils(); // Currently this is not meant to be created, use the // static methods

1 0