From d4b276775d1dcae3531b144b59f290397012e6f9 Mon Sep 17 00:00:00 2001 From: PalmerAL Date: Fri, 15 Sep 2017 21:23:39 -0500 Subject: [PATCH] fix localization bugs --- pages/crash/index.html | 5 ++++- pages/error/error.js | 13 ++++++++++--- pages/error/index.html | 4 +++- pages/phishing/index.html | 4 +++- pages/sessionRestoreError/index.html | 4 +++- pages/settings/index.html | 14 ++++++++------ pages/settings/settings.js | 2 ++ 7 files changed, 33 insertions(+), 13 deletions(-) diff --git a/pages/crash/index.html b/pages/crash/index.html index b940a1746..f4c22607e 100644 --- a/pages/crash/index.html +++ b/pages/crash/index.html @@ -2,6 +2,9 @@ + + + @@ -19,4 +22,4 @@

- + \ No newline at end of file diff --git a/pages/error/error.js b/pages/error/error.js index e48e6c74a..0919d46b4 100644 --- a/pages/error/error.js +++ b/pages/error/error.js @@ -80,13 +80,20 @@ const errorCodes = { var err = errorCodes[ec] +var title, subtitle + if (err) { - h1.innerHTML += err.name || '' - h2.innerHTML += err.message || '' + title = err.name || '' + subtitle = err.message || '' } else { - h1.innerHTML += l('genericError') + title = l('genericError') + subtitle = '' } +h1.textContent = title +h2.textContent = subtitle +document.title = title + if (err.secondaryAction) { secondaryButton.hidden = false secondaryButton.textContent = err.secondaryAction.title diff --git a/pages/error/index.html b/pages/error/index.html index 9cde0975a..d5103ce8b 100644 --- a/pages/error/index.html +++ b/pages/error/index.html @@ -2,6 +2,8 @@ + + @@ -25,4 +27,4 @@

- + \ No newline at end of file diff --git a/pages/phishing/index.html b/pages/phishing/index.html index d83cc4571..088374b39 100644 --- a/pages/phishing/index.html +++ b/pages/phishing/index.html @@ -2,7 +2,9 @@ - Malicious site detected + + + diff --git a/pages/sessionRestoreError/index.html b/pages/sessionRestoreError/index.html index 9b89137d2..fd5538da0 100644 --- a/pages/sessionRestoreError/index.html +++ b/pages/sessionRestoreError/index.html @@ -2,7 +2,9 @@ - Session Restore Error + + + diff --git a/pages/settings/index.html b/pages/settings/index.html index 33ce14121..ab3e4e818 100644 --- a/pages/settings/index.html +++ b/pages/settings/index.html @@ -2,7 +2,10 @@ - Preferences | Min + + + + @@ -12,7 +15,7 @@ @@ -62,8 +65,7 @@

- -   +  
@@ -85,8 +87,8 @@

- + - + \ No newline at end of file diff --git a/pages/settings/settings.js b/pages/settings/settings.js index 62d1527f0..ab7214517 100644 --- a/pages/settings/settings.js +++ b/pages/settings/settings.js @@ -1,3 +1,5 @@ +document.title = l('settingsPreferencesHeading') + ' | Min' + var container = document.getElementById('privacy-settings-container') var trackerCheckbox = document.getElementById('checkbox-block-trackers') var banner = document.getElementById('restart-required-banner')