1493313 - Port bug 1491394: new mozILocaleService API - TEST-UNEXPECTED-FAIL | test-menubar-collapsed.js::test_main_menu_collapsed

Status: RESOLVED FIXED

(Thunderbird :: General, defect)

Description

[:aceman]

TEST-UNEXPECTED-FAIL | /builds/worker/workspace/build/tests/mozmill/startup-firstrun/test-menubar-collapsed.js | test-menubar-collapsed.js::test_main_menu_collapsed

And many other failures, mostly in Calendar.

There are new errors seen in the log:
JavaScript error: jar:file:///builds/worker/workspace/build/application/thunderbird/extensions/%7Be2fda1a4-762b-4020-b5ad-a41df1933103%7D.xpi!/components/calItemModule.js -> resource://calendar/calendar-js/calStartupService.js, line 65: TypeError: Services.locale.getPackagedLocales is not a function

At TB startup, the same error at a different place:
TypeError: Services.locale.getPackagedLocales is not a function, mailGlue.js:159:19

Probably something needs to be ported from m-c.

Comment 1

[Jorg K (CEST = GMT+2)]

We need to port: https://hg.mozilla.org/mozilla-central/rev/54dba2807ef8

Comment 2

[Jorg K (CEST = GMT+2)]

Lots of call sites:
RequestedLocales
https://dxr.mozilla.org/comm-central/search?q=etRequestedLocales+path%3Acomm%2F&redirect=false

AvailableLocales
https://dxr.mozilla.org/comm-central/search?q=etAvailableLocales++path%3Acomm%2F&redirect=false

PackagedLocales
https://dxr.mozilla.org/comm-central/search?q=etPackagedLocales+++path%3Acomm%2F&redirect=false

RegionalPrefsLocales
https://dxr.mozilla.org/comm-central/search?q=etRegionalPrefsLocales++++path%3Acomm%2F&redirect=false

===

These haven't landed yet: Bug 1493220.
SystemLocales
https://dxr.mozilla.org/comm-central/search?q=etSystemLocales+++++path%3Acomm%2F&redirect=false
(none)

regionalPrefsLocales
https://dxr.mozilla.org/comm-central/search?q=etRegionalPrefsLocales++++++path%3Acomm%2F&redirect=false

Comment 3

[Jorg K (CEST = GMT+2)]

Attachment: 1493313-xxxLocales.patch

This should it it. All done with sed.

Comment 5

[Jorg K (CEST = GMT+2)]

Damn, there is also: RequestedLocale, singular.

Comment 6

[Jorg K (CEST = GMT+2)]

Attachment: 1493313-xxxLocales.patch (v2)

Comment 7

[:aceman]

Comment on attachment 9011152 [details] [diff] [review]
1493313-xxxLocales.patch (v2)

Review of attachment 9011152 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks, fixes the errors and makes Lightning work for me locally.

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/a01d1481ef18
Port bug 1491394: Replace {get|set}XxxLocales() with xxxLocales. r=aceman

Comment 9

[:aceman]

Attachment: appLocalesAsBCP47

Missed appLocalesAsBCP47. Fails one calendar test and breaks Advanced pane in Options.

Try run: https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=4cb0eeb7614036d5e8e6e75df20689e63177714a

Comment 10

[Jorg K (CEST = GMT+2)]

Comment on attachment 9011165 [details] [diff] [review]
appLocalesAsBCP47

Yes, I missed it, since it wasn't advertised :-(
https://groups.google.com/d/msg/mozilla.dev.platform/csDd-PFftLg/hOXKXpm4CgAJ

Comment 11

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/ed984c4258e9
Port Bug 1491394: Replace getAppLocalesAsBCP47() with appLocalesAsBCP47. r=jorgk DONTBUILD

Comment 12

[[:MakeMyDay]]

Comment on attachment 9011165 [details] [diff] [review]
appLocalesAsBCP47

Review of attachment 9011165 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks.

Comment 13

[[:MakeMyDay]]

Comment on attachment 9011152 [details] [diff] [review]
1493313-xxxLocales.patch (v2)

Review of attachment 9011152 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks, r+wc

::: calendar/providers/gdata/modules/gdataSession.jsm
@@ +137,5 @@
>          this.oauth = new OAuth2(OAUTH_BASE_URI, OAUTH_SCOPE, OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET);
>          this.oauth.extraAuthParams = [
>            ["login_hint", sessionId],
>            // Use application locale for login dialog
> +          ["hl", Services.locale.requestedLocale]

Please make this backward compatible, since Gdata is build cross version from c-c.

(typeof Services.locale.requestedLocale === "undefined") ? Services.locale.getRequestedLocale() : Services.locale.requestedLocale

Comment 14

[Jorg K (CEST = GMT+2)]

Attachment: 1493313-follow-up-gdata.patch

Like so? I linted it. I think we can lose the parenthesis, no?

Comment 15

[Jorg K (CEST = GMT+2)]

Attachment: 1493313-follow-up-gdata.patch

Without parenthesis, like here:
https://searchfox.org/comm-central/rev/4f2ab5a24b507f5bbf7c6ad012d44128fa017ef5/calendar/base/modules/utils/calItipUtils.jsm#1139

Comment 16

[[:MakeMyDay]]

Comment on attachment 9011190 [details] [diff] [review]
1493313-follow-up-gdata.patch

Review of attachment 9011190 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks, looks good. We use both patterns.

Comment 17

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/5bb80260d09b
Follow-up: For gData, cater for both old an new locale API. r=MakeMyDay