Update broken site locale to include country (#2587)

duckduckgo · Jul 17, 2024 · 9482acc · 9482acc
1 parent c6a7145
commit 9482acc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/shared/js/background/classes/tab-state.js b/shared/js/background/classes/tab-state.js
@@ -1,5 +1,5 @@
 import { getFromSessionStorage, setToSessionStorage, removeFromSessionStorage } from '../wrapper'
-import { getUserLocale } from '../i18n'
+import { getFullUserLocale } from '../i18n'
 import { Tracker } from './tracker'
 import { AdClick } from './ad-click-attribution-policy'
 
@@ -66,7 +66,7 @@ export class TabState {
         /** @type {number[]} */
         this.jsPerformance = []
         /** @type {string} */
-        this.locale = getUserLocale()
+        this.locale = getFullUserLocale()
         // Whilst restoring, prevent the tab data being stored
         if (!restoring) {
             Storage.backup(this)

diff --git a/shared/js/background/i18n.js b/shared/js/background/i18n.js
@@ -12,3 +12,11 @@ export function getUserLocale () {
     }
     return lang
 }
+
+export function getFullUserLocale () {
+    if (!browser?.i18n) {
+        return 'en-US'
+    }
+
+    return browser.i18n.getUILanguage()
+}
diff --git a/unit-test/background/classes/tab.js b/unit-test/background/classes/tab.js
@@ -123,7 +123,7 @@ describe('Tab', () => {
                 userRefreshCount: 0,
                 openerContext: null,
                 jsPerformance: [],
-                locale: 'en'
+                locale: 'en-US'
             }
             expect(tabClone.site.enabledFeatures.length).toBe(14)
             expect(JSON.stringify(tabClone, null, 4)).toEqual(JSON.stringify(tabSnapshot, null, 4))

diff --git a/unit-test/background/reference-tests/broken-site-reporting-tests.js b/unit-test/background/reference-tests/broken-site-reporting-tests.js
@@ -28,7 +28,7 @@ async function submitAndValidateReport (report) {
     }
 
     tab.userRefreshCount = report.userRefreshCount || 0
-    tab.locale = report.locale || 'en'
+    tab.locale = report.locale || 'en-US'
 
     const addRequest = (hostname, action, opts = {}) => {
         tab.addToTrackers({