From d78e3127ea757ace1c6ccd86be0ea4baaa06fab2 Mon Sep 17 00:00:00 2001
From: Jamie <tidusjar@gmail.com>
Date: Mon, 27 Nov 2017 16:13:16 +0000
Subject: [PATCH] Translated the Requests page and fixed #1740

---
 src/Ombi.Schedule/JobSetup.cs                 |   1 +
 .../app/requests/movierequests.component.html |  38 ++---
 .../app/requests/request.component.html       |   8 +-
 .../tvrequest-children.component.html         |  28 ++--
 src/Ombi/wwwroot/translations/en.json         | 154 +++++++++++-------
 5 files changed, 129 insertions(+), 100 deletions(-)

diff --git a/src/Ombi.Schedule/JobSetup.cs b/src/Ombi.Schedule/JobSetup.cs
index dabe0da9f..dc9d49269 100644
--- a/src/Ombi.Schedule/JobSetup.cs
+++ b/src/Ombi.Schedule/JobSetup.cs
@@ -28,6 +28,7 @@ namespace Ombi.Schedule
             SonarrSync = cache;
             CpCache = cpCache;
             JobSettings = jobsettings;
+            SrSync = srSync;
         }
 
         private IPlexContentSync PlexContentSync { get; }
diff --git a/src/Ombi/ClientApp/app/requests/movierequests.component.html b/src/Ombi/ClientApp/app/requests/movierequests.component.html
index 6dfdb4a6a..1b2e0751e 100644
--- a/src/Ombi/ClientApp/app/requests/movierequests.component.html
+++ b/src/Ombi/ClientApp/app/requests/movierequests.component.html
@@ -29,37 +29,37 @@
                 </div>
                 <br />
                 <div>
-                    <span>Requested By: </span>
+                    <span>{{ 'Requests.RequestedBy' | translate }} </span>
                     <span *ngIf="!isAdmin">{{request.requestedUser.userName}}</span>
                     <span *ngIf="isAdmin && request.requestedUser.alias">{{request.requestedUser.alias}}</span>
                     <span *ngIf="isAdmin && !request.requestedUser.alias">{{request.requestedUser.userName}}</span>
                 </div>
                 <div>
-                    <span>Status: </span>
+                    <span>{{ 'Requests.Status' | translate }} </span>
                     <span class="label label-success">{{request.status}}</span>
                 </div>
 
                 <div>
-                    <span>Request status: </span>
-                    <span *ngIf="request.available" class="label label-success">Available</span>
-                    <span *ngIf="request.approved && !request.available" class="label label-info">Processing Request</span>
-                    <span *ngIf="request.denied" class="label label-danger">Request Denied</span>
+                    <span>{{ 'Requests.RequestStatus' | translate }} </span>
+                    <span *ngIf="request.available" class="label label-success"  [translate]="'Common.Available'"></span>
+                    <span *ngIf="request.approved && !request.available" class="label label-info" [translate]="'Common.ProcessingRequest'"></span>
+                    <span *ngIf="request.denied" class="label label-danger" [translate]="'Common.RequestDenied'"></span>
                     <span *ngIf="request.deniedReason" title="{{request.deniedReason}}"><i class="fa fa-info-circle"></i></span>
-                    <span *ngIf="!request.approved && !request.availble && !request.denied" class="label label-warning">Pending Approval</span>
+                    <span *ngIf="!request.approved && !request.availble && !request.denied" class="label label-warning" [translate]="'Common.PendingApproval'"></span>
 
                 </div>
                 <div *ngIf="request.denied">
-                    Denied: <i style="color:red;" class="fa fa-check"></i>
+                    {{ 'Requests.Denied' | translate }} <i style="color:red;" class="fa fa-check"></i>
 
                 </div>
 
 
-                <div>Release Date: {{request.releaseDate | date}}</div>
-                <div>Requested Date: {{request.requestedDate | date}}</div>
+                <div>{{ 'Requests.ReleaseDate' | translate }} {{request.releaseDate | date}}</div>
+                <div>{{ 'Requests.RequestedDate' | translate }} {{request.requestedDate | date}}</div>
                 <br />
                 <div *ngIf="isAdmin">
-                    <div *ngIf="request.qualityOverrideTitle">Quality Override: <span>{{request.qualityOverrideTitle}} </span></div>
-                    <div *ngIf="request.rootPathOverrideTitle">Root Folder Override: <span>{{request.rootPathOverrideTitle}} </span></div>
+                    <div *ngIf="request.qualityOverrideTitle">{{ 'Requests.QualityOverride' | translate }} <span>{{request.qualityOverrideTitle}} </span></div>
+                    <div *ngIf="request.rootPathOverrideTitle">{{ 'Requests.RootFolderOverride' | translate }} <span>{{request.rootPathOverrideTitle}} </span></div>
                 </div>
 
             </div>
@@ -67,12 +67,12 @@
                 <div *ngIf="isAdmin">
                     <div *ngIf="!request.approved">
                         <form>
-                            <button (click)="approve(request)" style="text-align: right" class="btn btn-sm btn-success-outline approve" type="submit"><i class="fa fa-plus"></i> Approve</button>
+                            <button (click)="approve(request)" style="text-align: right" class="btn btn-sm btn-success-outline approve" type="submit"><i class="fa fa-plus"></i> {{ 'Common.Approve' | translate }}</button>
                         </form>
 
                         <!--Radarr Root Folder-->
                         <div *ngIf="radarrRootFolders" class="btn-group btn-split">
-                            <button type="button" class="btn btn-sm btn-warning-outline"><i class="fa fa-plus"></i> Change Root Folder</button>
+                            <button type="button" class="btn btn-sm btn-warning-outline"><i class="fa fa-plus"></i> {{ 'Requests.ChangeRootFolder' | translate }}</button>
                             <button type="button" class="btn btn-warning-outline dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                 <span class="caret"></span>
                                 <span class="sr-only">Toggle Dropdown</span>
@@ -84,7 +84,7 @@
 
                         <!--Radarr Quality Profiles -->
                         <div *ngIf="radarrProfiles" class="btn-group btn-split">
-                            <button type="button" class="btn btn-sm btn-warning-outline"><i class="fa fa-plus"></i> Change Quality Profile</button>
+                            <button type="button" class="btn btn-sm btn-warning-outline"><i class="fa fa-plus"></i> {{ 'Requests.ChangeQualityProfile' | translate }}</button>
                             <button type="button" class="btn btn-warning-outline dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                 <span class="caret"></span>
                                 <span class="sr-only">Toggle Dropdown</span>
@@ -95,16 +95,16 @@
                         </div>
 
                         <div *ngIf="!request.denied">
-                            <button type="button" (click)="deny(request)" class="btn btn-sm btn-danger-outline deny"><i class="fa fa-times"></i> Deny</button>
+                            <button type="button" (click)="deny(request)" class="btn btn-sm btn-danger-outline deny"><i class="fa fa-times"></i> {{ 'Requests.Deny' | translate }}</button>
                         </div>
                     </div>
                     <form>
-                        <button (click)="removeRequest(request)" style="text-align: right" class="btn btn-sm btn-danger-outline delete"><i class="fa fa-minus"></i> Remove</button>
+                        <button (click)="removeRequest(request)" style="text-align: right" class="btn btn-sm btn-danger-outline delete"><i class="fa fa-minus"></i> {{ 'Requests.Remove' | translate }}</button>
                     </form>
 
                     <form>
-                        <button *ngIf="request.available" (click)="changeAvailability(request, false)" style="text-align: right" value="false" class="btn btn-sm btn-info-outline change"><i class="fa fa-minus"></i> Mark Unavailable</button>
-                        <button *ngIf="!request.available" (click)="changeAvailability(request, true)" style="text-align: right" value="true" class="btn btn-sm btn-success-outline change"><i class="fa fa-plus"></i> Mark Available</button>
+                        <button *ngIf="request.available" (click)="changeAvailability(request, false)" style="text-align: right" value="false" class="btn btn-sm btn-info-outline change"><i class="fa fa-minus"></i> {{ 'Requests.MarkUnavailable' | translate }}</button>
+                        <button *ngIf="!request.available" (click)="changeAvailability(request, true)" style="text-align: right" value="true" class="btn btn-sm btn-success-outline change"><i class="fa fa-plus"></i> {{ 'Requests.MarkAvailable' | translate }}</button>
                     </form>
 
 
diff --git a/src/Ombi/ClientApp/app/requests/request.component.html b/src/Ombi/ClientApp/app/requests/request.component.html
index 8b9ef976c..b09c61977 100644
--- a/src/Ombi/ClientApp/app/requests/request.component.html
+++ b/src/Ombi/ClientApp/app/requests/request.component.html
@@ -1,14 +1,14 @@
-<h1 id="searchTitle">Requests</h1>
-<h4>Below you can see yours and all other requests, as well as their download and approval status.</h4>
+<h1 id="searchTitle"  [translate]="'Requests.Title'"></h1>
+<h4  [translate]="'Requests.Paragraph'"></h4>
 
 
 
 <ul id="nav-tabs" class="nav nav-tabs" role="tablist">
     <li role="presentation" class="active">
-        <a id="movieTabButton" aria-controls="home" role="tab" data-toggle="tab" (click)="selectMovieTab()"><i class="fa fa-film"></i> Movies</a>
+        <a id="movieTabButton" aria-controls="home" role="tab" data-toggle="tab" (click)="selectMovieTab()"><i class="fa fa-film"></i> {{ 'Requests.MoviesTab' | translate }}</a>
     </li>
     <li role="presentation">
-        <a id="tvTabButton" aria-controls="profile" role="tab" data-toggle="tab" (click)="selectTvTab()"><i class="fa fa-television"></i> TV Shows</a>
+        <a id="tvTabButton" aria-controls="profile" role="tab" data-toggle="tab" (click)="selectTvTab()"><i class="fa fa-television"></i> {{ 'Requests.TvTab' | translate }}</a>
 
     </li>
 </ul>
diff --git a/src/Ombi/ClientApp/app/requests/tvrequest-children.component.html b/src/Ombi/ClientApp/app/requests/tvrequest-children.component.html
index 617253031..9cace5f67 100644
--- a/src/Ombi/ClientApp/app/requests/tvrequest-children.component.html
+++ b/src/Ombi/ClientApp/app/requests/tvrequest-children.component.html
@@ -4,7 +4,7 @@
         <div class="col-md-12">
 
             <div class="col-md-2">
-                <span>Requested By:</span>
+                <span [translate]="'Requests.RequestedBy'"></span>
                 
                 <span *ngIf="!isAdmin">{{child.requestedUser.userName}}</span>
                 <span *ngIf="isAdmin && child.requestedUser.alias">{{child.requestedUser.alias}}</span>
@@ -14,13 +14,13 @@
 
             <div class="col-md-1 col-md-push-9" *ngIf="isAdmin">
                
-                    <button *ngIf="child.canApprove && !child.approved" (click)="approve(child)" class="btn btn-sm btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve</button>
-                    <button *ngIf="child.available" (click)="changeAvailability(child, false)" style="text-align: right" value="false" class="btn btn-sm btn-info-outline change"><i class="fa fa-minus"></i> Mark Unavailable</button>
-                    <button *ngIf="!child.available" (click)="changeAvailability(child, true)" style="text-align: right" value="true" class="btn btn-sm btn-success-outline change"><i class="fa fa-plus"></i> Mark Available</button>
+                    <button *ngIf="child.canApprove && !child.approved" (click)="approve(child)" class="btn btn-sm btn-success-outline" type="submit"><i class="fa fa-plus"></i> {{ 'Common.Approve' | translate }}</button>
+                    <button *ngIf="child.available" (click)="changeAvailability(child, false)" style="text-align: right" value="false" class="btn btn-sm btn-info-outline change"><i class="fa fa-minus"></i> {{ 'Requests.MarkUnavailable' | translate }}</button>
+                    <button *ngIf="!child.available" (click)="changeAvailability(child, true)" style="text-align: right" value="true" class="btn btn-sm btn-success-outline change"><i class="fa fa-plus"></i> {{ 'Requests.MarkAvailable' | translate }}</button>
 
-                    <button *ngIf="!child.denied" type="button" (click)="deny(child)" class="btn btn-sm btn-danger-outline deny"><i class="fa fa-times"></i> Deny</button>
+                    <button *ngIf="!child.denied" type="button" (click)="deny(child)" class="btn btn-sm btn-danger-outline deny"><i class="fa fa-times"></i> {{ 'Requests.Deny' | translate }}</button>
            
-                    <button type="button" (click)="removeRequest(child)" class="btn btn-sm btn-danger-outline deny"><i class="fa fa-times"></i> Remove</button>
+                    <button type="button" (click)="removeRequest(child)" class="btn btn-sm btn-danger-outline deny"><i class="fa fa-times"></i> {{ 'Requests.Remove' | translate }}</button>
                 
             </div>
         </div>
@@ -30,7 +30,7 @@
                 <div *ngFor="let season of child.seasonRequests">
                     <ngb-tab [id]="season.seasonNumber" [title]="season.seasonNumber">
                         <ng-template ngbTabContent>
-                            <h2>Season: {{season.seasonNumber}}</h2>
+                            <h2>{{ 'Requests.Season' | translate }} {{season.seasonNumber}}</h2>
 
                             <table class="table table-striped table-hover table-responsive table-condensed">
                                 <thead>
@@ -42,17 +42,17 @@
                                         </th>
                                         <th>
                                             <a>
-                                                Title
+                                                {{ 'Requests.GridTitle' | translate }}
                                             </a>
                                         </th>
                                         <th>
                                             <a>
-                                                Air Date
+                                                {{ 'Requests.AirDate' | translate }}
                                             </a>
                                         </th>
                                         <th>
                                             <a>
-                                                Status
+                                                {{ 'Requests.GridStatus' | translate }}
                                             </a>
                                         </th>
                                     </tr>
@@ -69,11 +69,11 @@
                                             {{ep.airDate | date: 'dd/MM/yyyy' }}
                                         </td>
                                         <td>
-                                            <span *ngIf="child.denied" class="label label-danger">Denied</span>
-                                            <span *ngIf="!child.denied && ep.available" class="label label-success">Available</span>
-                                            <span *ngIf="!child.denied &&ep.approved && !ep.available" class="label label-info">Processing Request</span>
+                                            <span *ngIf="child.denied" class="label label-danger" [translate]="'Common.Denied'"></span>
+                                            <span *ngIf="!child.denied && ep.available" class="label label-success" [translate]="'Common.Available'"></span>
+                                            <span *ngIf="!child.denied &&ep.approved && !ep.available" class="label label-info" [translate]="'Common.ProcessingRequest'"></span>
                                             <div *ngIf="!child.denied && !ep.approved">
-                                                <div *ngIf="!ep.available"><span class="label label-warning">Pending Approval</span></div>
+                                                <div *ngIf="!ep.available"><span class="label label-warning" [translate]="'Common.PendingApproval'"></span></div>
                                             </div>
                                             
                                         </td>
diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json
index c47402407..b1cffc3df 100644
--- a/src/Ombi/wwwroot/translations/en.json
+++ b/src/Ombi/wwwroot/translations/en.json
@@ -5,78 +5,106 @@
     "PasswordPlaceholder": "Password",
     "RememberMe": "Remember Me",
     "ForgottenPassword": "Forgot your password?",
-    "Errors":{
-        "IncorrectCredentials":"Incorrect username or password"
+    "Errors": {
+      "IncorrectCredentials": "Incorrect username or password"
     }
   },
-  "Common":{
-      "ContinueButton":"Continue",
-      "Available":"Available",
-      "ProcessingRequest":"Processing Request",
-      "PendingApproval":"Pending Approval",
-      "NotRequested":"Not Requested",
-      "Requested":"Requested",
-      "Request":"Request",
-      "Errors":{
-          "Validation":"Please check your entered values"
-      }
+  "Common": {
+    "ContinueButton": "Continue",
+    "Available": "Available",
+    "ProcessingRequest": "Processing Request",
+    "PendingApproval": "Pending Approval",
+    "RequestDenied":"Request Denied",
+    "NotRequested": "Not Requested",
+    "Requested": "Requested",
+    "Request": "Request",
+    "Denied":"Denied",
+    "Errors": {
+      "Validation": "Please check your entered values"
+    }
   },
   "PasswordReset": {
     "EmailAddressPlaceholder": "Email Address",
     "ResetPasswordButton": "Reset Password"
   },
   "LandingPage": {
-      "OnlineHeading":"Currently Online",
-      "OnlineParagraph":"The media server is currently online",
-
-      "PartiallyOnlineHeading":"Partially Online",
-      "PartiallyOnlineParagraph":"The media server is partially online.",
-      "MultipleServersUnavailable":"There are {{serversUnavailable}} servers offline out of {{totalServers}}.",
-      "SingleServerUnavailable":"There is {{serversUnavailable}} server offline out of {{totalServers}}.",
-
-      "OfflineHeading":"Currently Offline",
-      "OfflineParagraph":"The media server is currently offline.",
-
-      "CheckPageForUpdates":"Check this page for continuous site updates."
+    "OnlineHeading": "Currently Online",
+    "OnlineParagraph": "The media server is currently online",
+    "PartiallyOnlineHeading": "Partially Online",
+    "PartiallyOnlineParagraph": "The media server is partially online.",
+    "MultipleServersUnavailable":
+      "There are {{serversUnavailable}} servers offline out of {{totalServers}}.",
+    "SingleServerUnavailable":
+      "There is {{serversUnavailable}} server offline out of {{totalServers}}.",
+    "OfflineHeading": "Currently Offline",
+    "OfflineParagraph": "The media server is currently offline.",
+    "CheckPageForUpdates": "Check this page for continuous site updates."
+  },
+  "NavigationBar": {
+    "Search": "Search",
+    "Requests": "Requests",
+    "UserManagement": "User Management",
+    "Donate": "Donate!",
+    "DonateTooltip":
+      "This is how I convince my wife to let me spend my spare time developing Ombi ;)",
+    "UpdateAvailableTooltip": "Update Available!",
+    "Settings": "Settings",
+    "Welcome": "Welcome {{username}}",
+    "UpdateDetails": "Update Details",
+    "Logout": "Logout",
+    "Language": {
+      "English": "English",
+      "French": "French",
+      "Spanish": "Spanish",
+      "German": "German",
+      "Italian": "Italian",
+      "Danish": "Danish",
+      "Dutch": "Dutch"
+    }
   },
-  "NavigationBar":{
-      "Search":"Search",
-      "Requests":"Requests",
-      "UserManagement":"User Management",
-      "Donate":"Donate!",
-      "DonateTooltip":"This is how I convince my wife to let me spend my spare time developing Ombi ;)",
-      "UpdateAvailableTooltip":"Update Available!",
-      "Settings":"Settings",
-      "Welcome":"Welcome {{username}}",
-      "UpdateDetails":"Update Details",
-      "Logout":"Logout",
-      "Language":{
-          "English":"English",
-          "French":"French",
-          "Spanish":"Spanish",
-          "German":"German",
-          "Italian":"Italian",
-          "Danish":"Danish",
-          "Dutch":"Dutch"
-      }      
+  "Search": {
+    "Title": "Search",
+    "Paragraph":
+      "Want to watch something that is not currently available? No problem, just search for it below and request it!",
+    "MoviesTab": "Movies",
+    "TvTab": "TV Shows",
+    "Suggestions": "Suggestions",
+    "NoResults": "Sorry, we didn't find any results!",
+    "ReleaseDate": "Release Date",
+    "ViewOnPlex": "View On Plex",
+    "RequestAdded": "Request for {{title}} has been added successfully",
+    "Movies": {
+      "PopularMovies": "Popular Movies",
+      "UpcomingMovies": "Upcoming Movies",
+      "TopRatedMovies": "Top Rated Movies",
+      "NowPlayingMovies": "Now Playing Movies",
+      "HomePage": "Home Page",
+      "Trailer": "Trailer"
+    }
   },
-  "Search":{
-      "Title":"Search",
-      "Paragraph":"Want to watch something that is not currently available? No problem, just search for it below and request it!",
-      "MoviesTab":"Movies",
-      "TvTab":"TV Shows",
-      "Suggestions":"Suggestions",
-      "NoResults":"Sorry, we didn't find any results!",
-      "ReleaseDate" : "Release Date",
-      "ViewOnPlex":"View On Plex",
-      "RequestAdded":"Request for {{title}} has been added successfully",
-      "Movies":{
-        "PopularMovies":"Popular Movies",
-        "UpcomingMovies":"Upcoming Movies",
-        "TopRatedMovies":"Top Rated Movies",
-        "NowPlayingMovies":"Now Playing Movies",
-        "HomePage":"Home Page",
-        "Trailer":"Trailer"
-      }
+  "Requests": {
+    "Title": "Requests",
+    "Paragraph":
+      "Below you can see yours and all other requests, as well as their download and approval status.",
+    "MoviesTab": "Movies",
+    "TvTab": "TV Shows",
+    "RequestedBy": "Requested By:",
+    "Status": "Status:",
+    "RequestStatus:": "Request status:",
+    "Denied": " Denied:",
+    "ReleaseDate": "Release Date:",
+    "RequestDate": "Request Date:",
+    "QualityOverride": "Quality Override:",
+    "RootFolderOverride": "Root Folder Override:",
+    "ChangeRootFolder":"Change Root Folder",
+    "ChangeQualityProfile":"Change Quality Profile",
+    "MarkUnavailable":"Mark Unavailable",
+    "MarkAvailable":"Mark Available",
+    "Remove":"Remove",
+    "Deny":"Deny",
+    "Season":"Season:",
+    "GridTitle":"Title",
+    "AirDate":"AirDate",
+    "GridStatus":"Status"
   }
 }