From b2ecb7104387804748cdcbcbacb08724f4b50810 Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Fri, 21 Jan 2022 17:06:41 +0100 Subject: [PATCH] Maintenance: Improved translatable source strings. --- .../app/controllers/_channel/email.coffee | 2 +- .../app/controllers/_channel/facebook.coffee | 2 +- .../app/controllers/_channel/google.coffee | 2 +- .../controllers/_channel/microsoft365.coffee | 2 +- .../app/controllers/_channel/telegram.coffee | 2 +- .../app/controllers/_channel/twitter.coffee | 2 +- .../controllers/_profile/token_access.coffee | 2 +- .../app/controllers/maintenance.coffee | 2 +- .../javascripts/app/controllers/tag.coffee | 4 +-- .../app/controllers/taskbar_widget.coffee | 2 +- .../ticket_zoom/article_action/delete.coffee | 2 +- .../app/controllers/widget/template.coffee | 2 +- .../app/views/agent_ticket_view/bulk.jst.eco | 2 +- i18n/zammad.pot | 33 ++++++++----------- 14 files changed, 28 insertions(+), 33 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_channel/email.coffee b/app/assets/javascripts/app/controllers/_channel/email.coffee index fd6e67dcd..995148038 100644 --- a/app/assets/javascripts/app/controllers/_channel/email.coffee +++ b/app/assets/javascripts/app/controllers/_channel/email.coffee @@ -142,7 +142,7 @@ class ChannelEmailAccountOverview extends App.Controller e.preventDefault() id = $(e.target).closest('.action').data('id') new App.ControllerConfirm( - message: __('Sure?') + message: __('Are you sure?') callback: => @ajax( id: 'email_delete' diff --git a/app/assets/javascripts/app/controllers/_channel/facebook.coffee b/app/assets/javascripts/app/controllers/_channel/facebook.coffee index d3393c144..a431dfb0f 100644 --- a/app/assets/javascripts/app/controllers/_channel/facebook.coffee +++ b/app/assets/javascripts/app/controllers/_channel/facebook.coffee @@ -95,7 +95,7 @@ class ChannelFacebook extends App.ControllerSubContent e.preventDefault() id = $(e.target).closest('.action').data('id') new App.ControllerConfirm( - message: __('Sure?') + message: __('Are you sure?') callback: => @ajax( id: 'facebook_delete' diff --git a/app/assets/javascripts/app/controllers/_channel/google.coffee b/app/assets/javascripts/app/controllers/_channel/google.coffee index 32ac7e513..b86df4580 100644 --- a/app/assets/javascripts/app/controllers/_channel/google.coffee +++ b/app/assets/javascripts/app/controllers/_channel/google.coffee @@ -145,7 +145,7 @@ class ChannelAccountOverview extends App.ControllerSubContent e.preventDefault() id = $(e.target).closest('.action').data('id') new App.ControllerConfirm( - message: __('Sure?') + message: __('Are you sure?') callback: => @ajax( id: 'google_delete' diff --git a/app/assets/javascripts/app/controllers/_channel/microsoft365.coffee b/app/assets/javascripts/app/controllers/_channel/microsoft365.coffee index 5803fc998..596737922 100644 --- a/app/assets/javascripts/app/controllers/_channel/microsoft365.coffee +++ b/app/assets/javascripts/app/controllers/_channel/microsoft365.coffee @@ -136,7 +136,7 @@ class ChannelAccountOverview extends App.ControllerSubContent e.preventDefault() id = $(e.target).closest('.action').data('id') new App.ControllerConfirm( - message: __('Sure?') + message: __('Are you sure?') callback: => @ajax( id: 'microsoft365_delete' diff --git a/app/assets/javascripts/app/controllers/_channel/telegram.coffee b/app/assets/javascripts/app/controllers/_channel/telegram.coffee index fb954b1be..c5c6ef544 100644 --- a/app/assets/javascripts/app/controllers/_channel/telegram.coffee +++ b/app/assets/javascripts/app/controllers/_channel/telegram.coffee @@ -63,7 +63,7 @@ class ChannelTelegram extends App.ControllerSubContent e.preventDefault() id = $(e.target).closest('.action').data('id') new App.ControllerConfirm( - message: __('Sure?') + message: __('Are you sure?') callback: => @ajax( id: 'telegram_delete' diff --git a/app/assets/javascripts/app/controllers/_channel/twitter.coffee b/app/assets/javascripts/app/controllers/_channel/twitter.coffee index 2f0a90c42..756462846 100644 --- a/app/assets/javascripts/app/controllers/_channel/twitter.coffee +++ b/app/assets/javascripts/app/controllers/_channel/twitter.coffee @@ -102,7 +102,7 @@ class ChannelTwitter extends App.ControllerSubContent e.preventDefault() id = $(e.target).closest('.action').data('id') new App.ControllerConfirm( - message: __('Sure?') + message: __('Are you sure?') callback: => @ajax( id: 'twitter_delete' diff --git a/app/assets/javascripts/app/controllers/_profile/token_access.coffee b/app/assets/javascripts/app/controllers/_profile/token_access.coffee index 4b8b784fd..1c12fff2e 100644 --- a/app/assets/javascripts/app/controllers/_profile/token_access.coffee +++ b/app/assets/javascripts/app/controllers/_profile/token_access.coffee @@ -63,7 +63,7 @@ class ProfileTokenAccess extends App.ControllerSubContent ) new App.ControllerConfirm( - message: __('Sure?') + message: __('Are you sure?') callback: callback container: @el.closest('.content') ) diff --git a/app/assets/javascripts/app/controllers/maintenance.coffee b/app/assets/javascripts/app/controllers/maintenance.coffee index 923a15736..772c5d99a 100644 --- a/app/assets/javascripts/app/controllers/maintenance.coffee +++ b/app/assets/javascripts/app/controllers/maintenance.coffee @@ -52,7 +52,7 @@ class Maintenance extends App.ControllerSubContent ) if value new App.ControllerConfirm( - message: __('Sure?') + message: __('Are you sure?') callback: callback onCancel: => @modeSetting.prop('checked', false) diff --git a/app/assets/javascripts/app/controllers/tag.coffee b/app/assets/javascripts/app/controllers/tag.coffee index d807481b2..3e392a8af 100644 --- a/app/assets/javascripts/app/controllers/tag.coffee +++ b/app/assets/javascripts/app/controllers/tag.coffee @@ -130,9 +130,9 @@ class Edit extends App.ControllerModal class DestroyConfirm extends App.ControllerModal buttonClose: true buttonCancel: true - buttonSubmit: __('yes') + buttonSubmit: __('Yes') buttonClass: 'btn--danger' - head: __('Confirm') + head: __('Confirmation') small: true content: -> diff --git a/app/assets/javascripts/app/controllers/taskbar_widget.coffee b/app/assets/javascripts/app/controllers/taskbar_widget.coffee index e569bfb93..d52b3be0f 100644 --- a/app/assets/javascripts/app/controllers/taskbar_widget.coffee +++ b/app/assets/javascripts/app/controllers/taskbar_widget.coffee @@ -127,7 +127,7 @@ class Remove extends App.ControllerModal buttonCancel: true buttonSubmit: __('Discard Changes') buttonClass: 'btn--danger' - head: __('Confirm') + head: __('Confirmation') content: -> App.i18n.translateContent('Tab has changed, do you really want to close it?') diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee index 41e52b2d0..5d74abe58 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee @@ -63,7 +63,7 @@ class Delete ) new App.ControllerConfirm( - message: __('Sure?') + message: __('Are you sure?') callback: callback container: ui.el.closest('.content') ) diff --git a/app/assets/javascripts/app/controllers/widget/template.coffee b/app/assets/javascripts/app/controllers/widget/template.coffee index 2f02b9a37..6c117a791 100644 --- a/app/assets/javascripts/app/controllers/widget/template.coffee +++ b/app/assets/javascripts/app/controllers/widget/template.coffee @@ -60,7 +60,7 @@ class App.WidgetTemplate extends App.Controller return if !params['id'] template = App.Template.find(params['id']) - if confirm('Sure?') + if confirm(__('Are you sure?')) @id = false template.destroy() diff --git a/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco index ddb0da338..f4a24948b 100644 --- a/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco @@ -1,7 +1,7 @@
-
<%- @T('Confirm') %>
+
<%- @T('Confirmation') %>
diff --git a/i18n/zammad.pot b/i18n/zammad.pot index 85f15566d..68a562567 100644 --- a/i18n/zammad.pot +++ b/i18n/zammad.pot @@ -847,7 +847,17 @@ msgstr "" msgid "Are you sure you want to reload? You have unsaved changes that will get lost" msgstr "" +#: app/assets/javascripts/app/controllers/_channel/email.coffee +#: app/assets/javascripts/app/controllers/_channel/facebook.coffee +#: app/assets/javascripts/app/controllers/_channel/google.coffee +#: app/assets/javascripts/app/controllers/_channel/microsoft365.coffee +#: app/assets/javascripts/app/controllers/_channel/telegram.coffee +#: app/assets/javascripts/app/controllers/_channel/twitter.coffee +#: app/assets/javascripts/app/controllers/_profile/token_access.coffee #: app/assets/javascripts/app/controllers/data_privacy.coffee +#: app/assets/javascripts/app/controllers/maintenance.coffee +#: app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee +#: app/assets/javascripts/app/controllers/widget/template.coffee msgid "Are you sure?" msgstr "" @@ -1879,18 +1889,15 @@ msgstr "" msgid "Configure Base" msgstr "" -#: app/assets/javascripts/app/controllers/tag.coffee -#: app/assets/javascripts/app/controllers/taskbar_widget.coffee -#: app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco -msgid "Confirm" -msgstr "" - #: app/assets/javascripts/app/controllers/_plugin/keyboard_shortcuts.coffee msgid "Confirm/submit dialog" msgstr "" #: app/assets/javascripts/app/controllers/_application_controller/_modal_generic_confirm.coffee #: app/assets/javascripts/app/controllers/_application_controller/_modal_generic_destroy_confirm.coffee +#: app/assets/javascripts/app/controllers/tag.coffee +#: app/assets/javascripts/app/controllers/taskbar_widget.coffee +#: app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco msgid "Confirmation" msgstr "" @@ -8714,18 +8721,6 @@ msgstr "" msgid "Support of multilingual Knowledge Base." msgstr "" -#: app/assets/javascripts/app/controllers/_channel/email.coffee -#: app/assets/javascripts/app/controllers/_channel/facebook.coffee -#: app/assets/javascripts/app/controllers/_channel/google.coffee -#: app/assets/javascripts/app/controllers/_channel/microsoft365.coffee -#: app/assets/javascripts/app/controllers/_channel/telegram.coffee -#: app/assets/javascripts/app/controllers/_channel/twitter.coffee -#: app/assets/javascripts/app/controllers/_profile/token_access.coffee -#: app/assets/javascripts/app/controllers/maintenance.coffee -#: app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee -msgid "Sure?" -msgstr "" - #: db/seeds/schedulers.rb msgid "Sync calendars with ical feeds." msgstr "" @@ -10534,6 +10529,7 @@ msgstr "" #: app/assets/javascripts/app/controllers/_application_controller/_modal_generic_confirm.coffee #: app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee +#: app/assets/javascripts/app/controllers/tag.coffee msgid "Yes" msgstr "" @@ -11624,7 +11620,6 @@ msgid "within next (relative)" msgstr "" #: app/assets/javascripts/app/controllers/_ui_element/boolean.coffee -#: app/assets/javascripts/app/controllers/tag.coffee #: app/assets/javascripts/app/views/object_manager/attribute/boolean.jst.eco msgid "yes" msgstr ""