From 6c0743bddc5056cc67debe5880f6c06ead05b878 Mon Sep 17 00:00:00 2001
From: Andrei Solntsev <andrei.solntsev@gmail.com>
Date: Thu, 16 Jun 2016 01:30:26 +0300
Subject: [PATCH] fix spelling error: "occured" -> "occurred"

---
 framework/src/play/PlayPlugin.java             |  4 ++--
 framework/src/play/db/Evolutions.java          |  2 +-
 .../exceptions/ContinuationsException.java     |  2 +-
 .../src/play/exceptions/DatabaseException.java |  2 +-
 .../exceptions/JavaExecutionException.java     |  2 +-
 .../src/play/exceptions/MailException.java     |  2 +-
 .../exceptions/TemplateExecutionException.java |  2 +-
 .../play/exceptions/UnexpectedException.java   |  2 +-
 framework/templates/errors/500.html            |  2 +-
 .../application-skel/app/views/errors/500.html |  2 +-
 .../test/Application.test.html                 |  2 +-
 .../booking/app/views/errors/500.html          |  2 +-
 .../booking/test/Application.test.html         |  2 +-
 .../facebook-oauth2/app/views/errors/500.html  |  2 +-
 .../facebook-oauth2/test/Application.test.html |  2 +-
 samples-and-tests/i-am-a-developer/tests.py    | 18 +++++++++---------
 .../java8Support/app/views/errors/500.html     |  2 +-
 .../java8Support/test/Application.test.html    |  2 +-
 .../jobboard/app/views/errors/500.html         |  2 +-
 .../just-test-cases/app/views/errors/500.html  |  2 +-
 .../test/alertConfirmPrompt.test.html          |  2 +-
 .../twitter-oauth/app/views/errors/500.html    |  2 +-
 .../public/javascripts/jquery.validate.js      |  2 +-
 .../yabe/app/views/errors/500.html             |  2 +-
 .../zencontact/app/views/errors/500.html       |  2 +-
 .../zencontact/test/Application.test.html      |  2 +-
 26 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/framework/src/play/PlayPlugin.java b/framework/src/play/PlayPlugin.java
index 66936704d9..982d26ac6f 100644
--- a/framework/src/play/PlayPlugin.java
+++ b/framework/src/play/PlayPlugin.java
@@ -208,7 +208,7 @@ public void afterInvocation() {
     }
 
     /**
-     * Called if an exception occured during the invocation.
+     * Called if an exception occurred during the invocation.
      * @param e The catched exception.
      */
     public void onInvocationException(Throwable e) {
@@ -216,7 +216,7 @@ public void onInvocationException(Throwable e) {
 
     /**
      * Called at the end of the invocation.
-     * (even if an exception occured).
+     * (even if an exception occurred).
      * Time to close request specific things.
      */
     public void invocationFinally() {
diff --git a/framework/src/play/db/Evolutions.java b/framework/src/play/db/Evolutions.java
index f405810509..f3b39bfe3a 100644
--- a/framework/src/play/db/Evolutions.java
+++ b/framework/src/play/db/Evolutions.java
@@ -111,7 +111,7 @@ public static void main(String[] args) throws SQLException {
                 System.out.println("");
                 System.out.println(e.getEvolutionScript());
                 System.out.println("");
-                System.out.println("~ The following error occured:");
+                System.out.println("~ The following error occurred:");
                 System.out.println("");
                 System.out.println(e.getError());
                 System.out.println("");
diff --git a/framework/src/play/exceptions/ContinuationsException.java b/framework/src/play/exceptions/ContinuationsException.java
index 62ffac8de8..abd61f6218 100644
--- a/framework/src/play/exceptions/ContinuationsException.java
+++ b/framework/src/play/exceptions/ContinuationsException.java
@@ -13,7 +13,7 @@ public String getErrorTitle() {
 
     @Override
     public String getErrorDescription() {
-        return String.format("A await/Continuations error occured : <strong>%s</strong>", getMessage());
+        return String.format("A await/Continuations error occurred : <strong>%s</strong>", getMessage());
     }
 
 }
diff --git a/framework/src/play/exceptions/DatabaseException.java b/framework/src/play/exceptions/DatabaseException.java
index beefed4331..7bbf717889 100644
--- a/framework/src/play/exceptions/DatabaseException.java
+++ b/framework/src/play/exceptions/DatabaseException.java
@@ -18,6 +18,6 @@ public String getErrorTitle() {
 
     @Override
     public String getErrorDescription() {
-        return String.format("A database error occured : <strong>%s</strong>", getMessage());
+        return String.format("A database error occurred : <strong>%s</strong>", getMessage());
     }
 }
diff --git a/framework/src/play/exceptions/JavaExecutionException.java b/framework/src/play/exceptions/JavaExecutionException.java
index 734363dca7..a12030cd23 100644
--- a/framework/src/play/exceptions/JavaExecutionException.java
+++ b/framework/src/play/exceptions/JavaExecutionException.java
@@ -19,7 +19,7 @@ public String getErrorTitle() {
 
     @Override
     public String getErrorDescription() {
-        return String.format("<strong>%s</strong> occured : %s", getCause().getClass().getSimpleName(), getMessage());
+        return String.format("<strong>%s</strong> occurred : %s", getCause().getClass().getSimpleName(), getMessage());
     } 
 }
 
diff --git a/framework/src/play/exceptions/MailException.java b/framework/src/play/exceptions/MailException.java
index d47207ab15..7f7c12ab94 100644
--- a/framework/src/play/exceptions/MailException.java
+++ b/framework/src/play/exceptions/MailException.java
@@ -21,6 +21,6 @@ public String getErrorTitle() {
 
     @Override
     public String getErrorDescription() {
-        return String.format("A mail error occured : <strong>%s</strong>", getMessage());
+        return String.format("A mail error occurred : <strong>%s</strong>", getMessage());
     }
 }
diff --git a/framework/src/play/exceptions/TemplateExecutionException.java b/framework/src/play/exceptions/TemplateExecutionException.java
index ab8f0992d9..f3991e2495 100644
--- a/framework/src/play/exceptions/TemplateExecutionException.java
+++ b/framework/src/play/exceptions/TemplateExecutionException.java
@@ -18,7 +18,7 @@ public String getErrorTitle() {
 
     @Override
     public String getErrorDescription() {
-        return String.format("Execution error occured in template <strong>%s</strong>. Exception raised was <strong>%s</strong> : <strong>%s</strong>.", getSourceFile(), getCause().getClass().getSimpleName(), getMessage());
+        return String.format("Execution error occurred in template <strong>%s</strong>. Exception raised was <strong>%s</strong> : <strong>%s</strong>.", getSourceFile(), getCause().getClass().getSimpleName(), getMessage());
     }
     
     public static class DoBodyException extends RuntimeException {
diff --git a/framework/src/play/exceptions/UnexpectedException.java b/framework/src/play/exceptions/UnexpectedException.java
index 24eabca2a6..3863de6b7d 100644
--- a/framework/src/play/exceptions/UnexpectedException.java
+++ b/framework/src/play/exceptions/UnexpectedException.java
@@ -25,7 +25,7 @@ public String getErrorTitle() {
     @Override
     public String getErrorDescription() {
         if (getCause() != null && getCause().getClass() != null)
-    		return String.format("An unexpected error occured caused by exception <strong>%s</strong>:<br/> <strong>%s</strong>", getCause().getClass().getSimpleName(), getCause().getMessage());
+    		return String.format("An unexpected error occurred caused by exception <strong>%s</strong>:<br/> <strong>%s</strong>", getCause().getClass().getSimpleName(), getCause().getMessage());
         else return String.format("Unexpected error : %s", getMessage());
     } 
 }
diff --git a/framework/templates/errors/500.html b/framework/templates/errors/500.html
index d25226cbe5..7590b9a6c1 100644
--- a/framework/templates/errors/500.html
+++ b/framework/templates/errors/500.html
@@ -10,7 +10,7 @@
             #{500 exception /}
         #{/if}
         #{else}
-            <h1>Oops, an error occured</h1>
+            <h1>Oops, an error occurred</h1>
             #{if exception instanceof play.exceptions.PlayException}
                 <p>
                     This exception has been logged with id <strong>${exception.id}</strong>.
diff --git a/resources/application-skel/app/views/errors/500.html b/resources/application-skel/app/views/errors/500.html
index d25226cbe5..7590b9a6c1 100644
--- a/resources/application-skel/app/views/errors/500.html
+++ b/resources/application-skel/app/views/errors/500.html
@@ -10,7 +10,7 @@
             #{500 exception /}
         #{/if}
         #{else}
-            <h1>Oops, an error occured</h1>
+            <h1>Oops, an error occurred</h1>
             #{if exception instanceof play.exceptions.PlayException}
                 <p>
                     This exception has been logged with id <strong>${exception.id}</strong>.
diff --git a/resources/application-skel/test/Application.test.html b/resources/application-skel/test/Application.test.html
index 3e04f97695..d1cf8999b0 100644
--- a/resources/application-skel/test/Application.test.html
+++ b/resources/application-skel/test/Application.test.html
@@ -1,7 +1,7 @@
 *{ You can use plain selenium command using the selenium tag }*
 
 #{selenium}
-    // Open the home page, and check that no error occured
+    // Open the home page, and check that no error occurred
     open('/')
     assertNotTitle('Application error')
 #{/selenium}
\ No newline at end of file
diff --git a/samples-and-tests/booking/app/views/errors/500.html b/samples-and-tests/booking/app/views/errors/500.html
index 517bcf8eaf..c2275e5d97 100644
--- a/samples-and-tests/booking/app/views/errors/500.html
+++ b/samples-and-tests/booking/app/views/errors/500.html
@@ -9,7 +9,7 @@
 			#{500 exception /}
 		#{/if}
         #{else}
-        	<h1>Oops, an error occured</h1>
+        	<h1>Oops, an error occurred</h1>
 			<p>
 				This exception has been logged with id <strong>${exception.id}</strong>.
 			</p>
diff --git a/samples-and-tests/booking/test/Application.test.html b/samples-and-tests/booking/test/Application.test.html
index 4471ba985f..78d9f90727 100644
--- a/samples-and-tests/booking/test/Application.test.html
+++ b/samples-and-tests/booking/test/Application.test.html
@@ -1,7 +1,7 @@
 *{ You can use plain selenium command using the selenium tag }*
 
 #{selenium}
-    // Open the home page, and check that no error occured
+    // Open the home page, and check that no error occurred
     open('/')
     waitForPageToLoad(1000)
     assertNotTitle('Application error')
diff --git a/samples-and-tests/facebook-oauth2/app/views/errors/500.html b/samples-and-tests/facebook-oauth2/app/views/errors/500.html
index a898cb77e4..e083623001 100644
--- a/samples-and-tests/facebook-oauth2/app/views/errors/500.html
+++ b/samples-and-tests/facebook-oauth2/app/views/errors/500.html
@@ -10,7 +10,7 @@
             #{500 exception /}
         #{/if}
         #{else}
-            <h1>Oops, an error occured</h1>
+            <h1>Oops, an error occurred</h1>
             #{if exception instanceof play.exceptions.PlayException}
                 <p>
                     This exception has been logged with id <strong>${exception.id}</strong>.
diff --git a/samples-and-tests/facebook-oauth2/test/Application.test.html b/samples-and-tests/facebook-oauth2/test/Application.test.html
index 3e04f97695..d1cf8999b0 100644
--- a/samples-and-tests/facebook-oauth2/test/Application.test.html
+++ b/samples-and-tests/facebook-oauth2/test/Application.test.html
@@ -1,7 +1,7 @@
 *{ You can use plain selenium command using the selenium tag }*
 
 #{selenium}
-    // Open the home page, and check that no error occured
+    // Open the home page, and check that no error occurred
     open('/')
     assertNotTitle('Application error')
 #{/selenium}
\ No newline at end of file
diff --git a/samples-and-tests/i-am-a-developer/tests.py b/samples-and-tests/i-am-a-developer/tests.py
index f11f3c7f76..0f9c459452 100755
--- a/samples-and-tests/i-am-a-developer/tests.py
+++ b/samples-and-tests/i-am-a-developer/tests.py
@@ -406,7 +406,7 @@ def testSimpleProjectCreation(self):
             self.assert_(html.count('Cannot get property \'name\' on null object'))
             self.assert_(waitFor(self.play, 'ERROR ~'))
             self.assert_(waitFor(self.play, 'Template execution error (In /app/views/Application/index.html around line 4)'))
-            self.assert_(waitFor(self.play, 'Execution error occured in template /app/views/Application/index.html.'))
+            self.assert_(waitFor(self.play, 'Execution error occurred in template /app/views/Application/index.html.'))
             self.assert_(waitFor(self.play, 'at Invocation.HTTP Request(Play!)'))
             self.assert_(waitFor(self.play, 'at /app/views/Application/index.html.(line:4)'))
             self.assert_(waitFor(self.play, '...'))
@@ -426,7 +426,7 @@ def testSimpleProjectCreation(self):
             self.assert_(html.count('Cannot get property \'name\' on null object'))
             self.assert_(waitFor(self.play, 'ERROR ~'))
             self.assert_(waitFor(self.play, 'Template execution error (In /app/views/Application/index.html around line 4)'))
-            self.assert_(waitFor(self.play, 'Execution error occured in template /app/views/Application/index.html.'))
+            self.assert_(waitFor(self.play, 'Execution error occurred in template /app/views/Application/index.html.'))
             self.assert_(waitFor(self.play, 'at Invocation.HTTP Request(Play!)'))
             self.assert_(waitFor(self.play, 'at /app/views/Application/index.html.(line:4)'))
             self.assert_(waitFor(self.play, '...'))
@@ -458,7 +458,7 @@ def testSimpleProjectCreation(self):
             self.assert_(html.count('In /app/controllers/Application.java (around line 13)'))
             self.assert_(waitFor(self.play, 'ERROR ~'))
             self.assert_(waitFor(self.play, 'Execution exception (In /app/controllers/Application.java around line 13)'))
-            self.assert_(waitFor(self.play, 'ArithmeticException occured : / by zero'))
+            self.assert_(waitFor(self.play, 'ArithmeticException occurred : / by zero'))
             self.assert_(waitFor(self.play, 'at controllers.Application.index(Application.java:13)'))
             self.assert_(waitFor(self.play, '...'))
 
@@ -477,7 +477,7 @@ def testSimpleProjectCreation(self):
             self.assert_(html.count('In /app/controllers/Application.java (around line 13)'))
             self.assert_(waitFor(self.play, 'ERROR ~'))
             self.assert_(waitFor(self.play, 'Execution exception (In /app/controllers/Application.java around line 13)'))
-            self.assert_(waitFor(self.play, 'ArithmeticException occured : / by zero'))
+            self.assert_(waitFor(self.play, 'ArithmeticException occurred : / by zero'))
             self.assert_(waitFor(self.play, 'at controllers.Application.index(Application.java:13)'))
             self.assert_(waitFor(self.play, '...'))
 
@@ -665,8 +665,8 @@ def waitForWithFail(process, pattern, failPattern):
         sys.stdout.flush()
         line = process.stdout.readline().strip()
 	sys.stdout.flush()
-        #print timeoutOccured
-        if timeoutOccured:
+        #print timeoutOccurred
+        if timeoutOccurred:
             return False
         if line == '@KILLED':
             return False
@@ -678,13 +678,13 @@ def waitForWithFail(process, pattern, failPattern):
             timer.cancel()
             return True
 
-timeoutOccured = False
+timeoutOccurred = False
 
 def timeout(process):
-    global timeoutOccured 
+    global timeoutOccurred 
     print '@@@@ TIMEOUT !'
     killPlay()
-    timeoutOccured = True
+    timeoutOccurred = True
 
 def killPlay():
     try:
diff --git a/samples-and-tests/java8Support/app/views/errors/500.html b/samples-and-tests/java8Support/app/views/errors/500.html
index a898cb77e4..e083623001 100644
--- a/samples-and-tests/java8Support/app/views/errors/500.html
+++ b/samples-and-tests/java8Support/app/views/errors/500.html
@@ -10,7 +10,7 @@
             #{500 exception /}
         #{/if}
         #{else}
-            <h1>Oops, an error occured</h1>
+            <h1>Oops, an error occurred</h1>
             #{if exception instanceof play.exceptions.PlayException}
                 <p>
                     This exception has been logged with id <strong>${exception.id}</strong>.
diff --git a/samples-and-tests/java8Support/test/Application.test.html b/samples-and-tests/java8Support/test/Application.test.html
index 2b0ad094b6..ed67295008 100644
--- a/samples-and-tests/java8Support/test/Application.test.html
+++ b/samples-and-tests/java8Support/test/Application.test.html
@@ -1,7 +1,7 @@
 *{ You can use plain selenium command using the selenium tag }*
 
 #{selenium}
-    // Open the home page, and check that no error occured
+    // Open the home page, and check that no error occurred
     open('/')
     assertNotTitle('Application error')
 #{/selenium}
\ No newline at end of file
diff --git a/samples-and-tests/jobboard/app/views/errors/500.html b/samples-and-tests/jobboard/app/views/errors/500.html
index 517bcf8eaf..c2275e5d97 100644
--- a/samples-and-tests/jobboard/app/views/errors/500.html
+++ b/samples-and-tests/jobboard/app/views/errors/500.html
@@ -9,7 +9,7 @@
 			#{500 exception /}
 		#{/if}
         #{else}
-        	<h1>Oops, an error occured</h1>
+        	<h1>Oops, an error occurred</h1>
 			<p>
 				This exception has been logged with id <strong>${exception.id}</strong>.
 			</p>
diff --git a/samples-and-tests/just-test-cases/app/views/errors/500.html b/samples-and-tests/just-test-cases/app/views/errors/500.html
index 34749cce3a..5108372b85 100644
--- a/samples-and-tests/just-test-cases/app/views/errors/500.html
+++ b/samples-and-tests/just-test-cases/app/views/errors/500.html
@@ -9,7 +9,7 @@
 			#{500 exception /}
 		#{/if}
         #{else}
-        	<h1>Oops, an error occured</h1>
+        	<h1>Oops, an error occurred</h1>
 			<p>
 				This exception has been logged with id <strong>${exception.id}</strong>.
 			</p>
diff --git a/samples-and-tests/just-test-cases/test/alertConfirmPrompt.test.html b/samples-and-tests/just-test-cases/test/alertConfirmPrompt.test.html
index ce65a8341f..f6ef234157 100644
--- a/samples-and-tests/just-test-cases/test/alertConfirmPrompt.test.html
+++ b/samples-and-tests/just-test-cases/test/alertConfirmPrompt.test.html
@@ -1,7 +1,7 @@
 *{ You can use plain selenium command using the selenium tag }*
 
 #{selenium}
-    // Open the home page, and check that no error occured
+    // Open the home page, and check that no error occurred
     open('@{Application.alertConfirmPrompt()}')
 	
 	// Handle alert
diff --git a/samples-and-tests/twitter-oauth/app/views/errors/500.html b/samples-and-tests/twitter-oauth/app/views/errors/500.html
index 517bcf8eaf..c2275e5d97 100644
--- a/samples-and-tests/twitter-oauth/app/views/errors/500.html
+++ b/samples-and-tests/twitter-oauth/app/views/errors/500.html
@@ -9,7 +9,7 @@
 			#{500 exception /}
 		#{/if}
         #{else}
-        	<h1>Oops, an error occured</h1>
+        	<h1>Oops, an error occurred</h1>
 			<p>
 				This exception has been logged with id <strong>${exception.id}</strong>.
 			</p>
diff --git a/samples-and-tests/validation/public/javascripts/jquery.validate.js b/samples-and-tests/validation/public/javascripts/jquery.validate.js
index bcbbb9eb23..8cad40e84d 100644
--- a/samples-and-tests/validation/public/javascripts/jquery.validate.js
+++ b/samples-and-tests/validation/public/javascripts/jquery.validate.js
@@ -488,7 +488,7 @@ $.extend($.validator, {
 						return false;
 					}
 				} catch(e) {
-					this.settings.debug && window.console && console.log("exception occured when checking element " + element.id
+					this.settings.debug && window.console && console.log("exception occurred when checking element " + element.id
 						 + ", check the '" + rule.method + "' method");
 					throw e;
 				}
diff --git a/samples-and-tests/yabe/app/views/errors/500.html b/samples-and-tests/yabe/app/views/errors/500.html
index 517bcf8eaf..c2275e5d97 100644
--- a/samples-and-tests/yabe/app/views/errors/500.html
+++ b/samples-and-tests/yabe/app/views/errors/500.html
@@ -9,7 +9,7 @@
 			#{500 exception /}
 		#{/if}
         #{else}
-        	<h1>Oops, an error occured</h1>
+        	<h1>Oops, an error occurred</h1>
 			<p>
 				This exception has been logged with id <strong>${exception.id}</strong>.
 			</p>
diff --git a/samples-and-tests/zencontact/app/views/errors/500.html b/samples-and-tests/zencontact/app/views/errors/500.html
index 517bcf8eaf..c2275e5d97 100644
--- a/samples-and-tests/zencontact/app/views/errors/500.html
+++ b/samples-and-tests/zencontact/app/views/errors/500.html
@@ -9,7 +9,7 @@
 			#{500 exception /}
 		#{/if}
         #{else}
-        	<h1>Oops, an error occured</h1>
+        	<h1>Oops, an error occurred</h1>
 			<p>
 				This exception has been logged with id <strong>${exception.id}</strong>.
 			</p>
diff --git a/samples-and-tests/zencontact/test/Application.test.html b/samples-and-tests/zencontact/test/Application.test.html
index a7ba617327..3900aac4fc 100644
--- a/samples-and-tests/zencontact/test/Application.test.html
+++ b/samples-and-tests/zencontact/test/Application.test.html
@@ -3,7 +3,7 @@
 #{fixture delete:'all', load:'test-data.yml' /}
 
 #{selenium}
-    // Open the home page, and check that no error occured
+    // Open the home page, and check that no error occurred
     open('/')
     assertNotTitle('Application error')
     assertTextPresent('Zencontact')