diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-09-17 14:58:49 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-09-17 14:58:49 +0200 |
| commit | 714684ff8069fd7338d00d57ea09d8b6a4d680c0 (patch) | |
| tree | d84fe567be4ae5fd94978ae730e26382cec3dffe /gui/src | |
| parent | 492d0053451b71ae825d9740422c85489b9cc302 (diff) | |
| parent | ed02d46e2b4b44be4e349e1e790424278147a10c (diff) | |
| download | mullvadvpn-714684ff8069fd7338d00d57ea09d8b6a4d680c0.tar.xz mullvadvpn-714684ff8069fd7338d00d57ea09d8b6a4d680c0.zip | |
Merge branch 'sort-locations-naturally-in-daemon'
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/renderer/app.tsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx index 69c55d4000..4a6910d4e8 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -563,12 +563,12 @@ export default class AppRenderer { longitude: city.longitude, hasActiveRelays: city.relays.some((relay) => relay.active), relays: city.relays.sort((relayA, relayB) => - relayA.hostname.localeCompare(relayB.hostname), + relayA.hostname.localeCompare(relayB.hostname, this.locale, { numeric: true }), ), })) - .sort((cityA, cityB) => cityA.name.localeCompare(cityB.name)), + .sort((cityA, cityB) => cityA.name.localeCompare(cityB.name, this.locale)), })) - .sort((countryA, countryB) => countryA.name.localeCompare(countryB.name)); + .sort((countryA, countryB) => countryA.name.localeCompare(countryB.name, this.locale)); } private setRelays(relayList: IRelayList) { |