From 442c3fb320cd9035a01751a0b95cf6f8ef4e167f Mon Sep 17 00:00:00 2001 From: Alexander Meindl Date: Sat, 25 Jan 2020 11:08:38 +0100 Subject: [PATCH] #53 add legend to fieldset. Remove comments in fr.yml to have same line amount (for easier administration of strings) --- app/views/messenger_settings/_show.html.slim | 5 +++-- app/views/settings/_messenger_settings.html.slim | 5 +++-- config/locales/de.yml | 1 + config/locales/en.yml | 1 + config/locales/fr.yml | 7 +------ config/locales/ja.yml | 1 + 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/messenger_settings/_show.html.slim b/app/views/messenger_settings/_show.html.slim index ba63e2d..e21cdcd 100644 --- a/app/views/messenger_settings/_show.html.slim +++ b/app/views/messenger_settings/_show.html.slim @@ -8,6 +8,7 @@ class: 'tabular' do |f| fieldset#messenger_settings.box.tabular + legend = l(:label_messenger_outgoing_webhook) - if User.current.admin? .contextual = link_to l(:label_administration), plugin_settings_path(id: 'redmine_messenger'), class: 'icon icon-settings' @@ -48,7 +49,7 @@ - if RedmineMessenger::REDMINE_DB_SUPPORT && User.current.allowed_to?(:view_db_entries, @project) fieldset#messenger_settings.box.tabular - legend = l(:label_db_entry_plural) + legend = l(:field_db_entries) .info = t(:messenger_db_intro) br = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_db } @@ -66,7 +67,7 @@ - if Redmine::Plugin.installed?('redmine_passwords') && User.current.allowed_to?(:view_passwords, @project) fieldset#messenger_settings.box.tabular - legend = l(:label_password_plural) + legend = l(:field_passwords) .info = t(:messenger_passwords_intro) br = render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_password } diff --git a/app/views/settings/_messenger_settings.html.slim b/app/views/settings/_messenger_settings.html.slim index 6742cab..7396c73 100644 --- a/app/views/settings/_messenger_settings.html.slim +++ b/app/views/settings/_messenger_settings.html.slim @@ -2,6 +2,7 @@ br fieldset#messenger_settings.box.tabular + legend = l(:label_messenger_outgoing_webhook) p = content_tag(:label, l(:label_settings_messenger_url)) = text_field_tag('settings[messenger_url]', @settings[:messenger_url], size: 60, placeholder: 'https://webhook.url') @@ -64,7 +65,7 @@ fieldset#messenger_settings.box.tabular - if RedmineMessenger::REDMINE_DB_SUPPORT fieldset#messenger_settings.box.tabular - legend = l(:label_db_entry_plural) + legend = l(:field_db_entries) .info = t(:messenger_db_intro) br p @@ -94,7 +95,7 @@ fieldset#messenger_settings.box.tabular - if Redmine::Plugin.installed?('redmine_passwords') fieldset#messenger_settings.box.tabular - legend = l(:label_password_plural) + legend = l(:field_passwords) .info = t(:messenger_passwords_intro) br p diff --git a/config/locales/de.yml b/config/locales/de.yml index 1e6b549..a731723 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -9,6 +9,7 @@ de: label_messenger_default_not_visible: Standardeinstellung wird aus Sicherheitsgründen nicht angezeigt label_messenger_issue_created: "[%{project_url}] Ticket %{url} erstellt von *%{user}*" label_messenger_issue_updated: "[%{project_url}] Ticket %{url} aktualisiert von *%{user}*" + label_messenger_outgoing_webhook: Ausgehender Webhook label_messenger_password_created: "[%{project_url}] Kennwort %{url} erstellt von *%{user}*" label_messenger_password_updated: "[%{project_url}] Kennwort %{url} aktualisiert von *%{user}*" label_messenger_project_text_field_info: Leer lassen für Systemstandard. diff --git a/config/locales/en.yml b/config/locales/en.yml index 3c742c9..84b2b80 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -9,6 +9,7 @@ en: label_messenger_default_not_visible: Default setting is not visible for security reasons label_messenger_issue_created: "[%{project_url}] Issue %{url} created by *%{user}*" label_messenger_issue_updated: "[%{project_url}] Issue %{url} updated by *%{user}*" + label_messenger_outgoing_webhook: Outgoing Webhook label_messenger_password_created: "[%{project_url}] Kennwort %{url} created by *%{user}*" label_messenger_password_updated: "[%{project_url}] Kennwort %{url} updated by *%{user}*" label_messenger_project_text_field_info: Leave it blank for system default. diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 991f613..b2deb81 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1,10 +1,4 @@ # French strings -########################################################################## -# Translation by Zer00CooL - www.visionduweb.fr # -# Created for redmine_messenger # -# Tested and optimized with Redmine and Slack for lecannabiste.com media # -# Create 04/2019 -- Update 01/2020 # -########################################################################## fr: default_mentionsl_info: Personnes à notifier par défaut, séparées par des virgules (@all, @here) error_messenger_invalid_url: n'est pas une URL valide @@ -15,6 +9,7 @@ fr: label_messenger_default_not_visible: Le paramètre par défaut n'est pas visible pour des raisons de sécurité label_messenger_issue_created: "[%{project_url}] Ticket %{url} créé par *%{user}*" label_messenger_issue_updated: "[%{project_url}] Ticket %{url} mis à jour par *%{user}*" + label_messenger_outgoing_webhook: Outgoing Webhook label_messenger_password_created: "[%{project_url}] Mot de passe %{url} créé par *%{user}*" label_messenger_password_updated: "[%{project_url}] Mot de passe %{url} mis à jour par *%{user}*" label_messenger_project_text_field_info: Laissez ce champ vide pour le système par défaut. diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 6f0b942..7954355 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -9,6 +9,7 @@ ja: label_messenger_default_not_visible: デフォルトの設定はセキュリティ上の理由により表示されません。 label_messenger_issue_created: "[%{project_url}] チケット %{url} が *%{user}* によって作成されました。" label_messenger_issue_updated: "[%{project_url}] チケット %{url} が *%{user}* によって更新されました。" + label_messenger_outgoing_webhook: Outgoing Webhook label_messenger_password_created: "[%{project_url}] Kennwort %{url} created by *%{user}*" label_messenger_password_updated: "[%{project_url}] Kennwort %{url} updated by *%{user}*" label_messenger_project_text_field_info: デフォルトの設定を使う場合空欄にしてください。