summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2019-10-10 15:31:54 +0200
committerAndrej Mihajlov <and@mullvad.net>2019-10-14 14:12:30 +0200
commit83489ff02857508700ada48a176e7c5e81250df7 (patch)
treeb1a78fb2b77cf4588414b51d8857d35a9e574203 /gui/src
parente351a2b757e9c18d6312f89952233aca1c3c330b (diff)
downloadmullvadvpn-83489ff02857508700ada48a176e7c5e81250df7.tar.xz
mullvadvpn-83489ff02857508700ada48a176e7c5e81250df7.zip
Use relay-locations to translate country names in the relay list
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/renderer/app.tsx6
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,