diff options
author | Yusuke Nemoto <kaakaa@users.noreply.github.com> | 2018-07-21 01:52:20 +0900 |
---|---|---|
committer | Elias Nahum <nahumhbl@gmail.com> | 2018-07-20 12:52:20 -0400 |
commit | 6104c37761deb8f06ea4af8838db12b8158318be (patch) | |
tree | b435543c08932bae6cc19415536ace1135c13f26 /i18n | |
parent | 908a682fcf3bbc48db75099f636d627616757b24 (diff) | |
download | chat-6104c37761deb8f06ea4af8838db12b8158318be.tar.gz chat-6104c37761deb8f06ea4af8838db12b8158318be.tar.bz2 chat-6104c37761deb8f06ea4af8838db12b8158318be.zip |
Break HTML blocks to individual strings (#8903)
* Modifying message and templates about mfa_change
* Modifying message and templates about password_change
* Modify message and template about password_reset
* Modify message and template about singin_change
* Modify message and template about email_info
* Modify message and template about change_username
* Modify message about change_email
* Add missing props
* Add argument
* Modify message and template about token_added
* Modify messages and template about notification_email
* Modify message and template about deactivate_email
* Fix style
* Remove unused message
* Remove br tags
* Modify message and code about invite_mail
* Add missing message
Diffstat (limited to 'i18n')
-rw-r--r-- | i18n/en.json | 62 |
1 files changed, 45 insertions, 17 deletions
diff --git a/i18n/en.json b/i18n/en.json index 865cbdc6a..fabe02ff6 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -41,7 +41,7 @@ }, { "id": "api.admin.test_email.body", - "translation": "<br/><br/><br/>It appears your Mattermost email is setup correctly!" + "translation": "It appears your Mattermost email is setup correctly!" }, { "id": "api.admin.test_email.missing_server", @@ -1736,7 +1736,11 @@ }, { "id": "api.templates.deactivate_body.info", - "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator." + "translation": "You deactivated your account on {{ .SiteURL }}." + }, + { + "id": "api.templates.deactivate_body.warning", + "translation": "If this change was not initiated by you or you want to reactivate your account, contact your system administrator." }, { "id": "api.templates.deactivate_body.title", @@ -1748,7 +1752,7 @@ }, { "id": "api.templates.email_change_body.info", - "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}.<br>If you did not make this change, please contact the system administrator." + "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}." }, { "id": "api.templates.email_change_body.title", @@ -1779,24 +1783,36 @@ "translation": "To change your notification preferences, log in to your team site and go to Account Settings > Notifications." }, { - "id": "api.templates.email_info", - "translation": "Any questions at all, mail us any time: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Best wishes,<br>The {{.SiteName}} Team<br>" + "id": "api.templates.email_info1", + "translation": "Any questions at all, mail us any time: " + }, + { + "id": "api.templates.email_info2", + "translation": "Best wishes," + }, + { + "id": "api.templates.email_info3", + "translation": "The {{.SiteName}} Team" }, { "id": "api.templates.email_organization", "translation": "Sent by " }, { + "id": "api.templates.email_warning", + "translation": "If you did not make this change, please contact the system administrator." + }, + { "id": "api.templates.invite_body.button", "translation": "Join Team" }, { "id": "api.templates.invite_body.extra_info", - "translation": "Mattermost lets you share messages and files from your PC or phone, with instant search and archiving. After you’ve joined <strong>{{.TeamDisplayName}}</strong>, you can sign-in to your new team and access these features anytime from the web address:<br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>" + "translation": "Mattermost lets you share messages and files from your PC or phone, with instant search and archiving. After you’ve joined [[{{.TeamDisplayName}}]], you can sign-in to your new team and access these features anytime from the web address:" }, { "id": "api.templates.invite_body.info", - "translation": "The team {{.SenderStatus}} <strong>{{.SenderName}}</strong>, has invited you to join <strong>{{.TeamDisplayName}}</strong>." + "translation": "The team {{.SenderStatus}} [[{{.SenderName}}]], has invited you to join [[{{.TeamDisplayName}}]]." }, { "id": "api.templates.invite_body.title", @@ -1808,7 +1824,7 @@ }, { "id": "api.templates.mfa_activated_body.info", - "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator." + "translation": "Multi-factor authentication has been added to your account on {{ .SiteURL }}." }, { "id": "api.templates.mfa_activated_body.title", @@ -1820,7 +1836,7 @@ }, { "id": "api.templates.mfa_deactivated_body.info", - "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you, please contact your system administrator." + "translation": "Multi-factor authentication has been removed from your account on {{ .SiteURL }}." }, { "id": "api.templates.mfa_deactivated_body.title", @@ -1828,7 +1844,7 @@ }, { "id": "api.templates.password_change_body.info", - "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator." + "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}." }, { "id": "api.templates.password_change_body.title", @@ -1847,8 +1863,12 @@ "translation": "Reset Password" }, { - "id": "api.templates.reset_body.info", - "translation": "To change your password, click \"Reset Password\" below.<br>If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours." + "id": "api.templates.reset_body.info1", + "translation": "To change your password, click \"Reset Password\" below." + }, + { + "id": "api.templates.reset_body.info2", + "translation": "If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours." }, { "id": "api.templates.reset_body.title", @@ -1860,7 +1880,7 @@ }, { "id": "api.templates.signin_change_email.body.info", - "translation": "You updated your sign-in method on {{ .SiteName }} to {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator." + "translation": "You updated your sign-in method on {{ .SiteName }} to {{.Method}}." }, { "id": "api.templates.signin_change_email.body.method_email", @@ -1876,7 +1896,7 @@ }, { "id": "api.templates.user_access_token_body.info", - "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator." + "translation": "A personal access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account." }, { "id": "api.templates.user_access_token_body.title", @@ -1888,7 +1908,7 @@ }, { "id": "api.templates.username_change_body.info", - "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}.<br>If you did not make this change, please contact the system administrator." + "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}." }, { "id": "api.templates.username_change_body.title", @@ -2968,7 +2988,11 @@ }, { "id": "app.notification.body.text.group_message.full", - "translation": "Channel: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + "translation": "Channel: {{.ChannelName}}" + }, + { + "id": "app.notification.body.text.group_message.full2", + "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.body.text.group_message.generic", @@ -2976,7 +3000,11 @@ }, { "id": "app.notification.body.text.notification.full", - "translation": "Channel: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + "translation": "Channel: {{.ChannelName}}" + }, + { + "id": "app.notification.body.text.notification.full2", + "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.body.text.notification.generic", |