1164698 - Update Pocket code to latest version (May 13th code drop)

Status: RESOLVED FIXED

(Firefox :: Pocket, defect)

Description

[Nate Weiner]

Attachment: WedsDrop.patch

Small code drop with minor tweaks to FxA links and a fix for navigator issue referenced in bug 1164407

Comment 1

[Nate Weiner]

Attachment: WedsDropv2.patch

Comment 2

[Nate Weiner]

Attachment: WedsDropv3.patch

- Fixed typo
- Fixed patch (second one didn't include both files)

Comment 3

[Nate Weiner]

Attachment: WedsDropv3.patch

- Fixed typo
- Fixed patch (second one didn't include both files)
- (And this time) marked the other files as obsolete

Sorry for the comment spam

Comment 4

[Justin Dolske [:Dolske]]

Comment on attachment 8605568 [details] [diff] [review]
WedsDropv3.patch

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

::: browser/components/pocket/pktApi.js
@@ +211,5 @@
>          var url = baseAPIUrl + options.path;
>          var data = options.data || {};
> +        data.locale_lang = Cc["@mozilla.org/chrome/chrome-registry;1"].
> +             getService(Ci.nsIXULChromeRegistry).
> +             getSelectedLocale("browser");

Followup from bug 1164407: you'll need to deal with the "ja-JP-mac" locale issue from that bug.

I think you can just add the same hack as in that bug.

  if (locale == "ja-JP-mac")
    locale = "ja";

Or I suppose you could instead add a "Translations.ja-JP-mac = Translations.ja" at the end of dictionary.js.

Comment 5

[Nate Weiner]

Dolske: Per our conversation in IRC and my additional testing:

- The dictionary loading only takes the prefix (ex 'ja' or 'ru') so even if locale_lang is 'ja' or 'ja-JP' or 'ja-JP-mac', it should work. Relevant bits: http://mxr.mozilla.org/mozilla-central/source/browser/components/pocket/panels/js/saved.js#462

- Separately, I just tested hard coding those various strings as outputs of the UILocale method and everything worked as expected for all languages. 

- As we talked about, when we eventually ship more specific languages like en-US vs en-GB, we'll need to update the regex in the following link but I've filed a internal ticket and we'll tackle when the time comes: http://mxr.mozilla.org/mozilla-central/source/browser/components/pocket/panels/js/saved.js#640

Given that, I think we should be good.

Comment 6

[Justin Dolske [:Dolske]]

Comment on attachment 8605568 [details] [diff] [review]
WedsDropv3.patch

Concur!

Comment 7

[Pulsebot]

https://hg.mozilla.org/integration/fx-team/rev/db6a6012c872

Comment 8

[Justin Dolske [:Dolske]]

Comment on attachment 8605568 [details] [diff] [review]
WedsDropv3.patch

[Triage Comment]

a+ for aurora/beta/release: required for Pocket launch in 38.0.5.

Comment 9

[Justin Dolske [:Dolske]]

(aurora closed at the moment)
https://hg.mozilla.org/releases/mozilla-beta/rev/0954ecdb1dd9
https://hg.mozilla.org/releases/mozilla-release/rev/11c4678a21bb

Comment 10

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/db6a6012c872

Comment 11

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/9d822a4254a7