From 1bf4d976bf621f9afacdb0da20602b2ccd045d48 Mon Sep 17 00:00:00 2001 From: Nate Weiner Date: Wed, 13 May 2015 18:18:29 -0700 Subject: [PATCH] Bug 1164698 - Update Pocket code to latest version (May 13th code drop). r=dolske --- browser/components/pocket/panels/js/signup.js | 1 + browser/components/pocket/pktApi.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/browser/components/pocket/panels/js/signup.js b/browser/components/pocket/panels/js/signup.js index 4600cbefd9f..cd7d5031b28 100644 --- a/browser/components/pocket/panels/js/signup.js +++ b/browser/components/pocket/panels/js/signup.js @@ -187,6 +187,7 @@ PKT_SIGNUP_OVERLAY.prototype = { this.getTranslations(); this.dictJSON.fxasignedin = this.fxasignedin ? 1 : 0; this.dictJSON.variant = (this.variant ? this.variant : 'undefined'); + this.dictJSON.variant += this.fxasignedin ? '_fxa' : '_nonfxa'; this.dictJSON.pockethost = this.pockethost; this.dictJSON.showlearnmore = (this.variant.indexOf('_lm') > -1 || this.variant == 'storyboard' || this.variant == 'hero') ? 1 : 0; diff --git a/browser/components/pocket/pktApi.js b/browser/components/pocket/pktApi.js index d7f3c86b2d3..1d806430ee8 100644 --- a/browser/components/pocket/pktApi.js +++ b/browser/components/pocket/pktApi.js @@ -247,7 +247,9 @@ var pktApi = (function() { var url = baseAPIUrl + options.path; var data = options.data || {}; - data.locale_lang = window.navigator.language; + data.locale_lang = Cc["@mozilla.org/chrome/chrome-registry;1"]. + getService(Ci.nsIXULChromeRegistry). + getSelectedLocale("browser"); data.consumer_key = oAuthConsumerKey; var request = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Components.interfaces.nsIXMLHttpRequest);