1374972 - Fix weird capitalization of "Restore all Windows and Tabs" in about:welcomeback

Status: VERIFIED FIXED

(Firefox :: General, enhancement)

Description

[Dão Gottwald [:dao]]

The radio buttons in about:welcomeback are labeled "Restore all Windows and Tabs" and "Restore only the ones you want". The former uses some kind of partial title capitalization which makes no sense. It should read "Restore all windows and tabs" instead.

Also, according to attachment 8497821 [details], we should use "&" instead of "and".

http://searchfox.org/mozilla-central/rev/714606a8145636d93b116943d3a65a6a49d2acf8/browser/locales/en-US/chrome/browser/aboutSessionRestore.dtd#37

Comment 1

[Martin Boros]

Hello, I'd like to fix this bug, this would be my first time contributing. Looks like a nice and easy introduction, I've already fixed it would just need to know how to submit the changes.

Comment 2

[Dão Gottwald [:dao]]

(In reply to Martin Boros from comment #1)
> Hello, I'd like to fix this bug, this would be my first time contributing.
> Looks like a nice and easy introduction, I've already fixed it would just
> need to know how to submit the changes.

Have you made the change in a Mercurial clone of mozilla-central? If so, you can create a patch using hg diff > ~/maypatch.diff and then upload it on this page (see Attach File link).

Comment 3

[Martin Boros]

Attachment: Patch replacing the line in question

Edited the line to fit the formatting suggested in the bug report.

Comment 4

[Dão Gottwald [:dao]]

Comment on attachment 8880970 [details] [diff] [review]
Patch replacing the line in question

>diff --git a/browser/locales/en-US/chrome/browser/aboutSessionRestore.dtd b/browser/locales/en-US/chrome/browser/aboutSessionRestore.dtd
>--- a/browser/locales/en-US/chrome/browser/aboutSessionRestore.dtd
>+++ b/browser/locales/en-US/chrome/browser/aboutSessionRestore.dtd
>@@ -34,7 +34,7 @@
> <!ENTITY welcomeback2.pageTitle     "Success!">
> <!ENTITY welcomeback2.pageInfo1     "&brandShortName; is ready to go.">
> 
>-<!ENTITY welcomeback2.label.restoreAll  "Restore all Windows and Tabs">
>+<!ENTITY welcomeback2.label.restoreAll  "Restore all windows & tabs">
> <!ENTITY welcomeback2.label.restoreSome "Restore only the ones you want">

& is invalid syntax, you need to use &amp; instead.

Could you also please rename welcomeback2.label.restoreAll to welcomeback2.restoreAll.label and welcomeback2.label.restoreSome to welcomeback2.restoreSome.label? You'll have to update browser/components/migration/content/aboutWelcomeBack.xhtml for that too.

Comment 5

[Martin Boros]

Attachment: Patch for the bug

Fixed illegal character from first patch.

Changed naming convention on labels as requested in both files.

Comment 6

[Dão Gottwald [:dao]]

Comment on attachment 8881314 [details] [diff] [review]
Patch for the bug

Looks good. Thanks!

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/8d9b536289c2
Remove half-baked title capitalization from "Restore all Windows and Tabs". r=dao

Comment 8

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/8d9b536289c2

Comment 9

[Md Maruf Rahman]

I have reproduced this bug with Nightly 56.0a1 (2017-06-21) on Windows 7, 64 Bit!

This bug's fix is verified with latest Beta!


Build  ID  : 20170818035007 
User Agent : Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:56.0) Gecko/20100101 Firefox/56.0

Comment 10

[Iulia Cristescu, QA [:JuliaC] (away, please needinfo? [e-mail])]

Marking this as verified fixed, based on comment 9. 
Thank you Mohammad for your testing efforts!