diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee index bc8987d6a..20e8c49ef 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee @@ -97,15 +97,15 @@ class App.TicketZoomArticleActions extends App.Controller recipientUsed = {} for recipient in recipients if !_.isEmpty(recipient.address) - localRecipientAddeess = recipient.address.toString().toLowerCase() - if !recipientUsed[localRecipientAddeess] - recipientUsed[localRecipientAddeess] = true - localAddess = false + localRecipientAddress = recipient.address.toString().toLowerCase() + if !recipientUsed[localRecipientAddress] + recipientUsed[localRecipientAddress] = true + localAddress = false for address in localAddresses - if localRecipientAddeess is address.email.toString().toLowerCase() - recipientUsed[localRecipientAddeess] = true - localAddess = true - if !localAddess + if localRecipientAddress is address.email.toString().toLowerCase() + recipientUsed[localRecipientAddress] = true + localAddress = true + if !localAddress forgeinRecipients.push recipient # check if reply all is neede @@ -327,12 +327,12 @@ class App.TicketZoomArticleActions extends App.Controller for recipient in recipients if !_.isEmpty(recipient.address) - # check if addess is not local - localAddess = false + # check if address is not local + localAddress = false for address in localAddresses if !_.isEmpty(recipient.address) && recipient.address.toString().toLowerCase() == address.email.toString().toLowerCase() - localAddess = true - if !localAddess + localAddress = true + if !localAddress # filter for uniq recipients if !recipientAddresses[ recipient.address.toString().toLowerCase() ] diff --git a/app/assets/javascripts/app/views/api.jst.eco b/app/assets/javascripts/app/views/api.jst.eco index de29d157c..6126a1111 100644 --- a/app/assets/javascripts/app/views/api.jst.eco +++ b/app/assets/javascripts/app/views/api.jst.eco @@ -12,7 +12,7 @@

<%- @T('Token Access') %> (HTTP Token Authentication)

-

<%- @T('Enable REST API using tokens (not username/email addeess and password). Each user need to create own access tokens in user profile.') %>

+

<%- @T('Enable REST API using tokens (not username/email address and password). Each user need to create own access tokens in user profile.') %>

<%- @T('Example') %>:

@@ -74,4 +74,4 @@ OAuth URLs are: - \ No newline at end of file + diff --git a/app/models/channel/filter/sender_is_system_address.rb b/app/models/channel/filter/sender_is_system_address.rb index 87be321fe..1321edd3f 100644 --- a/app/models/channel/filter/sender_is_system_address.rb +++ b/app/models/channel/filter/sender_is_system_address.rb @@ -8,7 +8,7 @@ module Channel::Filter::SenderIsSystemAddress return if mail[ 'x-zammad-ticket-create-article-sender'.to_sym ] return if mail[ 'x-zammad-article-sender'.to_sym ] - # check if sender addesss is system + # check if sender address is system form = 'raw-from'.to_sym return if !mail[form] return if !mail[:to] diff --git a/db/seeds.rb b/db/seeds.rb index 849fabaae..4882d358f 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1579,7 +1579,7 @@ Setting.create_if_not_exists( title: 'API Token Access', name: 'api_token_access', area: 'API::Base', - description: 'Enable REST API using tokens (not username/email addeess and password). Each user need to create own access tokens in user profile.', + description: 'Enable REST API using tokens (not username/email address and password). Each user need to create own access tokens in user profile.', options: { form: [ {