From 0dbaa2d032ae42cbf39945df12efb20fc572b559 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Fri, 11 May 2018 17:20:47 +0200 Subject: [MM-10458] Change system response to "Could not find the channel" - bug fix (#8738) * [MM-10458] Change system response to "Could not find the channel" when trying to invite user to private channel you can't see * add another check to check if user have permission to add another in pvt channel --- i18n/en.json | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index d4a08b07a..fe10ed2a2 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "You don't have enough permissions to add {{.User}} in {{.Channel}}." }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels." + }, { "id": "api.command_invite.success", "translation": "{{.User}} added to {{.Channel}} channel." -- cgit v1.2.3-1-g7c22 From 9301e575c880970dc5642605adcc37903d176227 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Mon, 14 May 2018 16:05:37 -0400 Subject: translations PR 20180511 (#8774) * translations PR 20180511 * Fix bad translations --- i18n/en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index fe10ed2a2..c66066fcf 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3850,10 +3850,6 @@ "id": "app.plugin.get_plugins.app_error", "translation": "Unable to get active plugins" }, - { - "id": "app.plugin.invalid_id.app_error", - "translation": "Plugin Id must be at least {{.Min}} characters, at most {{.Max}} characters and match {{.Regex}}." - }, { "id": "app.plugin.install.app_error", "translation": "Unable to install plugin." @@ -3862,6 +3858,10 @@ "id": "app.plugin.install_id.app_error", "translation": "Unable to install plugin. A plugin with the same ID is already installed." }, + { + "id": "app.plugin.invalid_id.app_error", + "translation": "Plugin Id must be at least {{.Min}} characters, at most {{.Max}} characters and match {{.Regex}}." + }, { "id": "app.plugin.manifest.app_error", "translation": "Unable to find manifest for extracted plugin" -- cgit v1.2.3-1-g7c22 From 02f8c18f40cd0e973e4c75b751e8fcbbbd019728 Mon Sep 17 00:00:00 2001 From: Ugurcan Turkdogan Date: Tue, 15 May 2018 13:43:59 -0700 Subject: Update email notification subject line and contents for Group Messages (#8689) Reordered notification strings MM-10335 Changed uppercase CHANNEL to Lowercase Channel, added @ sign before username on notifications Added @ sign in front of username in all email notifications. Capitalized Direct Message and Group Message in email notifications. Fixed the issue with long group message names. Removed executable bit --- i18n/en.json | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 0f3dacd95..f7c21a3eb 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3776,11 +3776,11 @@ }, { "id": "app.notification.body.intro.direct.full", - "translation": "You have a new direct message." + "translation": "You have a new Direct Message." }, { "id": "app.notification.body.intro.direct.generic", - "translation": "You have a new direct message from {{.SenderName}}" + "translation": "You have a new Direct Message from @{{.SenderName}}" }, { "id": "app.notification.body.intro.notification.full", @@ -3788,11 +3788,19 @@ }, { "id": "app.notification.body.intro.notification.generic", - "translation": "You have a new notification from {{.SenderName}}" + "translation": "You have a new notification from @{{.SenderName}}" + }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "You have a new Group Message." + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "You have a new Group Message from @{{.SenderName}}" }, { "id": "app.notification.body.text.direct.full", - "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.body.text.direct.generic", @@ -3800,20 +3808,36 @@ }, { "id": "app.notification.body.text.notification.full", - "translation": "CHANNEL: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + "translation": "Channel: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.body.text.notification.generic", "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "Channel: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, { "id": "app.notification.subject.direct.full", - "translation": "[{{.SiteName}}] New Direct Message from {{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}" + "translation": "[{{.SiteName}}] New Direct Message from @{{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}" }, { "id": "app.notification.subject.notification.full", "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}" }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{ .SiteName }}] New Group Message in {{ .ChannelName}} on {{.Month}} {{.Day}}, {{.Year}}" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{ .SiteName }}] New Group Message on {{.Month}} {{.Day}}, {{.Year}}" + }, { "id": "app.plugin.activate.app_error", "translation": "Unable to activate extracted plugin." -- cgit v1.2.3-1-g7c22