[Security] Switch to English messages as message keys

16 files changed, 18 insertions, 17 deletions

diff --git a/Core/Exception/AccountExpiredException.php b/Core/Exception/AccountExpiredException.php
index 5a3bd50..a5618ce 100644
--- a/Core/Exception/AccountExpiredException.php
+++ b/Core/Exception/AccountExpiredException.php
@@ -24,6 +24,6 @@ class AccountExpiredException extends AccountStatusException
      */
     public function getMessageKey()
     {
-        return 'security.exception.account_expired_exception';
+        return 'Account has expired.';
     }
 }
diff --git a/Core/Exception/AuthenticationCredentialsNotFoundException.php b/Core/Exception/AuthenticationCredentialsNotFoundException.php
index 1bd8ffd..633b2be 100644
--- a/Core/Exception/AuthenticationCredentialsNotFoundException.php
+++ b/Core/Exception/AuthenticationCredentialsNotFoundException.php
@@ -25,6 +25,6 @@ class AuthenticationCredentialsNotFoundException extends AuthenticationException
      */
     public function getMessageKey()
     {
-        return 'security.exception.authentication_credentials_not_found_exception';
+        return 'Authentication credentials could not be found.';
     }
 }
diff --git a/Core/Exception/AuthenticationException.php b/Core/Exception/AuthenticationException.php
index 7958ff7..2b897c2 100644
--- a/Core/Exception/AuthenticationException.php
+++ b/Core/Exception/AuthenticationException.php
@@ -72,7 +72,7 @@ class AuthenticationException extends \RuntimeException implements \Serializable
      */
     public function getMessageKey()
     {
-        return 'security.exception.authentication_exception';
+        return 'An authentication exception occurred.';
     }
 
     /**
diff --git a/Core/Exception/AuthenticationServiceException.php b/Core/Exception/AuthenticationServiceException.php
index b002067..758a4f0 100644
--- a/Core/Exception/AuthenticationServiceException.php
+++ b/Core/Exception/AuthenticationServiceException.php
@@ -24,6 +24,6 @@ class AuthenticationServiceException extends AuthenticationException
      */
     public function getMessageKey()
     {
-        return 'security.exception.authentication_service_exception';
+        return 'Authentication request could not be processed due to a system problem.';
     }
 }
diff --git a/Core/Exception/BadCredentialsException.php b/Core/Exception/BadCredentialsException.php
index 3ac4800..5deecca 100644
--- a/Core/Exception/BadCredentialsException.php
+++ b/Core/Exception/BadCredentialsException.php
@@ -24,6 +24,6 @@ class BadCredentialsException extends AuthenticationException
      */
     public function getMessageKey()
     {
-        return 'security.exception.bad_credentials_exception';
+        return 'Invalid credentials.';
     }
 }
diff --git a/Core/Exception/CookieTheftException.php b/Core/Exception/CookieTheftException.php
index badd7b1..8d9e154 100644
--- a/Core/Exception/CookieTheftException.php
+++ b/Core/Exception/CookieTheftException.php
@@ -25,6 +25,6 @@ class CookieTheftException extends AuthenticationException
      */
     public function getMessageKey()
     {
-        return 'security.exception.cookie_theft_exception';
+        return 'Cookie has already been used by someone else.';
     }
 }
diff --git a/Core/Exception/CredentialsExpiredException.php b/Core/Exception/CredentialsExpiredException.php
index 03f96c3..b9bf2d1 100644
--- a/Core/Exception/CredentialsExpiredException.php
+++ b/Core/Exception/CredentialsExpiredException.php
@@ -24,6 +24,6 @@ class CredentialsExpiredException extends AccountStatusException
      */
     public function getMessageKey()
     {
-        return 'security.exception.credentials_expired_exception';
+        return 'Credentials have expired.';
     }
 }
diff --git a/Core/Exception/DisabledException.php b/Core/Exception/DisabledException.php
index feb0609..5571ab1 100644
--- a/Core/Exception/DisabledException.php
+++ b/Core/Exception/DisabledException.php
@@ -24,6 +24,6 @@ class DisabledException extends AccountStatusException
      */
     public function getMessageKey()
     {
-        return 'security.exception.disabled_exception';
+        return 'Account is disabled.';
     }
 }
diff --git a/Core/Exception/InsufficientAuthenticationException.php b/Core/Exception/InsufficientAuthenticationException.php
index d99c03f..74fc2b9 100644
--- a/Core/Exception/InsufficientAuthenticationException.php
+++ b/Core/Exception/InsufficientAuthenticationException.php
@@ -26,6 +26,6 @@ class InsufficientAuthenticationException extends AuthenticationException
      */
     public function getMessageKey()
     {
-        return 'security.exception.insufficient_authentication_exception';
+        return 'Not privileged to request the resource.';
     }
 }
diff --git a/Core/Exception/InvalidCsrfTokenException.php b/Core/Exception/InvalidCsrfTokenException.php
index 98a64d0..ce0e1f4 100644
--- a/Core/Exception/InvalidCsrfTokenException.php
+++ b/Core/Exception/InvalidCsrfTokenException.php
@@ -24,6 +24,6 @@ class InvalidCsrfTokenException extends AuthenticationException
      */
     public function getMessageKey()
     {
-        return 'security.exception.invalid_csrf_token_exception';
+        return 'Invalid CSRF token.';
     }
 }
diff --git a/Core/Exception/LockedException.php b/Core/Exception/LockedException.php
index f185a02..6532f70 100644
--- a/Core/Exception/LockedException.php
+++ b/Core/Exception/LockedException.php
@@ -24,6 +24,6 @@ class LockedException extends AccountStatusException
      */
     public function getMessageKey()
     {
-        return 'security.exception.locked_exception';
+        return 'Account is locked.';
     }
 }
diff --git a/Core/Exception/NonceExpiredException.php b/Core/Exception/NonceExpiredException.php
index 0e31713..da6fba8 100644
--- a/Core/Exception/NonceExpiredException.php
+++ b/Core/Exception/NonceExpiredException.php
@@ -27,6 +27,6 @@ class NonceExpiredException extends AuthenticationException
      */
     public function getMessageKey()
     {
-        return 'security.exception.nonce_expired_exception';
+        return 'Digest nonce has expired.';
     }
 }
diff --git a/Core/Exception/ProviderNotFoundException.php b/Core/Exception/ProviderNotFoundException.php
index aefe2ae..ea2b1fd 100644
--- a/Core/Exception/ProviderNotFoundException.php
+++ b/Core/Exception/ProviderNotFoundException.php
@@ -25,6 +25,6 @@ class ProviderNotFoundException extends AuthenticationException
      */
     public function getMessageKey()
     {
-        return 'security.exception.provider_not_found_exception';
+        return 'No authentication provider found to support the authentication token.';
     }
 }
diff --git a/Core/Exception/SessionUnavailableException.php b/Core/Exception/SessionUnavailableException.php
index ff88c32..4b47b18 100644
--- a/Core/Exception/SessionUnavailableException.php
+++ b/Core/Exception/SessionUnavailableException.php
@@ -30,6 +30,6 @@ class SessionUnavailableException extends AuthenticationException
      */
     public function getMessageKey()
     {
-        return 'security.exception.session_unavailable_exception';
+        return 'No session available, it either timed out or cookies are not enabled.';
     }
 }
diff --git a/Core/Exception/TokenNotFoundException.php b/Core/Exception/TokenNotFoundException.php
index da06847..fb85abf 100644
--- a/Core/Exception/TokenNotFoundException.php
+++ b/Core/Exception/TokenNotFoundException.php
@@ -1,5 +1,4 @@
 <?php
-namespace Symfony\Component\Security\Core\Exception;
 
 /*
  * This file is part of the Symfony package.
@@ -10,6 +9,8 @@ namespace Symfony\Component\Security\Core\Exception;
  * file that was distributed with this source code.
  */
 
+namespace Symfony\Component\Security\Core\Exception;
+
 /**
  * TokenNotFoundException is thrown if a Token cannot be found.
  *
@@ -23,6 +24,6 @@ class TokenNotFoundException extends AuthenticationException
      */
     public function getMessageKey()
     {
-        return 'security.exception.token_not_found_exception';
+        return 'No token could be found.';
     }
 }
diff --git a/Core/Exception/UsernameNotFoundException.php b/Core/Exception/UsernameNotFoundException.php
index 0299f83..f656bac 100644
--- a/Core/Exception/UsernameNotFoundException.php
+++ b/Core/Exception/UsernameNotFoundException.php
@@ -26,7 +26,7 @@ class UsernameNotFoundException extends AuthenticationException
      */
     public function getMessageKey()
     {
-        return 'security.exception.username_not_found_exception';
+        return 'Username could not be found.';
     }
 
     /**