From 502aa2cde390a347f6f90a437dc44e107da7b02b Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Wed, 16 Feb 2022 08:41:51 +0100 Subject: [PATCH] Maintenance: Improved translatable source string. --- app/controllers/form_controller.rb | 2 +- .../integration/exchange_controller.rb | 4 ++-- app/models/core_workflow/result.rb | 4 ++-- .../public/_top_banner.html.erb | 3 +-- i18n/zammad.pot | 22 +++++++++---------- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb index 98abd5efd..1ebc02253 100644 --- a/app/controllers/form_controller.rb +++ b/app/controllers/form_controller.rb @@ -224,7 +224,7 @@ class FormController < ApplicationController def fingerprint_exists? return true if params[:fingerprint].present? && params[:fingerprint].length > 30 - Rails.logger.info 'No fingerprint given!' + Rails.logger.info "The required parameter 'fingerprint' is missing or invalid." raise Exceptions::Forbidden end end diff --git a/app/controllers/integration/exchange_controller.rb b/app/controllers/integration/exchange_controller.rb index d18aea3ba..07dfe9a51 100644 --- a/app/controllers/integration/exchange_controller.rb +++ b/app/controllers/integration/exchange_controller.rb @@ -30,7 +30,7 @@ class Integration::ExchangeController < ApplicationController Sequencer.process('Import::Exchange::AvailableFolders', parameters: { ews_config: ews_config }) .tap do |res| - raise __('No folders found for given user credentials.') if res[:folders].blank? + raise __('No folders were found for the given user credentials.') if res[:folders].blank? end end end @@ -43,7 +43,7 @@ class Integration::ExchangeController < ApplicationController parameters: { ews_folder_ids: params[:folders], ews_config: ews_config }) .tap do |res| - raise __('No entries found in selected folder(s).') if res[:attributes].blank? + raise __('No entries were found in the selected folder(s).') if res[:attributes].blank? end end end diff --git a/app/models/core_workflow/result.rb b/app/models/core_workflow/result.rb index 046f00f74..474a9f7b6 100644 --- a/app/models/core_workflow/result.rb +++ b/app/models/core_workflow/result.rb @@ -6,8 +6,8 @@ class CoreWorkflow::Result attr_accessor :payload, :user, :assets, :assets_in_result, :result, :rerun def initialize(payload:, user:, assets: {}, assets_in_result: true, result: {}) - raise ArgumentError, __('No payload->class_name given!') if !payload['class_name'] - raise ArgumentError, __('No payload->screen given!') if !payload['screen'] + raise ArgumentError, __("The required parameter 'payload->class_name' is missing.") if !payload['class_name'] + raise ArgumentError, __("The required parmeter 'payload->screen' is missing.") if !payload['screen'] @payload = payload @user = user diff --git a/app/views/knowledge_base/public/_top_banner.html.erb b/app/views/knowledge_base/public/_top_banner.html.erb index 3d7404a15..f8821b78c 100644 --- a/app/views/knowledge_base/public/_top_banner.html.erb +++ b/app/views/knowledge_base/public/_top_banner.html.erb @@ -4,7 +4,7 @@ <%= zt 'This page is invisible to the public.' if !object.visible? %> <% if object.kind_of?(CanBePublished) && object.published_at.present? && object.published_at > Time.current %> - <%= zt 'Will be published on ' %> + <%= zt 'Will be published on' %> <%= time_tag object.published_at %> <% end %> @@ -13,4 +13,3 @@ <%= link_to zt(edit_kb_link_label(object)), build_kb_link(object), class: 'topbar-btn', target: :_blank %> - diff --git a/i18n/zammad.pot b/i18n/zammad.pot index 3c6f36976..bf9e3b703 100644 --- a/i18n/zammad.pot +++ b/i18n/zammad.pot @@ -6364,7 +6364,7 @@ msgid "No email!" msgstr "" #: app/controllers/integration/exchange_controller.rb -msgid "No entries found in selected folder(s)." +msgid "No entries were found in the selected folder(s)." msgstr "" #: app/assets/javascripts/app/controllers/_ui_element/_application_selector.coffee @@ -6373,7 +6373,7 @@ msgid "No filter." msgstr "" #: app/controllers/integration/exchange_controller.rb -msgid "No folders found for given user credentials." +msgid "No folders were found for the given user credentials." msgstr "" #: app/assets/javascripts/app/controllers/ticket_zoom/sidebar_git_issue.coffee @@ -6388,14 +6388,6 @@ msgstr "" msgid "No oauth_token_secret param!" msgstr "" -#: app/models/core_workflow/result.rb -msgid "No payload->class_name given!" -msgstr "" - -#: app/models/core_workflow/result.rb -msgid "No payload->screen given!" -msgstr "" - #: app/assets/javascripts/app/views/settings/proxy.jst.eco #: db/seeds/settings.rb msgid "No proxy for the following hosts." @@ -8929,10 +8921,18 @@ msgstr "" msgid "The required parameter 'id' is missing." msgstr "" +#: app/models/core_workflow/result.rb +msgid "The required parameter 'payload->class_name' is missing." +msgstr "" + #: app/controllers/users_controller.rb msgid "The required parameter 'signup' is missing." msgstr "" +#: app/models/core_workflow/result.rb +msgid "The required parmeter 'payload->screen' is missing." +msgstr "" + #: app/controllers/users_controller.rb msgid "The resized image is invalid." msgstr "" @@ -10275,7 +10275,7 @@ msgid "Will be published" msgstr "" #: app/views/knowledge_base/public/_top_banner.html.erb -msgid "Will be published on " +msgid "Will be published on" msgstr "" #: db/seeds/settings.rb