diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-10-14 15:42:36 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-10-14 15:42:36 +0200 |
| commit | f3182032f00fd6d37999bf6861e457b19b4528cc (patch) | |
| tree | bd8ee625619efc0330cf2a40af27ddd3e56b7d9a /gui/src | |
| parent | 2bd86da17f2dcf1be913ba18c7ec1f5d87472e99 (diff) | |
| parent | 4f01d3f097b6bf3c6489bbc7b133ef3055fb3980 (diff) | |
| download | mullvadvpn-f3182032f00fd6d37999bf6861e457b19b4528cc.tar.xz mullvadvpn-f3182032f00fd6d37999bf6861e457b19b4528cc.zip | |
Merge branch 'move-country-name-into-relay-locations'
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 3dcf3ca08b..ae906868a2 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -639,7 +639,7 @@ export default class AppRenderer { if (location.country) { const country = location.country; - location.country = countries.gettext(country) || country; + location.country = relayLocations.gettext(country) || countries.gettext(country) || country; } return location; @@ -648,12 +648,12 @@ export default class AppRenderer { private convertRelayListToLocationList(relayList: IRelayList): IRelayLocationRedux[] { return relayList.countries .map((country) => ({ - name: countries.gettext(country.name) || country.name, + name: relayLocations.gettext(country.name) || country.name, code: country.code, hasActiveRelays: country.cities.some((city) => city.relays.some((relay) => relay.active)), cities: country.cities .map((city) => ({ - name: relayLocations.gettext(city.name) || cities.gettext(city.name) || city.name, + name: relayLocations.gettext(city.name) || city.name, code: city.code, latitude: city.latitude, longitude: city.longitude, |