Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-40218 - start trial from team edition, do upgrade and request license #9454

Merged
merged 9 commits into from
Dec 21, 2021
Merged

MM-40218 - start trial from team edition, do upgrade and request license #9454

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3dcfe4
MM-40218 - start trial from team edition, do upgrade and request license
pvev Nov 26, 2021
f86d311
add i18n texts
pvev Nov 30, 2021
cf90b3f
fix snapshots
pvev Nov 30, 2021
0e7f069
Merge branch 'master' into MM-40218-start-trial-from-team-edition
pvev Dec 10, 2021
b22f271
show restarting text and define which button was clicked
pvev Dec 20, 2021
a96dd57
Merge branch 'master' into MM-40218-start-trial-from-team-edition
pvev Dec 20, 2021
92068df
prevent the preference to get saved
pvev Dec 20, 2021
bca3a77
hide the update and request trial banner if normal button is clicked
pvev Dec 20, 2021
8747404
fix tests and snapshots
pvev Dec 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add i18n texts
  • Loading branch information
@pvev
pvev committed Nov 30, 2021
commit f86d3117c2187fb5f8b859d2b6c93d4fa04921af
4 changes: 4 additions & 0 deletions i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,6 +1218,7 @@
"admin.license.enterprise.upgrade.acceptTermsFinal": ". Upgrading will download the binary and update your team edition.",
"admin.license.enterprise.upgrade.acceptTermsInitial": "By clicking **Upgrade**, I agree to the terms of the Mattermost ",
"admin.license.enterprise.upgrade.eeLicenseLink": "Enterprise Edition License",
"admin.license.enterprise.upgrade.upgradeAndTrialTerms": ". Upgrading will download the binary and update your team edition.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This string isn't going to work well with localization - splitting them apart like this might look fine for english but it may not translate well to other languages

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok! could you be please more specific about which part could potentially bring problems when translating to other languages?

"admin.license.enterprise.upgrading": "Upgrading {percentage}%",
"admin.license.enterpriseEdition": "Enterprise Edition",
"admin.license.enterpriseEdition.subtitle": "This is an Enterprise Edition for the Mattermost {skuName} plan",
Expand Down Expand Up @@ -1250,6 +1251,9 @@
"admin.license.trialCard.licenseExpiring": "You’re currently on a free trial of our Mattermost Enterprise license.",
"admin.license.trialCard.purchase": "Purchase",
"admin.license.trialCard.purchase_license": "Purchase a license",
"admin.license.trialUpgradeAndRequest.submit": "Upgrade Server And Start trial",
"admin.license.upgrade-and-trial-request.accept-terms": "By clicking **Upgrade And Start trial**, I agree to the [Mattermost Software Evaluation Agreement](!https://mattermost.com/software-evaluation-agreement/), [Privacy Policy](!https://mattermost.com/privacy-policy/), and receiving product emails. Also, I agree to the terms of the Mattermost ",
"admin.license.upgrade-and-trial-request.title": "Upgrade to Enterprise Edition and Experience Mattermost Enterprise Edition for free for the next 30 days. No obligation to buy or credit card required. ",
"admin.license.upgraded-restart": "You have upgraded your binary to mattermost enterprise, please restart the server to start using the new binary. You can do it right here:",
"admin.license.upgradeTitle": "Upgrade to the Professional Plan",
"admin.license.upgradeToEnterprise": "Upgrade to the Enterprise plan",
Expand Down