Browse Source

Maintenance: Improved translatable source strings.

Martin Gruner 3 years ago
parent
commit
104e2b415e

+ 3 - 1
app/assets/javascripts/app/controllers/_application_controller/_modal.coffee

@@ -59,7 +59,9 @@ class App.ControllerModal extends App.Controller
     false
 
   content: ->
-    __('You need to implement a one @content()!')
+    # coffeelint: disable=detect_translatable_string
+    "You need to implement a '@content()' method!"
+    # coffeelint: enable=detect_translatable_string
 
   update: =>
     if @message

+ 1 - 1
app/assets/javascripts/app/controllers/_application_controller/generic_edit.coffee

@@ -51,5 +51,5 @@ class App.ControllerGenericEdit extends App.ControllerModal
         App[ ui.genericObject ].fetch(id: @id)
         ui.log 'errors'
         ui.formEnable(e)
-        ui.controller.showAlert(details.error_human || details.error || __('Unable to update object!'))
+        ui.controller.showAlert(details.error_human || details.error || __('The object could not be updated.'))
     )

+ 1 - 1
app/assets/javascripts/app/controllers/_application_controller/generic_new.coffee

@@ -51,5 +51,5 @@ class App.ControllerGenericNew extends App.ControllerModal
       fail: (settings, details) ->
         ui.log 'errors', details
         ui.formEnable(e)
-        ui.controller.showAlert(details.error_human || details.error || __('Unable to create object!'))
+        ui.controller.showAlert(details.error_human || details.error || __('The object could not be created.'))
     )

+ 3 - 3
app/assets/javascripts/app/controllers/_channel/_email_signature.coffee

@@ -12,9 +12,9 @@ class App.ChannelEmailSignature extends App.Controller
     template = $( '<div><div class="overview"></div><a data-type="new" class="btn btn--success">' + App.i18n.translateContent('New') + '</a></div>' )
 
     description = __('''
-You can define different signatures for each group. So you can have different email signatures for different departments.
+You can define different signatures for each group, which allows you to use a different signature for every department.
 
-Once you have created a signature here, you need also to edit the groups where you want to use it.
+Once you have created a signature here, you will also need to edit the groups where you want to use it.
 ''')
 
     new App.ControllerTable(
@@ -90,5 +90,5 @@ class ChannelEmailSignatureEdit extends App.ControllerModal
       fail: (settings, details) =>
         @log 'errors', details
         @formEnable(e)
-        @form.showAlert(details.error_human || details.error || __('Unable to create object!'))
+        @form.showAlert(details.error_human || details.error || __('The object could not be created.'))
     )

+ 2 - 2
app/assets/javascripts/app/controllers/_channel/email.coffee

@@ -298,7 +298,7 @@ class ChannelEmailEdit extends App.ControllerModal
       error: (xhr) =>
         data = JSON.parse(xhr.responseText)
         @formEnable(e)
-        @el.find('.alert').removeClass('hidden').text(data.error || __('Unable to save changes.'))
+        @el.find('.alert').removeClass('hidden').text(data.error || __('The changes could not be saved.'))
     )
 
 class ChannelEmailAccountWizard extends App.ControllerWizardModal
@@ -605,7 +605,7 @@ class ChannelEmailAccountWizard extends App.ControllerWizardModal
     )
 
   probeInboundMessagesFound: (data, verify) =>
-    message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. Zammad will move it all from your mailbox into Zammad.', data.content_messages)
+    message = App.i18n.translateContent('We have already found %s email(s) in your mailbox. We will move them all from your mailbox into Zammad.', data.content_messages)
     @$('.js-inbound-acknowledge .js-messageFound').html(message)
 
     if !verify

+ 2 - 2
app/assets/javascripts/app/controllers/_channel/facebook.coffee

@@ -178,7 +178,7 @@ class AppConfig extends App.ControllerModal
               @isChanged = true
               @close()
             fail: =>
-              @el.find('.alert').removeClass('hidden').text(__('Unable to create entry.'))
+              @el.find('.alert').removeClass('hidden').text(__('The entry could not be created.'))
           )
           return
         @formEnable(e)
@@ -242,7 +242,7 @@ class AccountEdit extends App.ControllerModal
       error: (xhr) =>
         data = JSON.parse(xhr.responseText)
         @formEnable(e)
-        @el.find('.alert').removeClass('hidden').text(data.error || __('Unable to save changes.'))
+        @el.find('.alert').removeClass('hidden').text(data.error || __('The changes could not be saved.'))
     )
 
 App.Config.set('Facebook', { prio: 5100, name: __('Facebook'), parent: '#channels', target: '#channels/facebook', controller: ChannelFacebook, permission: ['admin.channel_facebook'] }, 'NavBarAdmin')

+ 3 - 3
app/assets/javascripts/app/controllers/_channel/google.coffee

@@ -323,7 +323,7 @@ class ChannelInboundEdit extends App.ControllerModal
         details = xhr.responseJSON || {}
         @notify
           type:    'error'
-          msg:     App.i18n.translateContent(details.error_human || details.error || __('Unable to save changes.'))
+          msg:     App.i18n.translateContent(details.error_human || details.error || __('The changes could not be saved.'))
           timeout: 6000
     )
 
@@ -375,7 +375,7 @@ class ChannelGroupEdit extends App.ControllerModal
       error: (xhr) =>
         data = JSON.parse(xhr.responseText)
         @formEnable(e)
-        @el.find('.alert').removeClass('hidden').text(data.error || __('Unable to save changes.'))
+        @el.find('.alert').removeClass('hidden').text(data.error || __('The changes could not be saved.'))
     )
 
 class AppConfig extends App.ControllerModal
@@ -421,7 +421,7 @@ class AppConfig extends App.ControllerModal
               @isChanged = true
               @close()
             fail: =>
-              @el.find('.alert').removeClass('hidden').text(__('Unable to create entry.'))
+              @el.find('.alert').removeClass('hidden').text(__('The entry could not be created.'))
           )
           return
         @formEnable(e)

+ 3 - 3
app/assets/javascripts/app/controllers/_channel/microsoft365.coffee

@@ -314,7 +314,7 @@ class ChannelInboundEdit extends App.ControllerModal
         details = xhr.responseJSON || {}
         @notify
           type:    'error'
-          msg:     App.i18n.translateContent(details.error_human || details.error || __('Unable to save changes.'))
+          msg:     App.i18n.translateContent(details.error_human || details.error || __('The changes could not be saved.'))
           timeout: 6000
     )
 
@@ -366,7 +366,7 @@ class ChannelGroupEdit extends App.ControllerModal
       error: (xhr) =>
         data = JSON.parse(xhr.responseText)
         @formEnable(e)
-        @el.find('.alert').removeClass('hidden').text(data.error || __('Unable to save changes.'))
+        @el.find('.alert').removeClass('hidden').text(data.error || __('The changes could not be saved.'))
     )
 
 class AppConfig extends App.ControllerModal
@@ -412,7 +412,7 @@ class AppConfig extends App.ControllerModal
               @isChanged = true
               @close()
             fail: =>
-              @el.find('.alert').removeClass('hidden').text(__('Unable to create entry.'))
+              @el.find('.alert').removeClass('hidden').text(__('The entry could not be created.'))
           )
           return
         @formEnable(e)

+ 2 - 2
app/assets/javascripts/app/controllers/_channel/sms.coffee

@@ -262,7 +262,7 @@ class ChannelSmsAccount extends App.ControllerModal
       fail: (settings, details) ->
         ui.log 'errors', details
         ui.formEnable(e)
-        ui.showAlert(details.error_human || details.error || __('Unable to update object!'))
+        ui.showAlert(details.error_human || details.error || __('The object could not be updated.'))
     )
 
   onTest: (e) ->
@@ -376,7 +376,7 @@ class ChannelSmsNotification extends App.ControllerModal
       fail: (settings, details) ->
         ui.log 'errors', details
         ui.formEnable(e)
-        ui.showAlert(details.error_human || details.error || __('Unable to update object!'))
+        ui.showAlert(details.error_human || details.error || __('The object could not be updated.'))
     )
 
   onTest: (e) ->

+ 1 - 1
app/assets/javascripts/app/controllers/_channel/telegram.coffee

@@ -197,7 +197,7 @@ class BotEdit extends App.ControllerModal
       error: (xhr) =>
         data = JSON.parse(xhr.responseText)
         @formEnable(e)
-        error_message = App.i18n.translateContent(data.error || __('Unable to save changes.'))
+        error_message = App.i18n.translateContent(data.error || __('The changes could not be saved.'))
         @el.find('.alert').removeClass('hidden').text(error_message)
     )
 

Some files were not shown because too many files changed in this diff