summaryrefslogtreecommitdiffhomepage
path: root/app/components
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@codeispoetry.ru>2017-03-08 11:33:16 +0000
committerAndrej Mihajlov <and@codeispoetry.ru>2017-03-08 11:33:16 +0000
commit9db201013ed2f0e43be5ed9e09430cfdde5a5dcd (patch)
treed5fdf14fa0b3f06318d715a1073ffc4db68abb26 /app/components
parent2b5f3f9088013b36cd2c026ba019877d531ee2dc (diff)
downloadmullvadvpn-9db201013ed2f0e43be5ed9e09430cfdde5a5dcd.tar.xz
mullvadvpn-9db201013ed2f0e43be5ed9e09430cfdde5a5dcd.zip
Change "Auto-secure" to "Auto-connect"
Capitalise time & date value for "paid until"
Diffstat (limited to 'app/components')
-rw-r--r--app/components/Account.js2
-rw-r--r--app/components/Settings.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/components/Account.js b/app/components/Account.js
index 174d486273..12f3c1b6a8 100644
--- a/app/components/Account.js
+++ b/app/components/Account.js
@@ -27,7 +27,7 @@ export default class Account extends Component {
render() {
let paidUntil = moment(this.props.user.paidUntil);
let formattedAccountId = formatAccount(this.props.user.account);
- let formattedPaidUntil = paidUntil.format('hA, D MMMM YYYY');
+ let formattedPaidUntil = paidUntil.format('hA, D MMMM YYYY').toUpperCase();
let isOutOfTime = paidUntil.isSameOrBefore(moment());
return (
diff --git a/app/components/Settings.js b/app/components/Settings.js
index 5bc9040bc5..9d8d6db149 100644
--- a/app/components/Settings.js
+++ b/app/components/Settings.js
@@ -80,7 +80,7 @@ export default class Settings extends Component {
<div className="settings__cell-spacer"></div>
<div className="settings__cell">
- <div className="settings__cell-label">Auto-secure</div>
+ <div className="settings__cell-label">Auto-connect</div>
<div className="settings__cell-value">
<Switch onChange={ ::this.onAutoSecure } isOn={ this.props.settings.autoSecure } />
</div>