github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 21:33:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

More translations and added a check on the baseurl to ensure it starts with a '/'

Browse source
This commit is contained in:
Jamie 2018-01-31 12:12:24 +00:00
commit aa281d249e
4 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Ombi/ClientApp/app/search/seriesinformation.component.html
View file

@ -8,16 +8,16 @@
} }
</style> </style>
<div *ngIf="series"> <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> <ngb-tabset>
<div *ngFor="let season of series.seasonRequests"> <div *ngFor="let season of series.seasonRequests">
<ngb-tab [id]="season.seasonNumber" [title]="season.seasonNumber"> <ngb-tab [id]="season.seasonNumber" [title]="season.seasonNumber">
<ng-template ngbTabContent> <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"> <table class="table table-striped table-hover table-responsive table-condensed">
<thead> <thead>
<tr> <tr>

6
src/Ombi/ClientApp/app/search/tvsearch.component.html
View file

@ -118,18 +118,18 @@
<div *ngIf="node.data.fullyAvailable"> <div *ngIf="node.data.fullyAvailable">
<button style="text-align: right" class="btn btn-success-outline disabled" disabled> <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> </div>
<br /> <br />
<div *ngIf="node.data.plexUrl && node.data.available"> <div *ngIf="node.data.plexUrl && node.data.available">
<a style="text-align: right" class="btn btn-sm btn-success-outline" href="{{node.data.plexUrl}}" <a style="text-align: right" class="btn btn-sm btn-success-outline" href="{{node.data.plexUrl}}"
target="_blank"> 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>
<div class="dropdown" *ngIf="issueCategories && issuesEnabled"> <div class="dropdown" *ngIf="issueCategories && issuesEnabled">
<button class="btn btn-sm btn-primary-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" <button class="btn btn-sm btn-primary-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="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> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenu1"> <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">

9
src/Ombi/ClientApp/app/settings/ombi/ombi.component.ts
View file

@ -1,6 +1,7 @@
import { Component, OnInit } from "@angular/core"; import { Component, OnInit } from "@angular/core";
import { FormBuilder, FormGroup } from "@angular/forms"; import { FormBuilder, FormGroup } from "@angular/forms";
import { IOmbiSettings } from "../../interfaces";
import { NotificationService } from "../../services"; import { NotificationService } from "../../services";
import { SettingsService } from "../../services"; import { SettingsService } from "../../services";
@ -39,6 +40,14 @@ export class OmbiComponent implements OnInit {
return; 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 => { this.settingsService.saveOmbi(form.value).subscribe(x => {
if (x) { if (x) {
this.notificationService.success("Successfully saved Ombi settings"); this.notificationService.success("Successfully saved Ombi settings");

5
src/Ombi/wwwroot/translations/en.json
View file

@ -98,7 +98,10 @@
"AllSeasons":"All Seasons", "AllSeasons":"All Seasons",
"FirstSeason":"First Season", "FirstSeason":"First Season",
"LatestSeason":"Latest Season", "LatestSeason":"Latest Season",
"Select":"Select ..." "Select":"Select ...",
"SubmitRequest":"Submit Request",
"Season":"Season: {{seasonNumber}}",
"SelectAllInSeason":"Select All in Season {{seasonNumber}}"
} }
}, },
"Requests": { "Requests": {