From 847c181ec9b73e51daf39efc5c597eff2e7cdb31 Mon Sep 17 00:00:00 2001 From: Jesse Hallam Date: Wed, 23 May 2018 14:26:35 -0400 Subject: MM-8622: Improved plugin error reporting (#8737) * allow `Wait()`ing on the supervisor In the event the plugin supervisor shuts down a plugin for crashing too many times, the new `Wait()` interface allows the `ActivatePlugin` to accept a callback function to trigger when `supervisor.Wait()` returns. If the supervisor shuts down normally, this callback is invoked with a nil error, otherwise any error reported by the supervisor is passed along. * improve plugin activation/deactivation logic Avoid triggering activation of previously failed-to-start plugins just becase something in the configuration changed. Now, intelligently compare the global enable bit as well as the each individual plugin's enabled bit. * expose store to manipulate PluginStatuses * expose API to fetch plugin statuses * keep track of whether or not plugin sandboxing is supported * transition plugin statuses * restore error on plugin activation if already active * don't initialize test plugins until successfully loaded * emit websocket events when plugin statuses change * skip pruning if already initialized * MM-8622: maintain plugin statuses in memory Switch away from persisting plugin statuses to the database, and maintain in memory instead. This will be followed by a cluster interface to query the in-memory status of plugin statuses from all cluster nodes. At the same time, rename `cluster_discovery_id` on the `PluginStatus` model object to `cluster_id`. * MM-8622: aggregate plugin statuses across cluster * fetch cluster plugin statuses when emitting websocket notification * address unit test fixes after rebasing * relax (poor) racey unit test re: supervisor.Wait() * make store-mocks --- i18n/en.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 24e49278c..9f008a64b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3854,6 +3854,10 @@ "id": "app.plugin.deactivate.app_error", "translation": "Unable to deactivate plugin" }, + { + "id": "app.plugin.delete_plugin_status_state.app_error", + "translation": "Unable to delete plugin status state." + }, { "id": "app.plugin.disabled.app_error", "translation": "Plugins have been disabled. Please check your logs for details." @@ -3898,10 +3902,18 @@ "id": "app.plugin.not_installed.app_error", "translation": "Plugin is not installed" }, + { + "id": "app.plugin.prepackaged.app_error", + "translation": "Cannot install prepackaged plugin" + }, { "id": "app.plugin.remove.app_error", "translation": "Unable to delete plugin" }, + { + "id": "app.plugin.set_plugin_status_state.app_error", + "translation": "Unable to set plugin status state." + }, { "id": "app.plugin.upload_disabled.app_error", "translation": "Plugins and/or plugin uploads have been disabled." @@ -4798,6 +4810,10 @@ "id": "model.client.writer.app_error", "translation": "Unable to build multipart request" }, + { + "id": "model.cluster.is_valid.id.app_error", + "translation": "Invalid Id" + }, { "id": "model.command.is_valid.create_at.app_error", "translation": "Create at must be a valid time" -- cgit v1.2.3-1-g7c22 From 47f3c064db885c2cb2e75c195ea24e2ef687891d Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Thu, 24 May 2018 08:25:52 -0400 Subject: translations PR 20180522 (#8837) * translations PR 20180522 * Fix italian translation --- i18n/en.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 9f008a64b..d802eb76b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3782,14 +3782,6 @@ "id": "app.notification.body.intro.direct.generic", "translation": "You have a new Direct Message from @{{.SenderName}}" }, - { - "id": "app.notification.body.intro.notification.full", - "translation": "You have a new notification." - }, - { - "id": "app.notification.body.intro.notification.generic", - "translation": "You have a new notification from @{{.SenderName}}" - }, { "id": "app.notification.body.intro.group_message.full", "translation": "You have a new Group Message." @@ -3798,6 +3790,14 @@ "id": "app.notification.body.intro.group_message.generic", "translation": "You have a new Group Message from @{{.SenderName}}" }, + { + "id": "app.notification.body.intro.notification.full", + "translation": "You have a new notification." + }, + { + "id": "app.notification.body.intro.notification.generic", + "translation": "You have a new notification from @{{.SenderName}}" + }, { "id": "app.notification.body.text.direct.full", "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" @@ -3807,29 +3807,25 @@ "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { - "id": "app.notification.body.text.notification.full", + "id": "app.notification.body.text.group_message.full", "translation": "Channel: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { - "id": "app.notification.body.text.notification.generic", + "id": "app.notification.body.text.group_message.generic", "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { - "id": "app.notification.body.text.group_message.full", + "id": "app.notification.body.text.notification.full", "translation": "Channel: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { - "id": "app.notification.body.text.group_message.generic", + "id": "app.notification.body.text.notification.generic", "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.subject.direct.full", "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}}" @@ -3838,6 +3834,10 @@ "id": "app.notification.subject.group_message.generic", "translation": "[{{ .SiteName }}] New Group Message on {{.Month}} {{.Day}}, {{.Year}}" }, + { + "id": "app.notification.subject.notification.full", + "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}" + }, { "id": "app.plugin.activate.app_error", "translation": "Unable to activate extracted plugin." @@ -5062,14 +5062,14 @@ "id": "model.config.is_valid.ldap_id", "translation": "AD/LDAP field \"ID Attribute\" is required." }, - { - "id": "model.config.is_valid.ldap_login_id", - "translation": "AD/LDAP field \"Login ID Attribute\" is required." - }, { "id": "model.config.is_valid.ldap_lastname", "translation": "AD/LDAP field \"Last Name Attribute\" is required." }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "AD/LDAP field \"Login ID Attribute\" is required." + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "Invalid max page size value." -- cgit v1.2.3-1-g7c22