summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer/containers
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2019-09-18 17:52:07 +0200
committerAndrej Mihajlov <and@mullvad.net>2019-09-18 18:00:49 +0200
commit3d4b6a901622fd1f730b3032aec07121b1014d39 (patch)
treec076a3b02184a50aa7e34cb011086cba6f7bb992 /gui/src/renderer/containers
parent8efbb702aecbd6e2ff3f15203aa022075b00b5be (diff)
downloadmullvadvpn-3d4b6a901622fd1f730b3032aec07121b1014d39.tar.xz
mullvadvpn-3d4b6a901622fd1f730b3032aec07121b1014d39.zip
Fix relay list sort order
Diffstat (limited to 'gui/src/renderer/containers')
-rw-r--r--gui/src/renderer/containers/ConnectPage.tsx12
1 files changed, 4 insertions, 8 deletions
diff --git a/gui/src/renderer/containers/ConnectPage.tsx b/gui/src/renderer/containers/ConnectPage.tsx
index e9e0c3843e..66974ffed8 100644
--- a/gui/src/renderer/containers/ConnectPage.tsx
+++ b/gui/src/renderer/containers/ConnectPage.tsx
@@ -4,11 +4,7 @@ import log from 'electron-log';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { sprintf } from 'sprintf-js';
-import {
- countries,
- messages,
- relayLocations as relayLocationsLocalization,
-} from '../../shared/gettext';
+import { messages } from '../../shared/gettext';
import Connect from '../components/Connect';
import AccountExpiry from '../lib/account-expiry';
import { IRelayLocationRedux, RelaySettingsRedux } from '../redux/settings/reducers';
@@ -27,7 +23,7 @@ function getRelayName(
} else if ('country' in location) {
const country = relayLocations.find(({ code }) => code === location.country);
if (country) {
- return countries.gettext(country.name);
+ return country.name;
}
} else if ('city' in location) {
const [countryCode, cityCode] = location.city;
@@ -35,7 +31,7 @@ function getRelayName(
if (country) {
const city = country.cities.find(({ code }) => code === cityCode);
if (city) {
- return relayLocationsLocalization.gettext(city.name);
+ return city.name;
}
}
} else if ('hostname' in location) {
@@ -52,7 +48,7 @@ function getRelayName(
// TRANSLATORS: %(hostname)s - a hostname
messages.pgettext('connect-container', '%(city)s (%(hostname)s)'),
{
- city: relayLocationsLocalization.gettext(city.name),
+ city: city.name,
hostname,
},
);