diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-08-21 17:09:52 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-08-21 17:09:52 +0200 |
commit | b02e0c2249736467c698b0c16eaf20ce550ed0f5 (patch) | |
tree | dbecb627e8afa581bc56fd9b5d9a2c4364e8490f /src | |
parent | remove console logs (diff) | |
download | ferdium-app-b02e0c2249736467c698b0c16eaf20ce550ed0f5.tar.gz ferdium-app-b02e0c2249736467c698b0c16eaf20ce550ed0f5.tar.zst ferdium-app-b02e0c2249736467c698b0c16eaf20ce550ed0f5.zip |
Update wording
Diffstat (limited to 'src')
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 22 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 2 | ||||
-rw-r--r-- | src/i18n/messages/src/components/settings/account/AccountDashboard.json | 2 |
3 files changed, 6 insertions, 20 deletions
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 6d10487e8..e1f87cdd3 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -77,7 +77,7 @@ const messages = defineMessages({ | |||
77 | }, | 77 | }, |
78 | yourLicense: { | 78 | yourLicense: { |
79 | id: 'settings.account.yourLicense', | 79 | id: 'settings.account.yourLicense', |
80 | defaultMessage: '!!!Your license:', | 80 | defaultMessage: '!!!Your Franz License:', |
81 | }, | 81 | }, |
82 | trialEndsIn: { | 82 | trialEndsIn: { |
83 | id: 'settings.account.trialEndsIn', | 83 | id: 'settings.account.trialEndsIn', |
@@ -171,7 +171,6 @@ export default @observer class AccountDashboard extends Component { | |||
171 | <> | 171 | <> |
172 | {' '} | 172 | {' '} |
173 | <ProBadge /> | 173 | <ProBadge /> |
174 | {/* <span className="badge badge--premium">{intl.formatMessage(messages.accountTypePremium)}</span> */} | ||
175 | </> | 174 | </> |
176 | )} | 175 | )} |
177 | </H1> | 176 | </H1> |
@@ -186,20 +185,6 @@ export default @observer class AccountDashboard extends Component { | |||
186 | className="franz-form__button--inverted" | 185 | className="franz-form__button--inverted" |
187 | onClick={openEditAccount} | 186 | onClick={openEditAccount} |
188 | /> | 187 | /> |
189 | {/* {user.isSubscriptionOwner && ( | ||
190 | <> | ||
191 | <Button | ||
192 | label={intl.formatMessage(messages.manageSubscriptionButtonLabel)} | ||
193 | className="franz-form__button--inverted" | ||
194 | onClick={openBilling} | ||
195 | /> | ||
196 | <Button | ||
197 | label={intl.formatMessage(messages.invoicesButton)} | ||
198 | className="franz-form__button--inverted" | ||
199 | onClick={openInvoices} | ||
200 | /> | ||
201 | </> | ||
202 | )} */} | ||
203 | </div> | 188 | </div> |
204 | )} | 189 | )} |
205 | </div> | 190 | </div> |
@@ -218,7 +203,7 @@ export default @observer class AccountDashboard extends Component { | |||
218 | <H2> | 203 | <H2> |
219 | {intl.formatMessage(messages.yourLicense)} | 204 | {intl.formatMessage(messages.yourLicense)} |
220 | </H2> | 205 | </H2> |
221 | <H3> | 206 | <p> |
222 | {planName} | 207 | {planName} |
223 | {user.team.isTrial && ( | 208 | {user.team.isTrial && ( |
224 | <> | 209 | <> |
@@ -226,9 +211,10 @@ export default @observer class AccountDashboard extends Component { | |||
226 | {intl.formatMessage(messages.trial)} | 211 | {intl.formatMessage(messages.trial)} |
227 | </> | 212 | </> |
228 | )} | 213 | )} |
229 | </H3> | 214 | </p> |
230 | {user.team.isTrial && ( | 215 | {user.team.isTrial && ( |
231 | <> | 216 | <> |
217 | <br /> | ||
232 | <p> | 218 | <p> |
233 | {intl.formatMessage(messages.trialEndsIn, { | 219 | {intl.formatMessage(messages.trialEndsIn, { |
234 | duration: moment.duration(moment().diff(user.team.trialEnd)).humanize(), | 220 | duration: moment.duration(moment().diff(user.team.trialEnd)).humanize(), |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 57785b74a..0270bb857 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -181,7 +181,7 @@ | |||
181 | "settings.account.tryReloadServices": "Try again", | 181 | "settings.account.tryReloadServices": "Try again", |
182 | "settings.account.tryReloadUserInfoRequest": "Try again", | 182 | "settings.account.tryReloadUserInfoRequest": "Try again", |
183 | "settings.account.userInfoRequestFailed": "Could not load user information", | 183 | "settings.account.userInfoRequestFailed": "Could not load user information", |
184 | "settings.account.yourLicense": "Your license:", | 184 | "settings.account.yourLicense": "Your Franz License", |
185 | "settings.app.buttonClearAllCache": "Clear cache", | 185 | "settings.app.buttonClearAllCache": "Clear cache", |
186 | "settings.app.buttonInstallUpdate": "Restart & install update", | 186 | "settings.app.buttonInstallUpdate": "Restart & install update", |
187 | "settings.app.buttonSearchForUpdate": "Check for updates", | 187 | "settings.app.buttonSearchForUpdate": "Check for updates", |
diff --git a/src/i18n/messages/src/components/settings/account/AccountDashboard.json b/src/i18n/messages/src/components/settings/account/AccountDashboard.json index 68d3e6dd1..72cf7e0f3 100644 --- a/src/i18n/messages/src/components/settings/account/AccountDashboard.json +++ b/src/i18n/messages/src/components/settings/account/AccountDashboard.json | |||
@@ -196,7 +196,7 @@ | |||
196 | }, | 196 | }, |
197 | { | 197 | { |
198 | "id": "settings.account.yourLicense", | 198 | "id": "settings.account.yourLicense", |
199 | "defaultMessage": "!!!Your license:", | 199 | "defaultMessage": "!!!Your Franz License:", |
200 | "file": "src/components/settings/account/AccountDashboard.js", | 200 | "file": "src/components/settings/account/AccountDashboard.js", |
201 | "start": { | 201 | "start": { |
202 | "line": 78, | 202 | "line": 78, |