1322201 - Ensure correct usage of "login" vs "log in" in captive portal strings

Status: RESOLVED FIXED

(Core :: Internationalization: Localization, defect)

Description

[(inactive) Nihanth Subramanya [:nhnt11]]

From bug 989197 comment 73:

(In reply to Ton from comment #73)
> (In reply to Wes Kocher (:KWierso) from comment #28)
> > https://hg.mozilla.org/mozilla-central/rev/d728a7fdade2
> > 
> > +<!ENTITY captivePortal.title "Login to network">
> > +<!ENTITY captivePortal.longDesc "
> > +<p>This network may require you to login to access the internet.</p>
> > +">
> > +<!ENTITY openPortalLoginPage.label "Open Login Page">
> 
> Please note that "login" is a noun, "log in" is the verb. "Login Page"
> should be fine.
> Can this be corrected?
> 
> (Lowercase "i" for "internet" seems to be allowed according to the style
> guide.)
> 
> Also see bug 1315969.

Comment 1

[(inactive) Nihanth Subramanya [:nhnt11]]

Michelle, can you comment on this please?

Comment 2

[(inactive) Nihanth Subramanya [:nhnt11]]

Attachment: Bug 1322201 - Ensure correct usage of "login" vs "log in" in captive portal strings.

Review commit: https://reviewboard.mozilla.org/r/98056/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/98056/

Comment 3

[(inactive) Nihanth Subramanya [:nhnt11]]

Comment on attachment 8817837 [details]
Bug 1322201 - Ensure correct usage of "login" vs "log in" in captive portal strings.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/98056/diff/1-2/

Comment 4

[Matthew N. [:MattN]]

Comment on attachment 8817837 [details]
Bug 1322201 - Ensure correct usage of "login" vs "log in" in captive portal strings.

https://reviewboard.mozilla.org/r/98056/#review98384

Since this is an English mistake in the string, I'm not even sure that we need to change the entity names. Not changing them would also allow us to uplift this fix.

Please cleanup or fix `captivePortal.infoMessage` and request review from Flod instead.

::: browser/locales/en-US/chrome/browser/browser.properties:739
(Diff revision 2)
>  
>  # LOCALIZATION NOTE (captivePortal.infoMessage,
>  #                    captivePortal.infoMessage2):
>  # Shown in a notification bar when we detect a captive portal is blocking network access
>  # and requires the user to log in before browsing. %1$S is replaced with brandShortName.
>  captivePortal.infoMessage = This network may require you to login to use the internet. %1$S has opened the login page for you.

Is this an m-c or Aurora patch?

Why wasn't `captivePortal.infoMessage` deleted before on m-c? It should also be updated if we're keeping it for some reason.

::: browser/locales/en-US/chrome/overrides/netError.dtd:54
(Diff revision 2)
> -<!ENTITY captivePortal.title "Login to network">
> -<!ENTITY captivePortal.longDesc "
> -<p>This network may require you to login to access the internet.</p>
> +<!ENTITY captivePortal.title2 "Log in to network">
> +<!ENTITY captivePortal.longDesc2 "
> +<p>This network may require you to log in to access the internet.</p>

I think it's preferred to increment the section before the suffix when it's (.label/.title/.description/etc.) so I think this should be captivePortal2.title and captivePortal2.longDesc

Comment 5

[Francesco Lodolo [:flod]]

Comment on attachment 8817837 [details]
Bug 1322201 - Ensure correct usage of "login" vs "log in" in captive portal strings.

https://reviewboard.mozilla.org/r/98056/#review98476

Please keep the existing string IDs in this case. It's basically a typo in English, and I expect most people to ignore that "login" can't be used as a verb.

Comment 6

[(inactive) Nihanth Subramanya [:nhnt11]]

Attachment: Bug 1322201 - Ensure correct usage of "login" vs "log in" in captive portal strings.

Review commit: https://reviewboard.mozilla.org/r/99772/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/99772/

Comment 7

[mheubusch]

Log in is the verb form, login is the noun. However, if changing this causes issues per Flod, it is ok to leave as is as it makes no difference to user understanding in English, and I assume it is localized correctly as a noun or verb based on context.

Comment 8

[Francesco Lodolo [:flod]]

Thank Michelle, no issue on our side, I just wanted to make sure you had a chance to look at this.

Comment 9

[Francesco Lodolo [:flod]]

Comment on attachment 8820237 [details]
Bug 1322201 - Ensure correct usage of "login" vs "log in" in captive portal strings.

https://reviewboard.mozilla.org/r/99772/#review100236

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/31cb40156b9d
Ensure correct usage of "login" vs "log in" in captive portal strings. r=flod

Comment 11

[(inactive) Nihanth Subramanya [:nhnt11]]

Comment on attachment 8820237 [details]
Bug 1322201 - Ensure correct usage of "login" vs "log in" in captive portal strings.

Approval Request Comment
[Feature/Bug causing the regression]: Captive Portal
[User impact if declined]: Users passionate about grammar will be tickled by incorrect verb/noun usage.
[Is this code covered by automated tests?]: N/A
[Has the fix been verified in Nightly?]: No
[List of other uplifts needed for the feature/fix]: bug 989197
[Is the change risky?]: No
[Why is the change risky/not risky?]: It's just a small grammatical string fix.
[String changes made/needed]: Small change: "login" changed to "log in" where used as a verb.

Comment 12

[Francesco Lodolo [:flod]]

(In reply to Nihanth Subramanya [:nhnt11] from comment #11)
> [String changes made/needed]: Small change: "login" changed to "log in"
> where used as a verb.

Can we let this ride the trains? It's going to create unnecessary churn in tools and dashboard at this point of the cycle.

Comment 13

[(inactive) Nihanth Subramanya [:nhnt11]]

Comment on attachment 8820237 [details]
Bug 1322201 - Ensure correct usage of "login" vs "log in" in captive portal strings.

(In reply to Francesco Lodolo [:flod] from comment #12)
> (In reply to Nihanth Subramanya [:nhnt11] from comment #11)
> > [String changes made/needed]: Small change: "login" changed to "log in"
> > where used as a verb.
> 
> Can we let this ride the trains? It's going to create unnecessary churn in
> tools and dashboard at this point of the cycle.

Sure

Comment 14

[Francesco Lodolo [:flod]]

(In reply to Nihanth Subramanya [:nhnt11] from comment #13)
> Sure

Thanks. We hope to be able to work around this soon, but right now a change in any localization file will cause dashboard to re-run for each locale, and some tools will even mark the string as fuzzy since the original content changed.

Comment 15

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/31cb40156b9d

Comment 16

[Adrian Florinescu [:aflorinescu]]

Verified as fixed on Nightly 53.0a1 20170119030211. 
As this change will ride the trains is still affecting Aurora52.