Commit e54a67ba authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in... 

fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

TB 43563: Use TorConnect.getRegionNames rather than
TorConnect.countryNames.

Also, add a note regarding changing app locales.
parent 375a8c31

browser/components/torpreferences/content/connectionPane.js

+6 −9
Original line number Diff line number Diff line
@@ -2545,17 +2545,14 @@ const gConnectionPane = (function () { 
          }

          return item;

        };



        // TODO: Re-fetch when intl:app-locales-changed is fired, if we keep

        // this after tor-browser#42477.

        const regionNames = TorConnect.getRegionNames();

        const addLocations = codes => {

          const items = [];

          for (const code of codes) {

            items.push(

              createItem(

                code,

                TorConnect.countryNames[code]

                  ? TorConnect.countryNames[code]

                  : code

              )

            );

            items.push(createItem(code, regionNames[code] || code));

          }

          items.sort((left, right) => left.label.localeCompare(right.label));

          locationEntries.append(...items);
@@ -2573,7 +2570,7 @@ const gConnectionPane = (function () { 
          locationEntries.append(

            createItem("", TorStrings.settings.bridgeLocationOther, true)

          );

          addLocations(Object.keys(TorConnect.countryNames));

          addLocations(Object.keys(regionNames));

        });

        this._showAutoconfiguration = () => {

          locationGroup.hidden =