From aa281d249e0499df123af580afcc38572636390a Mon Sep 17 00:00:00 2001
From: Jamie <tidusjar@gmail.com>
Date: Wed, 31 Jan 2018 12:12:24 +0000
Subject: [PATCH] More translations and added a check on the baseurl to ensure
 it starts with a '/'

---
 .../app/search/seriesinformation.component.html          | 6 +++---
 src/Ombi/ClientApp/app/search/tvsearch.component.html    | 6 +++---
 src/Ombi/ClientApp/app/settings/ombi/ombi.component.ts   | 9 +++++++++
 src/Ombi/wwwroot/translations/en.json                    | 5 ++++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/Ombi/ClientApp/app/search/seriesinformation.component.html b/src/Ombi/ClientApp/app/search/seriesinformation.component.html
index b5c7d5bff..3c65e6de1 100644
--- a/src/Ombi/ClientApp/app/search/seriesinformation.component.html
+++ b/src/Ombi/ClientApp/app/search/seriesinformation.component.html
@@ -8,16 +8,16 @@
     }
 </style>
 <div *ngIf="series">
-    <button class="btn btn-sm btn-success pull-right" (click)="submitRequests()" title="Go to top">Submit Request</button>
+    <button class="btn btn-sm btn-success pull-right" (click)="submitRequests()" title="Go to top">{{ 'Search.TvShows.SubmitRequest' | translate }}</button>
     
     <ngb-tabset>
              
         <div *ngFor="let season of series.seasonRequests">
             <ngb-tab [id]="season.seasonNumber" [title]="season.seasonNumber">
                 <ng-template ngbTabContent>
-                    <h2>Season: {{season.seasonNumber}}</h2>
+                    <h2 [translate]="'Search.TvShows.SeasonNumberHeading'" [translateParams]="{seasonNumber: season.seasonNumber}">Season: {{season.seasonNumber}}</h2>
                     
-                    <button (click)="addAllEpisodes(season)" class="btn btn-sm btn-primary-outline">Select All in Season {{season.seasonNumber}}</button>
+                    <button (click)="addAllEpisodes(season)" class="btn btn-sm btn-primary-outline" [translate]="'Search.TvShows.SelectAllInSeason'" [translateParams]="{seasonNumber: season.seasonNumber}">Select All in Season {{season.seasonNumber}}</button>
                     <table class="table table-striped table-hover table-responsive table-condensed">
                         <thead>
                         <tr>
diff --git a/src/Ombi/ClientApp/app/search/tvsearch.component.html b/src/Ombi/ClientApp/app/search/tvsearch.component.html
index d82cb6727..84fd60bfd 100644
--- a/src/Ombi/ClientApp/app/search/tvsearch.component.html
+++ b/src/Ombi/ClientApp/app/search/tvsearch.component.html
@@ -118,18 +118,18 @@
 
                                 <div *ngIf="node.data.fullyAvailable">
                                     <button style="text-align: right" class="btn btn-success-outline disabled" disabled>
-                                        <i class="fa fa-check"></i> Available</button>
+                                        <i class="fa fa-check"></i> {{ 'Common.Available' | translate }}</button>
                                 </div>
                                 <br />
                                 <div *ngIf="node.data.plexUrl && node.data.available">
                                     <a  style="text-align: right" class="btn btn-sm btn-success-outline" href="{{node.data.plexUrl}}"
                                         target="_blank">
-                                        <i class="fa fa-eye"></i> View On Plex</a>
+                                        <i class="fa fa-eye"></i> {{ 'Search.TvShows.Popular' | translate }}</a>
   </div>
                                 <div class="dropdown" *ngIf="issueCategories && issuesEnabled">
                                     <button class="btn btn-sm btn-primary-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true"
                                         aria-expanded="true">
-                                        <i class="fa fa-plus"></i> Report Issue
+                                        <i class="fa fa-plus"></i> {{ 'Requests.ReportIssue' | translate }}
                                         <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
diff --git a/src/Ombi/ClientApp/app/settings/ombi/ombi.component.ts b/src/Ombi/ClientApp/app/settings/ombi/ombi.component.ts
index dbdb75d23..77136f322 100644
--- a/src/Ombi/ClientApp/app/settings/ombi/ombi.component.ts
+++ b/src/Ombi/ClientApp/app/settings/ombi/ombi.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from "@angular/core";
 import { FormBuilder, FormGroup } from "@angular/forms";
 
+import { IOmbiSettings } from "../../interfaces";
 import { NotificationService } from "../../services";
 import { SettingsService } from "../../services";
 
@@ -39,6 +40,14 @@ export class OmbiComponent implements OnInit {
             return;
         }
 
+        const result = <IOmbiSettings>form.value;
+        if(result.baseUrl.length > 0) {
+            if(result.baseUrl.indexOf("/") <= 0) {
+                this.notificationService.error("Please ensure your base url start with a '/'");
+                return;
+            }
+        }
+
         this.settingsService.saveOmbi(form.value).subscribe(x => {
             if (x) {
                 this.notificationService.success("Successfully saved Ombi settings");
diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json
index e98dd1374..5fd01731e 100644
--- a/src/Ombi/wwwroot/translations/en.json
+++ b/src/Ombi/wwwroot/translations/en.json
@@ -98,7 +98,10 @@
       "AllSeasons":"All Seasons",
       "FirstSeason":"First Season",
       "LatestSeason":"Latest Season",
-      "Select":"Select ..."
+      "Select":"Select ...",
+      "SubmitRequest":"Submit Request",
+      "Season":"Season: {{seasonNumber}}",
+      "SelectAllInSeason":"Select All in Season {{seasonNumber}}"
     }
   },
   "Requests": {