Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits:

• 1dace7f6
  by Richard Pospesel at 2023-02-14T18:05:21+00:00

  fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
  
  fixed substring calculation to get short name of locale for bridge emojii names
  

1 changed file:

• browser/components/torpreferences/content/connectionPane.js

Changes:

         const annotations = await res.json();

         const bcp47 = Services.locale.appLocaleAsBCP47;

         const dash = bcp47.indexOf("-");

-        const lang = dash !== -1 ? bcp47.substring(dash) : bcp47;

+        const lang = dash !== -1 ? bcp47.substring(0, dash) : bcp47;

         if (bcp47 in annotations) {

           emojiAnnotations = annotations[bcp47];

         } else if (lang in annotations) {