Merge pull request #470 from digineo/spelling-mistakes

Fix spelling mistakes. Thanks to @corny !
This commit is contained in:
Martin Edenhofer 2016-11-29 10:57:42 +01:00 committed by GitHub
commit 3cdb3e3ca5
4 changed files with 16 additions and 16 deletions

View file

@ -97,15 +97,15 @@ class App.TicketZoomArticleActions extends App.Controller
recipientUsed = {} recipientUsed = {}
for recipient in recipients for recipient in recipients
if !_.isEmpty(recipient.address) if !_.isEmpty(recipient.address)
localRecipientAddeess = recipient.address.toString().toLowerCase() localRecipientAddress = recipient.address.toString().toLowerCase()
if !recipientUsed[localRecipientAddeess] if !recipientUsed[localRecipientAddress]
recipientUsed[localRecipientAddeess] = true recipientUsed[localRecipientAddress] = true
localAddess = false localAddress = false
for address in localAddresses for address in localAddresses
if localRecipientAddeess is address.email.toString().toLowerCase() if localRecipientAddress is address.email.toString().toLowerCase()
recipientUsed[localRecipientAddeess] = true recipientUsed[localRecipientAddress] = true
localAddess = true localAddress = true
if !localAddess if !localAddress
forgeinRecipients.push recipient forgeinRecipients.push recipient
# check if reply all is neede # check if reply all is neede
@ -327,12 +327,12 @@ class App.TicketZoomArticleActions extends App.Controller
for recipient in recipients for recipient in recipients
if !_.isEmpty(recipient.address) if !_.isEmpty(recipient.address)
# check if addess is not local # check if address is not local
localAddess = false localAddress = false
for address in localAddresses for address in localAddresses
if !_.isEmpty(recipient.address) && recipient.address.toString().toLowerCase() == address.email.toString().toLowerCase() if !_.isEmpty(recipient.address) && recipient.address.toString().toLowerCase() == address.email.toString().toLowerCase()
localAddess = true localAddress = true
if !localAddess if !localAddress
# filter for uniq recipients # filter for uniq recipients
if !recipientAddresses[ recipient.address.toString().toLowerCase() ] if !recipientAddresses[ recipient.address.toString().toLowerCase() ]

View file

@ -12,7 +12,7 @@
<h2><%- @T('Token Access') %> (HTTP Token Authentication)</h2> <h2><%- @T('Token Access') %> (HTTP Token Authentication)</h2>
</div> </div>
<p><%- @T('Enable REST API using tokens (not username/email addeess and password). Each user need to create own access tokens in user profile.') %></p> <p><%- @T('Enable REST API using tokens (not username/email address and password). Each user need to create own access tokens in user profile.') %></p>
<p><%- @T('Example') %>:</p> <p><%- @T('Example') %>:</p>
@ -74,4 +74,4 @@ OAuth URLs are:
</table> </table>
</div> </div>
</div> </div>

View file

@ -8,7 +8,7 @@ module Channel::Filter::SenderIsSystemAddress
return if mail[ 'x-zammad-ticket-create-article-sender'.to_sym ] return if mail[ 'x-zammad-ticket-create-article-sender'.to_sym ]
return if mail[ 'x-zammad-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 form = 'raw-from'.to_sym
return if !mail[form] return if !mail[form]
return if !mail[:to] return if !mail[:to]

View file

@ -1579,7 +1579,7 @@ Setting.create_if_not_exists(
title: 'API Token Access', title: 'API Token Access',
name: 'api_token_access', name: 'api_token_access',
area: 'API::Base', 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: { options: {
form: [ form: [
{ {