From cfd6d9226a4d8aab3f1bc9219a73aa212fe947d7 Mon Sep 17 00:00:00 2001 From: Jason Blais <13119842+jasonblais@users.noreply.github.com> Date: Sat, 27 Jun 2020 15:04:05 -0400 Subject: [PATCH 1/5] Label the "embed video inside Mattermost" feature as experimental in /jitsi settings Proposing adding the label given there are a few outstanding issues with this feature. It is already noted as experimental in the System Console. --- server/command.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/command.go b/server/command.go index 98504df4..9bdfdca0 100644 --- a/server/command.go +++ b/server/command.go @@ -109,7 +109,7 @@ func (p *Plugin) executeHelpCommand(c *plugin.Context, args *model.CommandArgs) * |/jitsi settings [setting] [value]| - Update your user settings (see below for options) ###### Jitsi Settings: -* |/jitsi settings embedded [true/false]|: When true, Jitsi meeting is embedded as a floating window inside Mattermost. When false, Jitsi meeting opens in a new window. +* |/jitsi settings embedded [true/false]|: (Experimental) When true, Jitsi meeting is embedded as a floating window inside Mattermost. When false, Jitsi meeting opens in a new window. * |/jitsi settings naming_scheme [words/uuid/mattermost/ask]|: Select how meeting names are generated with one of these options: * |words|: Random English words in title case (e.g. PlayfulDragonsObserveCuriously) * |uuid|: UUID (universally unique identifier) From 0125fbcc2fdf179742f2bbbc570754aa18e3da18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 29 Jun 2020 11:09:05 +0200 Subject: [PATCH 2/5] Add translations --- assets/i18n/active.de.json | 4 ++-- assets/i18n/active.en.json | 2 +- assets/i18n/active.es.json | 4 ++-- assets/i18n/active.fr.json | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/i18n/active.de.json b/assets/i18n/active.de.json index 191542b2..6e52cb42 100644 --- a/assets/i18n/active.de.json +++ b/assets/i18n/active.de.json @@ -24,8 +24,8 @@ "other": "Einzigartige Nummer als Meeting Name" }, "jitsi.command.help.text": { - "hash": "sha1-1f824ef11a618fe33af2eb86e672b29685e7ad52", - "other": "* |/jitsi| - Starte ein Meeting\n* |/jitsi [Thema]| - Starte ein Meeting mit einem speziellen Thema\n* |/jitsi help| - Zeige diesen Hilfe-Text an\n* |/jitsi settings| - Zeige die die aktuellen Benutzereinstellungen an für das Jitsi Plugin\n* |/jitsi settings [Einstellung] [Wert]| - Aktualisiere die Benutzereinstellungen für das Jitsi Plugin (Siehe unten)\n\n###### Jitsi Einstellungen:\n* |/jitsi settings embedded [true/false]|: Wenn auf `true` gesetzt, werden Jitsi Mettings als Fenster-Im-Festeris in Mattermost angezeigt. When auf `false` gesetzt, werden Jitsi Meetings in einem neuen Fenster geöffnet.\n* |/jitsi settings naming_scheme [words/uuid/mattermost/ask]|: Select how meeting names are generated with one of these options:\n * |words|: Zufällige englische Wörter (z.B. PlayfulDragonsObserveCuriously)\n * |uuid|: Einzigartige Nummer\n * |mattermost|: Mattermost spezifischer Name. Eine Kombinations aus Teamname, Kanalname and zufälligem Text in öffentlichen und privaten Kanälen. Persönlicher Meeting Name in Direkt- und Gruppennachrichten.\n * |ask|: Frage beim Erstellen eines Meetings nach welcher Name verwendet werden soll." + "hash": "sha1-08e1afe25556ca110a40b00eadf99b6716db697a", + "other": "* |/jitsi| - Starte ein Meeting\n* |/jitsi [Thema]| - Starte ein Meeting mit einem speziellen Thema\n* |/jitsi help| - Zeige diesen Hilfe-Text an\n* |/jitsi settings| - Zeige die die aktuellen Benutzereinstellungen an für das Jitsi Plugin\n* |/jitsi settings [Einstellung] [Wert]| - Aktualisiere die Benutzereinstellungen für das Jitsi Plugin (Siehe unten)\n\n###### Jitsi Einstellungen:\n* |/jitsi settings embedded [true/false]|: (Experimental) Wenn auf `true` gesetzt, werden Jitsi Mettings als Fenster-Im-Festeris in Mattermost angezeigt. When auf `false` gesetzt, werden Jitsi Meetings in einem neuen Fenster geöffnet.\n* |/jitsi settings naming_scheme [words/uuid/mattermost/ask]|: Select how meeting names are generated with one of these options:\n * |words|: Zufällige englische Wörter (z.B. PlayfulDragonsObserveCuriously)\n * |uuid|: Einzigartige Nummer\n * |mattermost|: Mattermost spezifischer Name. Eine Kombinations aus Teamname, Kanalname and zufälligem Text in öffentlichen und privaten Kanälen. Persönlicher Meeting Name in Direkt- und Gruppennachrichten.\n * |ask|: Frage beim Erstellen eines Meetings nach welcher Name verwendet werden soll." }, "jitsi.command.help.title": { "hash": "sha1-4323c51f8bbbb49db2a370dd496d29531a034b3c", diff --git a/assets/i18n/active.en.json b/assets/i18n/active.en.json index eddfce8a..9ac4d28d 100644 --- a/assets/i18n/active.en.json +++ b/assets/i18n/active.en.json @@ -5,7 +5,7 @@ "jitsi.ask.select_meeting_type": "Select type of meeting you want to start", "jitsi.ask.title": "Jitsi Meeting Start", "jitsi.ask.uuid_meeting": "Meeting name with UUID", - "jitsi.command.help.text": "* |/jitsi| - Create a new meeting\n* |/jitsi [topic]| - Create a new meeting with specified topic\n* |/jitsi help| - Show this help text\n* |/jitsi settings| - View your current user settings for the Jitsi plugin\n* |/jitsi settings [setting] [value]| - Update your user settings (see below for options)\n\n###### Jitsi Settings:\n* |/jitsi settings embedded [true/false]|: When true, Jitsi meeting is embedded as a floating window inside Mattermost. When false, Jitsi meeting opens in a new window.\n* |/jitsi settings naming_scheme [words/uuid/mattermost/ask]|: Select how meeting names are generated with one of these options:\n * |words|: Random English words in title case (e.g. PlayfulDragonsObserveCuriously)\n * |uuid|: UUID (universally unique identifier)\n * |mattermost|: Mattermost specific names. Combination of team name, channel name and random text in public and private channels; personal meeting name in direct and group messages channels.\n * |ask|: The plugin asks you to select the name every time you start a meeting", + "jitsi.command.help.text": "* |/jitsi| - Create a new meeting\n* |/jitsi [topic]| - Create a new meeting with specified topic\n* |/jitsi help| - Show this help text\n* |/jitsi settings| - View your current user settings for the Jitsi plugin\n* |/jitsi settings [setting] [value]| - Update your user settings (see below for options)\n\n###### Jitsi Settings:\n* |/jitsi settings embedded [true/false]|: (Experimental) When true, Jitsi meeting is embedded as a floating window inside Mattermost. When false, Jitsi meeting opens in a new window.\n* |/jitsi settings naming_scheme [words/uuid/mattermost/ask]|: Select how meeting names are generated with one of these options:\n * |words|: Random English words in title case (e.g. PlayfulDragonsObserveCuriously)\n * |uuid|: UUID (universally unique identifier)\n * |mattermost|: Mattermost specific names. Combination of team name, channel name and random text in public and private channels; personal meeting name in direct and group messages channels.\n * |ask|: The plugin asks you to select the name every time you start a meeting", "jitsi.command.help.title": "###### Mattermost Jitsi Plugin - Slash Command help\n", "jitsi.command.settings.current_values": "###### Jitsi Settings:\n* Embedded: |{{.Embedded}}|\n* Naming Scheme: |{{.NamingScheme}}|", "jitsi.command.settings.invalid_parameters": "Invalid settings parameters", diff --git a/assets/i18n/active.es.json b/assets/i18n/active.es.json index b45872e0..57f67e5f 100644 --- a/assets/i18n/active.es.json +++ b/assets/i18n/active.es.json @@ -24,8 +24,8 @@ "other": "Nombre de reunión con UUID" }, "jitsi.command.help.text": { - "hash": "sha1-1f824ef11a618fe33af2eb86e672b29685e7ad52", - "other": "* |/jitsi| - Crear nueva reunión\n* |/jitsi [team]| - Crea una nueva reunión con un tema específico\n* |/jitsi help| - Muestra este texto de ayuda\n* |/jitsi settings| - Ver tu configuracion actual para el plugin de Jitsi\n* |/jitsi settings [setting] [value]| - Actualiza tu configuracion (ver opciones abajo)\n\n###### Configuracion de Jitsi:\n* |/jitsi settings embedded [true/false]|: Cuando es true, la reunión Jitsi está dentro de Mattermost como una ventana flotante. Cuando es false, la reunión de Jitsi se abre en una ventana nueva.\n* |/jitsi settings naming_scheme [words/uuid/mattermost/ask]|: Selecciona como se generan los nombres de las reuniones con una de estas opciones:\n * |words|: Palabras aletorias en ingles en formato title case (e.g. PlayfulDragonsObserveCuriously)\n * |uuid|: UUID (identificador único universal)\n * |mattermost|: Nombres espeicifcos de Mattermost. Una combinación de nombre de equipo, nombre de canal y un texto aleagorio para canales públicos y privados; salas de reuniones personales en mensajes directos y de grupo.\n * |ask|: La extensión te permitirá selecionar el tipo de nombre a usar cada vez que inicies una reunión." + "hash": "sha1-08e1afe25556ca110a40b00eadf99b6716db697a", + "other": "* |/jitsi| - Crear nueva reunión\n* |/jitsi [team]| - Crea una nueva reunión con un tema específico\n* |/jitsi help| - Muestra este texto de ayuda\n* |/jitsi settings| - Ver tu configuracion actual para el plugin de Jitsi\n* |/jitsi settings [setting] [value]| - Actualiza tu configuracion (ver opciones abajo)\n\n###### Configuracion de Jitsi:\n* |/jitsi settings embedded [true/false]|: (Experimental) Cuando es true, la reunión Jitsi está dentro de Mattermost como una ventana flotante. Cuando es false, la reunión de Jitsi se abre en una ventana nueva.\n* |/jitsi settings naming_scheme [words/uuid/mattermost/ask]|: Selecciona como se generan los nombres de las reuniones con una de estas opciones:\n * |words|: Palabras aletorias en ingles en formato title case (e.g. PlayfulDragonsObserveCuriously)\n * |uuid|: UUID (identificador único universal)\n * |mattermost|: Nombres espeicifcos de Mattermost. Una combinación de nombre de equipo, nombre de canal y un texto aleagorio para canales públicos y privados; salas de reuniones personales en mensajes directos y de grupo.\n * |ask|: La extensión te permitirá selecionar el tipo de nombre a usar cada vez que inicies una reunión." }, "jitsi.command.help.title": { "hash": "sha1-4323c51f8bbbb49db2a370dd496d29531a034b3c", diff --git a/assets/i18n/active.fr.json b/assets/i18n/active.fr.json index 9e97d3bf..b860722b 100644 --- a/assets/i18n/active.fr.json +++ b/assets/i18n/active.fr.json @@ -24,8 +24,8 @@ "other": "Nom de réunion avec UUID" }, "jitsi.command.help.text": { - "hash": "sha1-1f824ef11a618fe33af2eb86e672b29685e7ad52", - "other": "* |/jitsi| - Création d'une nouvelle réunion\n* |/jitsi [topic]| - Création d'une réunion avec un sujet particulier\n* |/jitsi help| - Affiche ce message d'aide\n* |/jitsi settings| - Affiche vos paramètres actuels pour le plugin Jitsi\n* |/jitsi settings [setting] [value]| - Mets à jour vos paramètres (voir ci-dessous pour les options)\n\n###### Paramètres Jitsi:\n* |/jitsi settings embedded [true/false]|: Si \"true\", la réunion Jitsi est incluse en tant que fenêtre flottante dans Mattermost. Si \"false\", la réunion Jitsi s'ouvre dans une nouvelle fenêtre.\n* |/jitsi settings naming_scheme [words/uuid/mattermost/ask]|: Sélectionne la manière dont sont générés les noms de réunion avec une de ces options:\n * |words|: Mots Anglais aléatoires en \"title case\" (ex. PlayfulDragonsObserveCuriously)\n * |uuid|: UUID (Identifiant unique universel)\n * |mattermost|: Noms spécifiques Mattermost. Combinaison de nom de Team, nom de canal, et mots aléatoires pour les canaux publics et privés; Salles de réunions personnelles dans les conversations privées ou de groupe.\n * |ask|: Le plugin vous demande de choisir le nom de la réunion à chaque fois que vous en démarrez une." + "hash": "sha1-08e1afe25556ca110a40b00eadf99b6716db697a", + "other": "* |/jitsi| - Création d'une nouvelle réunion\n* |/jitsi [topic]| - Création d'une réunion avec un sujet particulier\n* |/jitsi help| - Affiche ce message d'aide\n* |/jitsi settings| - Affiche vos paramètres actuels pour le plugin Jitsi\n* |/jitsi settings [setting] [value]| - Mets à jour vos paramètres (voir ci-dessous pour les options)\n\n###### Paramètres Jitsi:\n* |/jitsi settings embedded [true/false]|: (Expérimentale) Si \"true\", la réunion Jitsi est incluse en tant que fenêtre flottante dans Mattermost. Si \"false\", la réunion Jitsi s'ouvre dans une nouvelle fenêtre.\n* |/jitsi settings naming_scheme [words/uuid/mattermost/ask]|: Sélectionne la manière dont sont générés les noms de réunion avec une de ces options:\n * |words|: Mots Anglais aléatoires en \"title case\" (ex. PlayfulDragonsObserveCuriously)\n * |uuid|: UUID (Identifiant unique universel)\n * |mattermost|: Noms spécifiques Mattermost. Combinaison de nom de Team, nom de canal, et mots aléatoires pour les canaux publics et privés; Salles de réunions personnelles dans les conversations privées ou de groupe.\n * |ask|: Le plugin vous demande de choisir le nom de la réunion à chaque fois que vous en démarrez une." }, "jitsi.command.help.title": { "hash": "sha1-4323c51f8bbbb49db2a370dd496d29531a034b3c", From 6da417c9ede1b2f4c0f64188c21155bdb074c862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 29 Jun 2020 13:47:58 +0200 Subject: [PATCH 3/5] Update assets/i18n/active.de.json Co-authored-by: Ben Schumacher --- assets/i18n/active.de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/i18n/active.de.json b/assets/i18n/active.de.json index 6e52cb42..89ef5af5 100644 --- a/assets/i18n/active.de.json +++ b/assets/i18n/active.de.json @@ -25,7 +25,7 @@ }, "jitsi.command.help.text": { "hash": "sha1-08e1afe25556ca110a40b00eadf99b6716db697a", - "other": "* |/jitsi| - Starte ein Meeting\n* |/jitsi [Thema]| - Starte ein Meeting mit einem speziellen Thema\n* |/jitsi help| - Zeige diesen Hilfe-Text an\n* |/jitsi settings| - Zeige die die aktuellen Benutzereinstellungen an für das Jitsi Plugin\n* |/jitsi settings [Einstellung] [Wert]| - Aktualisiere die Benutzereinstellungen für das Jitsi Plugin (Siehe unten)\n\n###### Jitsi Einstellungen:\n* |/jitsi settings embedded [true/false]|: (Experimental) Wenn auf `true` gesetzt, werden Jitsi Mettings als Fenster-Im-Festeris in Mattermost angezeigt. When auf `false` gesetzt, werden Jitsi Meetings in einem neuen Fenster geöffnet.\n* |/jitsi settings naming_scheme [words/uuid/mattermost/ask]|: Select how meeting names are generated with one of these options:\n * |words|: Zufällige englische Wörter (z.B. PlayfulDragonsObserveCuriously)\n * |uuid|: Einzigartige Nummer\n * |mattermost|: Mattermost spezifischer Name. Eine Kombinations aus Teamname, Kanalname and zufälligem Text in öffentlichen und privaten Kanälen. Persönlicher Meeting Name in Direkt- und Gruppennachrichten.\n * |ask|: Frage beim Erstellen eines Meetings nach welcher Name verwendet werden soll." + "other": "* |/jitsi| - Starte ein Meeting\n* |/jitsi [Thema]| - Starte ein Meeting mit einem speziellen Thema\n* |/jitsi help| - Zeige diesen Hilfe-Text an\n* |/jitsi settings| - Zeige die die aktuellen Benutzereinstellungen an für das Jitsi Plugin\n* |/jitsi settings [Einstellung] [Wert]| - Aktualisiere die Benutzereinstellungen für das Jitsi Plugin (Siehe unten)\n\n###### Jitsi Einstellungen:\n* |/jitsi settings embedded [true/false]|: (Experimentell) Wenn auf `true` gesetzt, werden Jitsi Mettings als Fenster-Im-Festeris in Mattermost angezeigt. When auf `false` gesetzt, werden Jitsi Meetings in einem neuen Fenster geöffnet.\n* |/jitsi settings naming_scheme [words/uuid/mattermost/ask]|: Select how meeting names are generated with one of these options:\n * |words|: Zufällige englische Wörter (z.B. PlayfulDragonsObserveCuriously)\n * |uuid|: Einzigartige Nummer\n * |mattermost|: Mattermost spezifischer Name. Eine Kombinations aus Teamname, Kanalname and zufälligem Text in öffentlichen und privaten Kanälen. Persönlicher Meeting Name in Direkt- und Gruppennachrichten.\n * |ask|: Frage beim Erstellen eines Meetings nach welcher Name verwendet werden soll." }, "jitsi.command.help.title": { "hash": "sha1-4323c51f8bbbb49db2a370dd496d29531a034b3c", @@ -95,4 +95,4 @@ "hash": "sha1-7726587ccfee9bb7539aad458c154f8be3d95dcd", "other": "{{.MeetingType}}: [{{.MeetingID}}]({{.MeetingURL}})\n\n[Tritt Meeting bei({{.MeetingURL}})" } -} \ No newline at end of file +} From 595bf4c95447dd47f287fd0ce0b2789e69f1bcc9 Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Mon, 29 Jun 2020 14:41:31 +0200 Subject: [PATCH 4/5] Fix test --- server/command_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/command_test.go b/server/command_test.go index 1cdf288a..aa3efc6f 100644 --- a/server/command_test.go +++ b/server/command_test.go @@ -38,7 +38,7 @@ func TestCommandHelp(t *testing.T) { * |/jitsi settings [setting] [value]| - Update your user settings (see below for options) ###### Jitsi Settings: -* |/jitsi settings embedded [true/false]|: When true, Jitsi meeting is embedded as a floating window inside Mattermost. When false, Jitsi meeting opens in a new window. +* |/jitsi settings embedded [true/false]|: (Experimental) When true, Jitsi meeting is embedded as a floating window inside Mattermost. When false, Jitsi meeting opens in a new window. * |/jitsi settings naming_scheme [words/uuid/mattermost/ask]|: Select how meeting names are generated with one of these options: * |words|: Random English words in title case (e.g. PlayfulDragonsObserveCuriously) * |uuid|: UUID (universally unique identifier) From 7a250d3a645bf0d09f240bb239cc21e9ad99babb Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Mon, 29 Jun 2020 14:41:57 +0200 Subject: [PATCH 5/5] Remove empty line --- assets/i18n/active.de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/i18n/active.de.json b/assets/i18n/active.de.json index 89ef5af5..1a3ec63c 100644 --- a/assets/i18n/active.de.json +++ b/assets/i18n/active.de.json @@ -95,4 +95,4 @@ "hash": "sha1-7726587ccfee9bb7539aad458c154f8be3d95dcd", "other": "{{.MeetingType}}: [{{.MeetingID}}]({{.MeetingURL}})\n\n[Tritt Meeting bei({{.MeetingURL}})" } -} +} \ No newline at end of file