From 9953a6b450508e13a60f3dc3a1412ed74576e96d Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 3 Mar 2017 06:12:02 +0100
Subject: [PATCH] Fixed typos.

---
 app/assets/javascripts/app/controllers/login.coffee          | 2 +-
 app/assets/javascripts/app/controllers/signup.coffee         | 2 +-
 app/assets/javascripts/app/models/permission.coffee          | 2 +-
 app/controllers/sessions_controller.rb                       | 2 +-
 app/models/channel/filter/own_notification_loop_detection.rb | 2 +-
 test/browser_test_helper.rb                                  | 2 +-
 test/unit/auth_test.rb                                       | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/login.coffee b/app/assets/javascripts/app/controllers/login.coffee
index f3111bd88..322a518c7 100644
--- a/app/assets/javascripts/app/controllers/login.coffee
+++ b/app/assets/javascripts/app/controllers/login.coffee
@@ -142,7 +142,7 @@ class Index extends App.ControllerContent
     # add notify
     @notify
       type:      'error'
-      msg:       App.i18n.translateContent(details.error || 'Wrong Username and Password combination.')
+      msg:       App.i18n.translateContent(details.error || 'Wrong Username or Password combination.')
       removeAll: true
 
     # rerender login page
diff --git a/app/assets/javascripts/app/controllers/signup.coffee b/app/assets/javascripts/app/controllers/signup.coffee
index bd7e992d5..be1ec2cea 100644
--- a/app/assets/javascripts/app/controllers/signup.coffee
+++ b/app/assets/javascripts/app/controllers/signup.coffee
@@ -95,7 +95,7 @@ class Index extends App.ControllerContent
 
     @notify
       type:      'error'
-      msg:       App.i18n.translateContent(details.error || 'Wrong Username and Password combination.')
+      msg:       App.i18n.translateContent(details.error || 'Wrong Username or Password combination.')
       removeAll: true
 
 App.Config.set('signup', Index, 'Routes')
diff --git a/app/assets/javascripts/app/models/permission.coffee b/app/assets/javascripts/app/models/permission.coffee
index 55fe545b0..7cbe683db 100644
--- a/app/assets/javascripts/app/models/permission.coffee
+++ b/app/assets/javascripts/app/models/permission.coffee
@@ -1,4 +1,4 @@
 class App.Permission extends App.Model
-  @configure 'Role', 'name', 'note', 'active', 'updated_at'
+  @configure 'Permission', 'name', 'note', 'active'
   @extend Spine.Model.Ajax
   @url: @apiPath + '/permissions'
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 24ef01db3..5c4c88765 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -17,7 +17,7 @@ class SessionsController < ApplicationController
     check_maintenance(user)
 
     # auth failed
-    raise Exceptions::NotAuthorized, 'Wrong Username and Password combination.' if !user
+    raise Exceptions::NotAuthorized, 'Wrong Username or Password combination.' if !user
 
     # remember me - set session cookie to expire later
     expire_after = nil
diff --git a/app/models/channel/filter/own_notification_loop_detection.rb b/app/models/channel/filter/own_notification_loop_detection.rb
index 7f434a213..b64129c9e 100644
--- a/app/models/channel/filter/own_notification_loop_detection.rb
+++ b/app/models/channel/filter/own_notification_loop_detection.rb
@@ -14,7 +14,7 @@ module Channel::Filter::OwnNotificationLoopDetection
     return if message_id !~ /@#{Regexp.quote(fqdn)}>/i
 
     mail[ 'x-zammad-ignore'.to_sym ] = true
-    Rails.logger.info "Detected onw sent notification mail and dropped it to prevent loops (message_id: #{message_id}, from: #{mail[:from]}, to: #{mail[:to]})"
+    Rails.logger.info "Detected own sent notification mail and dropped it to prevent loops (message_id: #{message_id}, from: #{mail[:from]}, to: #{mail[:to]})"
 
   end
 end
diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb
index d9067fc9c..c4f87d94c 100644
--- a/test/browser_test_helper.rb
+++ b/test/browser_test_helper.rb
@@ -3493,7 +3493,7 @@ wait untill text in selector disabppears
         }
       end
     rescue
-      # faild to get logs
+      # failed to get logs
     end
     return if !@@debug
     return if params[:mute_log]
diff --git a/test/unit/auth_test.rb b/test/unit/auth_test.rb
index ceb607f21..5c147e3cf 100644
--- a/test/unit/auth_test.rb
+++ b/test/unit/auth_test.rb
@@ -66,14 +66,14 @@ class AuthTest < ActiveSupport::TestCase
       user = User.authenticate(test[:username], test[:password])
       if test[:result] == true
         if !user
-          assert(false, 'auth faild')
+          assert(false, 'auth failed')
         else
           test[:verify].each { |key, value|
             assert_equal(user[key], value, 'verify')
           }
         end
       else
-        assert_equal(test[:result], user, 'faild or not existing')
+        assert_equal(test[:result], user, 'failed or not existing')
       end
     }
   end