From 29c9d3546b0c9c5dfce6364b4701b6b1bdb7283c Mon Sep 17 00:00:00 2001 From: Denny Bresch Date: Mon, 12 Aug 2019 09:49:48 +0200 Subject: [PATCH] Fixes obsolete texts or add translations. Fixes #813 --- .../_application_controller_generic.coffee | 2 +- .../app/controllers/_channel/telegram.coffee | 6 ++++-- .../app/controllers/translation.coffee | 4 ++-- .../app/controllers/widget/maintenance.coffee | 16 ++++++++-------- app/assets/javascripts/app/models/macro.coffee | 3 ++- .../javascripts/app/models/organization.coffee | 2 +- .../javascripts/app/models/overview.coffee | 2 +- .../javascripts/app/models/text_module.coffee | 2 +- app/assets/javascripts/app/models/trigger.coffee | 11 +++++++---- app/assets/javascripts/app/models/user.coffee | 6 +++--- .../app/views/facebook/account_edit.jst.eco | 4 ++-- .../app/views/profile/out_of_office.jst.eco | 2 +- .../app/views/telegram/bot_add.jst.eco | 2 +- .../app/views/telegram/bot_edit.jst.eco | 2 +- .../app/views/twitter/account_edit.jst.eco | 4 ++-- 15 files changed, 37 insertions(+), 31 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee index e75522433..fd9adb86d 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee @@ -243,7 +243,7 @@ class App.ControllerGenericDescription extends App.ControllerModal head: 'Description' content: => - marked(@description) + marked(App.i18n.translateContent(@description)) onSubmit: => @close() diff --git a/app/assets/javascripts/app/controllers/_channel/telegram.coffee b/app/assets/javascripts/app/controllers/_channel/telegram.coffee index 39992ae48..24918f3c3 100644 --- a/app/assets/javascripts/app/controllers/_channel/telegram.coffee +++ b/app/assets/javascripts/app/controllers/_channel/telegram.coffee @@ -149,7 +149,8 @@ class BotAdd extends App.ControllerModal error: (xhr) => data = JSON.parse(xhr.responseText) @formEnable(e) - @el.find('.alert').removeClass('hidden').text(data.error || 'Unable to save Bot.') + error_message = App.i18n.translateContent(data.error || 'Unable to save Bot.') + @el.find('.alert').removeClass('hidden').text(error_message) ) class BotEdit extends App.ControllerModal @@ -196,7 +197,8 @@ class BotEdit extends App.ControllerModal error: (xhr) => data = JSON.parse(xhr.responseText) @formEnable(e) - @el.find('.alert').removeClass('hidden').text(data.error || 'Unable to save changes.') + error_message = App.i18n.translateContent(data.error || 'Unable to save changes.') + @el.find('.alert').removeClass('hidden').text(error_message) ) App.Config.set('Telegram', { prio: 5100, name: 'Telegram', parent: '#channels', target: '#channels/telegram', controller: Index, permission: ['admin.channel_telegram'] }, 'NavBarAdmin') diff --git a/app/assets/javascripts/app/controllers/translation.coffee b/app/assets/javascripts/app/controllers/translation.coffee index 9745c5970..f3e6adf2f 100644 --- a/app/assets/javascripts/app/controllers/translation.coffee +++ b/app/assets/javascripts/app/controllers/translation.coffee @@ -153,8 +153,8 @@ class Index extends App.ControllerSubContent syncChanges: => @loader = new App.ControllerModalLoading( - head: 'Get latest translations' - message: 'Getting latest translations from i18n.zammad.com' + head: App.i18n.translateContent('Get latest translations') + message: App.i18n.translateContent('Getting latest translations from i18n.zammad.com') container: @el.closest('.content') ) hide = => diff --git a/app/assets/javascripts/app/controllers/widget/maintenance.coffee b/app/assets/javascripts/app/controllers/widget/maintenance.coffee index 02b94a158..0f90564ab 100644 --- a/app/assets/javascripts/app/controllers/widget/maintenance.coffee +++ b/app/assets/javascripts/app/controllers/widget/maintenance.coffee @@ -48,8 +48,8 @@ class Widget extends App.Controller maintanaceRestartAuto: (data) => return if @messageRestartAuto @messageRestartAuto = new App.SessionMessage( - head: 'Zammad is restarting...' - message: 'Some system settings have changed, Zammad is restarting. Please wait until Zammad is back again.' + head: App.i18n.translateContent('Zammad is restarting...') + message: App.i18n.translateContent('Some system settings have changed, Zammad is restarting. Please wait until Zammad is back again.') keyboard: false backdrop: false buttonClose: false @@ -64,8 +64,8 @@ class Widget extends App.Controller maintanaceRestartManual: (data) => return if @messageRestartManual @messageRestartManual = new App.SessionMessage( - head: 'Zammad need a restart!' - message: 'Some system settings have changed, please restart all Zammad processes! If you want to do this automatically, set environment variable APP___RESTART___CMD="/path/to/your___app___script.sh restart".' + head: App.i18n.translateContent('Zammad need a restart!') + message: App.i18n.translateContent('Some system settings have changed, please restart all Zammad processes! If you want to do this automatically, set environment variable APP___RESTART___CMD="/path/to/your___app___script.sh restart".') keyboard: false backdrop: false buttonClose: false @@ -79,8 +79,8 @@ class Widget extends App.Controller maintanaceConfigChanged: (data) => return if @messageConfigChanged @messageConfigChanged = new App.SessionMessage( - head: 'Config has changed' - message: 'The configuration of Zammad has changed, please reload your browser.' + head: App.i18n.translateContent('Config has changed') + message: App.i18n.translateContent('The configuration of Zammad has changed, please reload your browser.') keyboard: false backdrop: true buttonClose: false @@ -99,8 +99,8 @@ class Widget extends App.Controller return if localAppVersion[1] isnt 'true' message = => @messageAppVersion = new App.SessionMessage( - head: 'New Version' - message: 'A new version of Zammad is available, please reload your browser.' + head: App.i18n.translateContent('New Version') + message: App.i18n.translateContent('A new version of Zammad is available, please reload your browser.') keyboard: false backdrop: true buttonClose: false diff --git a/app/assets/javascripts/app/models/macro.coffee b/app/assets/javascripts/app/models/macro.coffee index 28fa67d62..882144594 100644 --- a/app/assets/javascripts/app/models/macro.coffee +++ b/app/assets/javascripts/app/models/macro.coffee @@ -55,6 +55,7 @@ class App.Macro extends App.Model ] @description = ''' -Macros are.... +Macros make it easy to automate common, multi-step tasks within Zammad. +You can use macros in Zammad to automate recurring sequences, saving time (and nerves). This allows a combined sequence of actions on the ticket to be executed with just one click. ''' diff --git a/app/assets/javascripts/app/models/organization.coffee b/app/assets/javascripts/app/models/organization.coffee index f9205c458..b01941f29 100644 --- a/app/assets/javascripts/app/models/organization.coffee +++ b/app/assets/javascripts/app/models/organization.coffee @@ -20,7 +20,7 @@ class App.Organization extends App.Model Using **Organisations** you can **group** customers. This has among others two important benefits: 1. As an **Agent** you do not only have an overview of the open tickets for one person but an **overview over their whole organisation**. -2. As a **Customer** you can also check the **Tickets which your colleagues created** and modify their tickets (if your organization is set to "shared", which can be defined per organization)). +2. As a **Customer** you can also check the **Tickets which your colleagues created** and modify their tickets (if your organization is set to "shared", which can be defined per organization). ''' uiUrl: -> diff --git a/app/assets/javascripts/app/models/overview.coffee b/app/assets/javascripts/app/models/overview.coffee index ed109c5f2..f3020035c 100644 --- a/app/assets/javascripts/app/models/overview.coffee +++ b/app/assets/javascripts/app/models/overview.coffee @@ -81,7 +81,7 @@ class App.Overview extends App.Model @description = ''' You can create **overviews** for your agents and your customers. These could for instance serve as a sort of work list for items for which your agents would work. -You can also create overvies and limit them to specific agents or to groups of agents. +You can also create overviews and limit them to specific agents or to groups of agents. ''' uiUrl: -> diff --git a/app/assets/javascripts/app/models/text_module.coffee b/app/assets/javascripts/app/models/text_module.coffee index 5bb1f223d..02e32425b 100644 --- a/app/assets/javascripts/app/models/text_module.coffee +++ b/app/assets/javascripts/app/models/text_module.coffee @@ -38,7 +38,7 @@ class App.TextModule extends App.Model # coffeelint: disable=no_interpolation_in_single_quotes @description = ''' -Create Text Modules to **spend less time writing responses**. TextModules can include smart variables like the users name or email address. +Create Text Modules to **spend less time writing responses**. Text Modules can include smart variables like the users name or email address. Examples of snippets are: diff --git a/app/assets/javascripts/app/models/trigger.coffee b/app/assets/javascripts/app/models/trigger.coffee index ca732eaf2..d270db004 100644 --- a/app/assets/javascripts/app/models/trigger.coffee +++ b/app/assets/javascripts/app/models/trigger.coffee @@ -14,9 +14,12 @@ class App.Trigger extends App.Model @configure_overview = [ 'name', ] - ### - @description = ''' -Trigger are.... + @description = ''' +Every time a customer creates a new ticket, they automatically receive a confirmation email to assure them that their issue has been submitted successfully. This behavior is built into Zammad, but it’s also highly customizable, and you can set up other automated actions just like it. + +Maybe you want to set a higher priority on any ticket with the word “urgent” in the title. Maybe you want to avoid sending auto-reply emails to customers from certain organizations. Maybe you want mark a ticket as “pending” whenever someone adds an internal note to a ticket. + +Whatever it is, you can do it with triggers: actions that watch tickets for certain changes, and then fire off whenever those changes occur. ''' - ### + diff --git a/app/assets/javascripts/app/models/user.coffee b/app/assets/javascripts/app/models/user.coffee index f4ebc5192..3281a0f02 100644 --- a/app/assets/javascripts/app/models/user.coffee +++ b/app/assets/javascripts/app/models/user.coffee @@ -288,11 +288,11 @@ class App.User extends App.Model @outOfOfficeTextPlaceholder: -> today = new Date() - outOfOfficeText = 'Christmas holiday' + outOfOfficeText = App.i18n.translateContent('Christmas holiday') if today.getMonth() < 3 - outOfOfficeText = 'Easter holiday' + outOfOfficeText = App.i18n.translateContent('Easter holiday') else if today.getMonth() < 9 - outOfOfficeText = 'Summer holiday' + outOfOfficeText = App.i18n.translateContent('Summer holiday') outOfOfficeText outOfOfficeText: -> diff --git a/app/assets/javascripts/app/views/facebook/account_edit.jst.eco b/app/assets/javascripts/app/views/facebook/account_edit.jst.eco index 9981427a1..ea0b72384 100644 --- a/app/assets/javascripts/app/views/facebook/account_edit.jst.eco +++ b/app/assets/javascripts/app/views/facebook/account_edit.jst.eco @@ -2,7 +2,7 @@

<%- @T('Wall') %>

-

<%- @T('Choose which group %s will get added to.', 'wall postings') %>

+

<%- @T('Choose the group in which wall postings will get added to.') %>

<%= @channel.options.user.name %>

@@ -11,7 +11,7 @@

<%- @T('Pages') %>

-

<%- @T('Choose which group %s will get added to.', 'page postings') %>

+

<%- @T('Choose the group in which page postings will get added to.') %>

<% if @channel.options.pages: %> <% for page in @channel.options.pages: %> diff --git a/app/assets/javascripts/app/views/profile/out_of_office.jst.eco b/app/assets/javascripts/app/views/profile/out_of_office.jst.eco index e2ca357d2..528a104b3 100644 --- a/app/assets/javascripts/app/views/profile/out_of_office.jst.eco +++ b/app/assets/javascripts/app/views/profile/out_of_office.jst.eco @@ -11,7 +11,7 @@ <%- @Icon('status', 'ok inline') %> <% else: %> <%- @Icon('status', 'error inline') %> - <% end %> + <% end %>
diff --git a/app/assets/javascripts/app/views/telegram/bot_add.jst.eco b/app/assets/javascripts/app/views/telegram/bot_add.jst.eco index cb7e2d9d5..4812210d4 100644 --- a/app/assets/javascripts/app/views/telegram/bot_add.jst.eco +++ b/app/assets/javascripts/app/views/telegram/bot_add.jst.eco @@ -23,7 +23,7 @@
- +
diff --git a/app/assets/javascripts/app/views/telegram/bot_edit.jst.eco b/app/assets/javascripts/app/views/telegram/bot_edit.jst.eco index 07b6de1c2..fe6468d9a 100644 --- a/app/assets/javascripts/app/views/telegram/bot_edit.jst.eco +++ b/app/assets/javascripts/app/views/telegram/bot_edit.jst.eco @@ -20,7 +20,7 @@
- +
diff --git a/app/assets/javascripts/app/views/twitter/account_edit.jst.eco b/app/assets/javascripts/app/views/twitter/account_edit.jst.eco index 51080d93a..123c31119 100644 --- a/app/assets/javascripts/app/views/twitter/account_edit.jst.eco +++ b/app/assets/javascripts/app/views/twitter/account_edit.jst.eco @@ -24,11 +24,11 @@

<%- @T('Mentions Group') %>

-

<%- @T('Choose which group %s will get added to.', 'mentions') %>

+

<%- @T('Choose the group in which mentions will get added to.') %>

<%- @T('Direct Messages Group') %>

-

<%- @T('Choose which group %s will get added to.', 'direct messages') %>

+

<%- @T('Choose the group in which direct messages will get added to.') %>

<%- @T('Retweets') %>