summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-04-28 06:53:30 -0700
committerChristopher Speller <crspeller@gmail.com>2016-04-28 09:53:30 -0400
commit9fecf96d3bf49e7c10cff58f656eabf829c83167 (patch)
treed7b8fc02ba39f1567fa691d0184f9d69ce6f8916 /i18n
parentb49dc28d7e346e775bd75d1cce8046149440c0a4 (diff)
downloadchat-9fecf96d3bf49e7c10cff58f656eabf829c83167.tar.gz
chat-9fecf96d3bf49e7c10cff58f656eabf829c83167.tar.bz2
chat-9fecf96d3bf49e7c10cff58f656eabf829c83167.zip
PLT-2687 sending email on upgrade and moving profile pic to new location (#2808)
* Fixing CLI and adding unit tests * Adding the upgrade_db_30 to the help text * Adding the upgrade_db_30 to the help text * Adding the upgrade_db_30 to the help text * Fixing CLI tests * PLT-2687 sending email on upgrade and moving profile pic to new location * Fixing img move * Fixing moving of profile image * making upgrade email localizable * Fixing email template
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json8
1 files changed, 8 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 990db5277..4b67d8c78 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1312,6 +1312,14 @@
"translation": "{{ .SiteName }} Team Setup"
},
{
+ "id": "api.templates.upgrade_30_subject.info",
+ "translation": "[MATTERMOST] Changes to your account for Mattermost 3.0 Upgrade"
+ },
+ {
+ "id": "api.templates.upgrade_30_body.info",
+ "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>YOUR DUPLICATE ACCOUNTS HAVE BEEN UPDATED</h3>Your Mattermost server is being upgraded to Version 3.0, which lets you use a single account across multiple teams.<br/><br/>You are receiving this email because the upgrade process has detected your account had the same email or username as other accounts on the server.<br/><br/>The following updates have been made: <br/><br/>{{if .EmailChanged }}- The duplicate email of an account on the `/{{.TeamName}}` team was changed to `{{.Email}}`. If you use email and password to login, you can use this new email address for login.<br/><br/>{{end}}{{if .UsernameChanged }}- The duplicate username of an account on the team site `/{{.TeamName}}` has been changed to `{{.Username}}` to avoid confusion with other accounts.<br/><br/>{{end}} RECOMMENDED ACTION: <br/><br/>It is recommended that you login to your teams used by your duplicate accounts and add your primary account to the team and any public channels and private groups which you wish to continue using. <br/><br/>This gives your primary account access to all public channel and private group history. You can continue to access the direct message history of your duplicate accounts by logging in with their credentials. <br/><br/>FOR MORE INFORMATION: <br/><br/>For more information on the upgrade to Mattermost 3.0 please see: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
+ },
+ {
"id": "api.templates.singin_change_email.body.info",
"translation": "You updated your sign-in method for on {{ .SiteName }} to {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
},