From 6f4e4aac112041dbd6ad79311b5f3f40b0fda6cf Mon Sep 17 00:00:00 2001
From: Jonathan Zhang <41968151+jonathanzhang53@users.noreply.github.com>
Date: Sat, 29 Dec 2018 13:34:16 -0600
Subject: [PATCH] refactor: follow American English conventions by default
 (#331)

* Change organisation to organization

Closes: #330
---
 src/app/accounting/accounting.component.html                  | 2 +-
 src/app/core/authentication/credentials.model.ts              | 2 +-
 src/app/core/shell/toolbar/toolbar.component.html             | 2 +-
 src/app/login/login.component.html                            | 2 +-
 .../app-configuration/app-configuration.component.html        | 4 ++--
 src/app/settings/settings.component.html                      | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/accounting/accounting.component.html b/src/app/accounting/accounting.component.html
index 9f5ded983..3c2083aa2 100644
--- a/src/app/accounting/accounting.component.html
+++ b/src/app/accounting/accounting.component.html
@@ -61,7 +61,7 @@
               <fa-icon icon="sitemap" size="sm"></fa-icon>
             </mat-icon>
             <h4 matLine>Chart of Accounts</h4>
-            <p matLine>List of accounts used by the organisation</p>
+            <p matLine>List of accounts used by the organization</p>
           </mat-list-item>
 
           <mat-list-item [routerLink]="['closing-entries']">
diff --git a/src/app/core/authentication/credentials.model.ts b/src/app/core/authentication/credentials.model.ts
index 5be13ef9a..e766dbad7 100644
--- a/src/app/core/authentication/credentials.model.ts
+++ b/src/app/core/authentication/credentials.model.ts
@@ -10,7 +10,7 @@ export interface Credentials {
   officeName: string;
   staffId?: number;
   staffDisplayName?: string;
-  organisationalRole?: any;
+  organizationalRole?: any;
   permissions: string[];
   roles: any;
   userId: number;
diff --git a/src/app/core/shell/toolbar/toolbar.component.html b/src/app/core/shell/toolbar/toolbar.component.html
index f44aa8734..f9adc4caf 100644
--- a/src/app/core/shell/toolbar/toolbar.component.html
+++ b/src/app/core/shell/toolbar/toolbar.component.html
@@ -101,7 +101,7 @@
 
 <mat-menu #adminMenu="matMenu" [overlapTrigger]="false">
   <button mat-menu-item>Users</button>
-  <button mat-menu-item>Organisation</button>
+  <button mat-menu-item>Organization</button>
   <button mat-menu-item [routerLink]="['/system']">System</button>
   <button mat-menu-item [routerLink]="['/products']">Products</button>
   <button mat-menu-item>Templates</button>
diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html
index cb9250180..602f556c7 100644
--- a/src/app/login/login.component.html
+++ b/src/app/login/login.component.html
@@ -36,7 +36,7 @@
       <mifosx-language-selector class="p-r-10 p-t-10"></mifosx-language-selector>
     </div>
 
-    <!-- Logo with Organisation Name -->
+    <!-- Logo with Organization Name -->
     <div fxLayout="row" fxLayoutAlign="center center" fxFlex="1 0 auto">
       <img src="assets/images/mifos-logo-flat.png" alt="Mifos X Logo" class="img-container">
     </div>
diff --git a/src/app/self-service/app-configuration/app-configuration.component.html b/src/app/self-service/app-configuration/app-configuration.component.html
index fe2f5a950..d8716d87d 100644
--- a/src/app/self-service/app-configuration/app-configuration.component.html
+++ b/src/app/self-service/app-configuration/app-configuration.component.html
@@ -13,7 +13,7 @@
       <div fxLayout="column">
 
         <mat-form-field>
-          <mat-label>Name of the Organisation</mat-label>
+          <mat-label>Name of the Organization</mat-label>
           <input matInput>
         </mat-form-field>
 
@@ -68,7 +68,7 @@
         <span class="header">Logo</span>
         <mifosx-file-upload></mifosx-file-upload>
 
-        <span class="header">Logo with Organisation Name</span>
+        <span class="header">Logo with Organization Name</span>
         <mifosx-file-upload></mifosx-file-upload>
 
       </div>
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index 7a6830a9f..7a99c0be9 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -16,7 +16,7 @@
       <div fxLayout="column">
 
         <mat-form-field>
-          <mat-label>Name of the Organisation</mat-label>
+          <mat-label>Name of the Organization</mat-label>
           <input matInput>
         </mat-form-field>
 
@@ -71,7 +71,7 @@
         <span class="header">Logo</span>
         <mifosx-file-upload></mifosx-file-upload>
 
-        <span class="header">Logo with Organisation Name</span>
+        <span class="header">Logo with Organization Name</span>
         <mifosx-file-upload></mifosx-file-upload>
 
       </div>