diff --git a/src/Ombi/ClientApp/app/login/resetpassword.component.ts b/src/Ombi/ClientApp/app/login/resetpassword.component.ts index 47ac2c139..3a2f7d94a 100644 --- a/src/Ombi/ClientApp/app/login/resetpassword.component.ts +++ b/src/Ombi/ClientApp/app/login/resetpassword.component.ts @@ -47,7 +47,7 @@ export class ResetPasswordComponent implements OnInit { } this.identityService.submitResetPassword(form.value.email).subscribe(x => { x.errors.forEach((val) => { - this.notify.success("Password Reset", val); + this.notify.success(val); }); }); } else { diff --git a/src/Ombi/ClientApp/app/login/tokenresetpassword.component.ts b/src/Ombi/ClientApp/app/login/tokenresetpassword.component.ts index 85370c108..91714edc3 100644 --- a/src/Ombi/ClientApp/app/login/tokenresetpassword.component.ts +++ b/src/Ombi/ClientApp/app/login/tokenresetpassword.component.ts @@ -44,7 +44,7 @@ export class TokenResetPasswordComponent implements OnInit { const token = form.value as IResetPasswordToken; this.identityService.resetPassword(token).subscribe(x => { if (x.successful) { - this.notify.success("Success", `Your Password has been reset`); + this.notify.success(`Your Password has been reset`); this.router.navigate(["login"]); } else { x.errors.forEach((val) => { diff --git a/src/Ombi/ClientApp/app/requests/movierequests.component.ts b/src/Ombi/ClientApp/app/requests/movierequests.component.ts index 7d088b7e7..784d01aee 100644 --- a/src/Ombi/ClientApp/app/requests/movierequests.component.ts +++ b/src/Ombi/ClientApp/app/requests/movierequests.component.ts @@ -74,7 +74,7 @@ export class MovieRequestsComponent implements OnInit { if(available) { this.requestService.markMovieAvailable({ id: request.id }).subscribe(x => { if (x.result) { - this.notificationService.success("Request Available", + this.notificationService.success( `${request.title} Is now available`); } else { this.notificationService.warning("Request Available", x.message ? x.message : x.errorMessage); @@ -84,7 +84,7 @@ export class MovieRequestsComponent implements OnInit { } else { this.requestService.markMovieUnavailable({ id: request.id }).subscribe(x => { if (x.result) { - this.notificationService.success("Request Available", + this.notificationService.success( `${request.title} Is now unavailable`); } else { this.notificationService.warning("Request Available", x.message ? x.message : x.errorMessage); @@ -140,7 +140,7 @@ export class MovieRequestsComponent implements OnInit { .subscribe(x => { if (x.result) { - this.notificationService.success("Request Approved", + this.notificationService.success( `Request for ${request.title} has been approved successfully`); } else { this.notificationService.warning("Request Approved", x.message ? x.message : x.errorMessage); diff --git a/src/Ombi/ClientApp/app/requests/tvrequest-children.component.ts b/src/Ombi/ClientApp/app/requests/tvrequest-children.component.ts index 6daa2dc7c..0b508d52b 100644 --- a/src/Ombi/ClientApp/app/requests/tvrequest-children.component.ts +++ b/src/Ombi/ClientApp/app/requests/tvrequest-children.component.ts @@ -33,7 +33,7 @@ export class TvRequestChildrenComponent { if(available) { this.requestService.markTvAvailable({ id: request.id }).subscribe(x => { if (x.result) { - this.notificationService.success("Request Available", + this.notificationService.success( `This request is now available`); } else { this.notificationService.warning("Request Available", x.message ? x.message : x.errorMessage); @@ -43,7 +43,7 @@ export class TvRequestChildrenComponent { } else { this.requestService.markTvUnavailable({ id: request.id }).subscribe(x => { if (x.result) { - this.notificationService.success("Request Available", + this.notificationService.success( `This request is now unavailable`); } else { this.notificationService.warning("Request Available", x.message ? x.message : x.errorMessage); @@ -64,7 +64,7 @@ export class TvRequestChildrenComponent { this.requestService.denyChild({ id: request.id }) .subscribe(x => { if (x.result) { - this.notificationService.success("Request Denied", + this.notificationService.success( `Request has been denied successfully`); } else { this.notificationService.warning("Request Denied", x.message ? x.message : x.errorMessage); @@ -84,7 +84,7 @@ export class TvRequestChildrenComponent { this.requestService.approveChild({ id: request.id }) .subscribe(x => { if (x.result) { - this.notificationService.success("Request Approved", + this.notificationService.success( `Request has been approved successfully`); } else { this.notificationService.warning("Request Approved", x.message ? x.message : x.errorMessage); diff --git a/src/Ombi/ClientApp/app/search/moviesearch.component.html b/src/Ombi/ClientApp/app/search/moviesearch.component.html index a036a371c..be857a13b 100644 --- a/src/Ombi/ClientApp/app/search/moviesearch.component.html +++ b/src/Ombi/ClientApp/app/search/moviesearch.component.html @@ -5,17 +5,17 @@
- +

@@ -23,14 +23,12 @@
-
Sorry, we didn't find any results!
+
-
- - +
poster
@@ -40,21 +38,17 @@

{{result.title}} ({{result.releaseDate | date: 'yyyy'}})

+ {{ 'Search.ReleaseDate' | translate }} {{result.releaseDate | date: 'dd/MM/yyyy'}} - Air Date: {{result.firstAired | date: 'dd/MM/yyyy'}} - - - Release Date: {{result.releaseDate | date: 'dd/MM/yyyy'}} + - HomePage - - Trailer + {{result.quality}}p - Available - Processing Request - Pending Approval - Not Requested + + + + @@ -67,34 +61,25 @@
-
- - -
-
-
- View In Plex - -
+
- + + {{ 'Common.Request' | translate }}

diff --git a/src/Ombi/ClientApp/app/search/moviesearch.component.ts b/src/Ombi/ClientApp/app/search/moviesearch.component.ts index b470429a5..751b9c5ec 100644 --- a/src/Ombi/ClientApp/app/search/moviesearch.component.ts +++ b/src/Ombi/ClientApp/app/search/moviesearch.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from "@angular/core"; +import { TranslateService } from "@ngx-translate/core"; import "rxjs/add/operator/debounceTime"; import "rxjs/add/operator/distinctUntilChanged"; import "rxjs/add/operator/map"; @@ -20,9 +21,12 @@ export class MovieSearchComponent implements OnInit { public movieResults: ISearchMovieResult[]; public result: IRequestEngineResult; public searchApplied = false; + + private requestAddedText: string; constructor(private searchService: SearchService, private requestService: RequestService, - private notificationService: NotificationService, private authService: AuthService) { + private notificationService: NotificationService, private authService: AuthService, + private readonly translate: TranslateService) { this.searchChanged .debounceTime(600) // Wait Xms afterthe last event before emitting last event @@ -52,6 +56,7 @@ export class MovieSearchComponent implements OnInit { result: false, errorMessage: "", }; + } public search(text: any) { @@ -71,9 +76,11 @@ export class MovieSearchComponent implements OnInit { this.result = x; if (this.result.result) { - this.notificationService.success("Request Added", - `Request for ${searchResult.title} has been added successfully`); - searchResult.processed = true; + + this.translate.get("Search.RequestAdded", searchResult.title).subscribe(x => { + this.notificationService.success(x); + searchResult.processed = true; + }); } else { if (this.result.errorMessage && this.result.message) { this.notificationService.warning("Request Added", `${this.result.message} - ${this.result.errorMessage}`); diff --git a/src/Ombi/ClientApp/app/search/moviesearchgrid.component.ts b/src/Ombi/ClientApp/app/search/moviesearchgrid.component.ts index 839850f6f..1122a85f9 100644 --- a/src/Ombi/ClientApp/app/search/moviesearchgrid.component.ts +++ b/src/Ombi/ClientApp/app/search/moviesearchgrid.component.ts @@ -72,7 +72,7 @@ export class MovieSearchGridComponent implements OnInit { this.result = x; if (this.result.result) { - this.notificationService.success("Request Added", + this.notificationService.success( `Request for ${searchResult.title} has been added successfully`); searchResult.processed = true; } else { diff --git a/src/Ombi/ClientApp/app/search/search.component.html b/src/Ombi/ClientApp/app/search/search.component.html index 1969bde8c..c1952c794 100644 --- a/src/Ombi/ClientApp/app/search/search.component.html +++ b/src/Ombi/ClientApp/app/search/search.component.html @@ -1,5 +1,5 @@ -

Search

-

Want to watch something that is not currently available? No problem, just search for it below and request it!

+

+


@@ -7,11 +7,11 @@ diff --git a/src/Ombi/ClientApp/app/search/search.module.ts b/src/Ombi/ClientApp/app/search/search.module.ts index e4167330d..85d08282f 100644 --- a/src/Ombi/ClientApp/app/search/search.module.ts +++ b/src/Ombi/ClientApp/app/search/search.module.ts @@ -18,6 +18,8 @@ import { SearchService } from "../services"; import { AuthGuard } from "../auth/auth.guard"; +import { SharedModule } from "../shared/shared.module"; + const routes: Routes = [ { path: "search", component: SearchComponent, canActivate: [AuthGuard] }, { path: "search/show/:id", component: SeriesInformationComponent, canActivate: [AuthGuard] }, @@ -30,6 +32,7 @@ const routes: Routes = [ RouterModule.forChild(routes), NgbModule.forRoot(), TreeTableModule, + SharedModule, ], declarations: [ SearchComponent, diff --git a/src/Ombi/ClientApp/app/search/seriesinformation.component.ts b/src/Ombi/ClientApp/app/search/seriesinformation.component.ts index f5cc98e0f..bfc071c15 100644 --- a/src/Ombi/ClientApp/app/search/seriesinformation.component.ts +++ b/src/Ombi/ClientApp/app/search/seriesinformation.component.ts @@ -44,7 +44,7 @@ export class SeriesInformationComponent implements OnInit, OnDestroy { .subscribe(x => { this.result = x as IRequestEngineResult; if (this.result.result) { - this.notificationService.success("Request Added", + this.notificationService.success( `Request for ${this.series.title} has been added successfully`); this.series.seasonRequests.forEach((season) => { diff --git a/src/Ombi/ClientApp/app/search/tvsearch.component.ts b/src/Ombi/ClientApp/app/search/tvsearch.component.ts index 11fd7c9f8..6daeb5dec 100644 --- a/src/Ombi/ClientApp/app/search/tvsearch.component.ts +++ b/src/Ombi/ClientApp/app/search/tvsearch.component.ts @@ -155,7 +155,7 @@ export class TvSearchComponent implements OnInit, OnDestroy { .subscribe(x => { this.result = x; if (this.result.result) { - this.notificationService.success("Request Added", + this.notificationService.success( `Request for ${searchResult.title} has been added successfully`); } else { if (this.result.errorMessage && this.result.message) { diff --git a/src/Ombi/ClientApp/app/services/notification.service.ts b/src/Ombi/ClientApp/app/services/notification.service.ts index eae0e20a0..5b69f61fe 100644 --- a/src/Ombi/ClientApp/app/services/notification.service.ts +++ b/src/Ombi/ClientApp/app/services/notification.service.ts @@ -10,8 +10,8 @@ export class NotificationService { this.messages = JSON.parse(JSON.stringify(this.messages)); // NOTE: THIS IS A HACK AROUND A BUG https://github.com/primefaces/primeng/issues/2943 } - public success(title: string, body: string) { - this.addMessage({ severity: "success", detail: body, summary: title }); + public success(body: string) { + this.addMessage({ severity: "success", detail: body }); } public info(title: string, body: string) { diff --git a/src/Ombi/ClientApp/app/settings/couchpotato/couchpotato.component.ts b/src/Ombi/ClientApp/app/settings/couchpotato/couchpotato.component.ts index 0421e0ec0..f4b209189 100644 --- a/src/Ombi/ClientApp/app/settings/couchpotato/couchpotato.component.ts +++ b/src/Ombi/ClientApp/app/settings/couchpotato/couchpotato.component.ts @@ -59,9 +59,9 @@ export class CouchPotatoComponent implements OnInit { this.settingsService.saveCouchPotatoSettings(settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved the CouchPotato settings"); + this.notificationService.success("Successfully saved the CouchPotato settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the CouchPotato settings"); + this.notificationService.success("There was an error when saving the CouchPotato settings"); } }); } @@ -74,7 +74,7 @@ export class CouchPotatoComponent implements OnInit { const settings = form.value; this.testerService.couchPotatoTest(settings).subscribe(x => { if (x === true) { - this.notificationService.success("Connected", "Successfully connected to CouchPotato!"); + this.notificationService.success("Successfully connected to CouchPotato!"); } else { this.notificationService.error("We could not connect to CouchPotato!"); } @@ -85,7 +85,7 @@ export class CouchPotatoComponent implements OnInit { this.couchPotatoService.getApiKey(form.value).subscribe(x => { if (x.success === true) { (this.form.controls.apiKey).setValue(x.api_key); - this.notificationService.success("Api Key", "Successfully got the Api Key"); + this.notificationService.success("Successfully grabbed the Api Key"); } else { this.notificationService.error("Could not get the Api Key"); } diff --git a/src/Ombi/ClientApp/app/settings/customization/customization.component.ts b/src/Ombi/ClientApp/app/settings/customization/customization.component.ts index 5f3c94f31..8871725cd 100644 --- a/src/Ombi/ClientApp/app/settings/customization/customization.component.ts +++ b/src/Ombi/ClientApp/app/settings/customization/customization.component.ts @@ -21,9 +21,9 @@ export class CustomizationComponent implements OnInit { public save() { this.settingsService.saveCustomization(this.settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved Ombi settings"); + this.notificationService.success("Successfully saved Ombi settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Ombi settings"); + this.notificationService.success("There was an error when saving the Ombi settings"); } }); } diff --git a/src/Ombi/ClientApp/app/settings/dognzb/dognzb.component.ts b/src/Ombi/ClientApp/app/settings/dognzb/dognzb.component.ts index cb8e61e02..aff18f64e 100644 --- a/src/Ombi/ClientApp/app/settings/dognzb/dognzb.component.ts +++ b/src/Ombi/ClientApp/app/settings/dognzb/dognzb.component.ts @@ -37,9 +37,9 @@ export class DogNzbComponent implements OnInit { this.settingsService.saveDogNzbSettings(settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved the DogNzb settings"); + this.notificationService.success("Successfully saved the DogNzb settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the DogNzb settings"); + this.notificationService.success("There was an error when saving the DogNzb settings"); } }); } diff --git a/src/Ombi/ClientApp/app/settings/emby/emby.component.ts b/src/Ombi/ClientApp/app/settings/emby/emby.component.ts index 015f82013..c2752a973 100644 --- a/src/Ombi/ClientApp/app/settings/emby/emby.component.ts +++ b/src/Ombi/ClientApp/app/settings/emby/emby.component.ts @@ -39,7 +39,7 @@ export class EmbyComponent implements OnInit { public test(server: IEmbyServer) { this.testerService.embyTest(server).subscribe(x => { if (x === true) { - this.notificationService.success("Connected", `Successfully connected to the Emby server ${server.name}!`); + this.notificationService.success(`Successfully connected to the Emby server ${server.name}!`); } else { this.notificationService.error(`We could not connect to the Emby server ${server.name}!`); } @@ -56,9 +56,9 @@ export class EmbyComponent implements OnInit { public save() { this.settingsService.saveEmby(this.settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved Emby settings"); + this.notificationService.success("Successfully saved Emby settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Emby settings"); + this.notificationService.success("There was an error when saving the Emby settings"); } }); } @@ -66,7 +66,7 @@ export class EmbyComponent implements OnInit { public runCacher(): void { this.jobService.runEmbyCacher().subscribe(x => { if(x) { - this.notificationService.success("Running","Triggered the Emby Content Cacher"); + this.notificationService.success("Triggered the Emby Content Cacher"); } }); } diff --git a/src/Ombi/ClientApp/app/settings/landingpage/landingpage.component.ts b/src/Ombi/ClientApp/app/settings/landingpage/landingpage.component.ts index 37d6cd1b6..c79c66ff7 100644 --- a/src/Ombi/ClientApp/app/settings/landingpage/landingpage.component.ts +++ b/src/Ombi/ClientApp/app/settings/landingpage/landingpage.component.ts @@ -22,9 +22,9 @@ export class LandingPageComponent implements OnInit { public save() { this.settingsService.saveLandingPage(this.settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved the Landing Page settings"); + this.notificationService.success("Successfully saved the Landing Page settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Landing Page settings"); + this.notificationService.success("There was an error when saving the Landing Page settings"); } }); } diff --git a/src/Ombi/ClientApp/app/settings/notifications/discord.component.ts b/src/Ombi/ClientApp/app/settings/notifications/discord.component.ts index bfc48e06e..d2fee12ee 100644 --- a/src/Ombi/ClientApp/app/settings/notifications/discord.component.ts +++ b/src/Ombi/ClientApp/app/settings/notifications/discord.component.ts @@ -44,9 +44,9 @@ export class DiscordComponent implements OnInit { this.settingsService.saveDiscordNotificationSettings(settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved the Discord settings"); + this.notificationService.success("Successfully saved the Discord settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Discord settings"); + this.notificationService.success("There was an error when saving the Discord settings"); } }); @@ -60,9 +60,9 @@ export class DiscordComponent implements OnInit { this.testerService.discordTest(form.value).subscribe(x => { if (x) { - this.notificationService.success("Successful", "Successfully sent a Discord message, please check the discord channel"); + this.notificationService.success("Successfully sent a Discord message, please check the discord channel"); } else { - this.notificationService.success("Error", "There was an error when sending the Discord message. Please check your settings"); + this.notificationService.error("There was an error when sending the Discord message. Please check your settings"); } }); diff --git a/src/Ombi/ClientApp/app/settings/notifications/emailnotification.component.ts b/src/Ombi/ClientApp/app/settings/notifications/emailnotification.component.ts index dba955f7f..ec0428c75 100644 --- a/src/Ombi/ClientApp/app/settings/notifications/emailnotification.component.ts +++ b/src/Ombi/ClientApp/app/settings/notifications/emailnotification.component.ts @@ -59,9 +59,9 @@ export class EmailNotificationComponent implements OnInit { this.settingsService.saveEmailNotificationSettings(settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved Email settings"); + this.notificationService.success("Successfully saved Email settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Email settings"); + this.notificationService.success("There was an error when saving the Email settings"); } }); @@ -75,9 +75,9 @@ export class EmailNotificationComponent implements OnInit { this.testerService.emailTest(form.value).subscribe(x => { if (x === true) { - this.notificationService.success("Sent", "Successfully sent an email message, please check your inbox"); + this.notificationService.success("Successfully sent an email message, please check your inbox"); } else { - this.notificationService.success("Error", "There was an error when sending the Email message, please check your settings."); + this.notificationService.error("There was an error when sending the Email message, please check your settings."); } }); } diff --git a/src/Ombi/ClientApp/app/settings/notifications/mattermost.component.ts b/src/Ombi/ClientApp/app/settings/notifications/mattermost.component.ts index bef5da618..b512d6a86 100644 --- a/src/Ombi/ClientApp/app/settings/notifications/mattermost.component.ts +++ b/src/Ombi/ClientApp/app/settings/notifications/mattermost.component.ts @@ -46,9 +46,9 @@ export class MattermostComponent implements OnInit { this.settingsService.saveMattermostNotificationSettings(settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved the Mattermost settings"); + this.notificationService.success("Successfully saved the Mattermost settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Mattermost settings"); + this.notificationService.success("There was an error when saving the Mattermost settings"); } }); @@ -62,9 +62,9 @@ export class MattermostComponent implements OnInit { this.testerService.mattermostTest(form.value).subscribe(x => { if (x) { - this.notificationService.success("Successful", "Successfully sent a Mattermost message, please check the discord channel"); + this.notificationService.success( "Successfully sent a Mattermost message, please check the discord channel"); } else { - this.notificationService.success("Error", "There was an error when sending the Mattermost message. Please check your settings"); + this.notificationService.error("There was an error when sending the Mattermost message. Please check your settings"); } }); diff --git a/src/Ombi/ClientApp/app/settings/notifications/pushbullet.component.ts b/src/Ombi/ClientApp/app/settings/notifications/pushbullet.component.ts index 2ac87c1b5..af681e692 100644 --- a/src/Ombi/ClientApp/app/settings/notifications/pushbullet.component.ts +++ b/src/Ombi/ClientApp/app/settings/notifications/pushbullet.component.ts @@ -42,9 +42,9 @@ export class PushbulletComponent implements OnInit { this.settingsService.savePushbulletNotificationSettings(settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved the Pushbullet settings"); + this.notificationService.success("Successfully saved the Pushbullet settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Pushbullet settings"); + this.notificationService.success("There was an error when saving the Pushbullet settings"); } }); @@ -58,9 +58,9 @@ export class PushbulletComponent implements OnInit { this.testerService.pushbulletTest(form.value).subscribe(x => { if (x) { - this.notificationService.success("Successful", "Successfully sent a Pushbullet message"); + this.notificationService.success("Successfully sent a Pushbullet message"); } else { - this.notificationService.success("Error", "There was an error when sending the Pushbullet message. Please check your settings"); + this.notificationService.error("There was an error when sending the Pushbullet message. Please check your settings"); } }); diff --git a/src/Ombi/ClientApp/app/settings/notifications/pushover.component.ts b/src/Ombi/ClientApp/app/settings/notifications/pushover.component.ts index 9ceefc9fe..51acb5d31 100644 --- a/src/Ombi/ClientApp/app/settings/notifications/pushover.component.ts +++ b/src/Ombi/ClientApp/app/settings/notifications/pushover.component.ts @@ -42,9 +42,9 @@ export class PushoverComponent implements OnInit { this.settingsService.savePushoverNotificationSettings(settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved the Pushover settings"); + this.notificationService.success( "Successfully saved the Pushover settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Pushover settings"); + this.notificationService.success("There was an error when saving the Pushover settings"); } }); @@ -58,9 +58,9 @@ export class PushoverComponent implements OnInit { this.testerService.pushoverTest(form.value).subscribe(x => { if (x) { - this.notificationService.success("Successful", "Successfully sent a Pushover message"); + this.notificationService.success( "Successfully sent a Pushover message"); } else { - this.notificationService.success("Error", "There was an error when sending the Pushover message. Please check your settings"); + this.notificationService.error("There was an error when sending the Pushover message. Please check your settings"); } }); } diff --git a/src/Ombi/ClientApp/app/settings/notifications/slack.component.ts b/src/Ombi/ClientApp/app/settings/notifications/slack.component.ts index 109768168..f4c727154 100644 --- a/src/Ombi/ClientApp/app/settings/notifications/slack.component.ts +++ b/src/Ombi/ClientApp/app/settings/notifications/slack.component.ts @@ -51,9 +51,9 @@ export class SlackComponent implements OnInit { this.settingsService.saveSlackNotificationSettings(settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved the Slack settings"); + this.notificationService.success( "Successfully saved the Slack settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Slack settings"); + this.notificationService.success( "There was an error when saving the Slack settings"); } }); @@ -73,9 +73,9 @@ export class SlackComponent implements OnInit { } this.testerService.slackTest(settings).subscribe(x => { if (x) { - this.notificationService.success("Successful", "Successfully sent a Slack message, please check the discord channel"); + this.notificationService.success( "Successfully sent a Slack message, please check the discord channel"); } else { - this.notificationService.success("Error", "There was an error when sending the Slack message. Please check your settings"); + this.notificationService.error("There was an error when sending the Slack message. Please check your settings"); } }); diff --git a/src/Ombi/ClientApp/app/settings/ombi/ombi.component.ts b/src/Ombi/ClientApp/app/settings/ombi/ombi.component.ts index 9f5063339..59a81ab71 100644 --- a/src/Ombi/ClientApp/app/settings/ombi/ombi.component.ts +++ b/src/Ombi/ClientApp/app/settings/ombi/ombi.component.ts @@ -40,14 +40,14 @@ export class OmbiComponent implements OnInit { this.settingsService.saveOmbi(form.value).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved Ombi settings"); + this.notificationService.success("Successfully saved Ombi settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Ombi settings"); + this.notificationService.success("There was an error when saving the Ombi settings"); } }); } public successfullyCopied() { - this.notificationService.success("Copied", "Copied the Api Key to the clipboard!"); + this.notificationService.success("Copied the Api Key to the clipboard!"); } } diff --git a/src/Ombi/ClientApp/app/settings/plex/plex.component.ts b/src/Ombi/ClientApp/app/settings/plex/plex.component.ts index c49f2cf6f..61b57b393 100644 --- a/src/Ombi/ClientApp/app/settings/plex/plex.component.ts +++ b/src/Ombi/ClientApp/app/settings/plex/plex.component.ts @@ -40,7 +40,7 @@ export class PlexComponent implements OnInit, OnDestroy { if (x.success) { this.loadedServers = x; this.serversButton = true; - this.notificationService.success("Loaded", "Found the servers! Please select one!"); + this.notificationService.success("Found the servers! Please select one!"); } else { this.notificationService.warning("Error When Requesting Plex Servers", "Please make sure your username and password are correct"); } @@ -55,13 +55,13 @@ export class PlexComponent implements OnInit, OnDestroy { server.port = parseInt(selectedServer.port); server.ssl = selectedServer.scheme === "http" ? false : true; - this.notificationService.success("Success", `Selected ${server.name}!`); + this.notificationService.success(`Selected ${server.name}!`); } public testPlex(server: IPlexServer) { this.testerService.plexTest(server).subscribe(x => { if (x === true) { - this.notificationService.success("Connected", `Successfully connected to the Plex server ${server.name}!`); + this.notificationService.success(`Successfully connected to the Plex server ${server.name}!`); } else { this.notificationService.error(`We could not connect to the Plex server ${server.name}!`); } @@ -111,9 +111,9 @@ export class PlexComponent implements OnInit, OnDestroy { this.settings.servers = filtered; this.settingsService.savePlex(this.settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved Plex settings"); + this.notificationService.success("Successfully saved Plex settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Plex settings"); + this.notificationService.success("There was an error when saving the Plex settings"); } }); } @@ -121,7 +121,7 @@ export class PlexComponent implements OnInit, OnDestroy { public runCacher(): void { this.jobService.runPlexCacher().subscribe(x => { if(x) { - this.notificationService.success("Running","Triggered the Plex Content Cacher"); + this.notificationService.success("Triggered the Plex Content Cacher"); } }); } diff --git a/src/Ombi/ClientApp/app/settings/radarr/radarr.component.ts b/src/Ombi/ClientApp/app/settings/radarr/radarr.component.ts index 97b43e13c..30f74e300 100644 --- a/src/Ombi/ClientApp/app/settings/radarr/radarr.component.ts +++ b/src/Ombi/ClientApp/app/settings/radarr/radarr.component.ts @@ -73,7 +73,7 @@ export class RadarrComponent implements OnInit { this.qualities.unshift({ name: "Please Select", id: -1 }); this.profilesRunning = false; - this.notificationService.success("Quality Profiles", "Successfully retrieved the Quality Profiles"); + this.notificationService.success("Successfully retrieved the Quality Profiles"); }); } @@ -84,7 +84,7 @@ export class RadarrComponent implements OnInit { this.rootFolders.unshift({ path: "Please Select", id: -1 }); this.rootFoldersRunning = false; - this.notificationService.success("Settings Saved", "Successfully retrieved the Root Folders"); + this.notificationService.success("Successfully retrieved the Root Folders"); }); } @@ -96,7 +96,7 @@ export class RadarrComponent implements OnInit { const settings = form.value; this.testerService.radarrTest(settings).subscribe(x => { if (x === true) { - this.notificationService.success("Connected", "Successfully connected to Radarr!"); + this.notificationService.success("Successfully connected to Radarr!"); } else { this.notificationService.error("We could not connect to Radarr!"); } @@ -116,9 +116,9 @@ public onSubmit(form: FormGroup) { const settings = form.value; this.settingsService.saveRadarr(settings).subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved Radarr settings"); + this.notificationService.success("Successfully saved Radarr settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Radarr settings"); + this.notificationService.success("There was an error when saving the Radarr settings"); } }); diff --git a/src/Ombi/ClientApp/app/settings/sonarr/sonarr.component.ts b/src/Ombi/ClientApp/app/settings/sonarr/sonarr.component.ts index 767b3e445..bb69760ef 100644 --- a/src/Ombi/ClientApp/app/settings/sonarr/sonarr.component.ts +++ b/src/Ombi/ClientApp/app/settings/sonarr/sonarr.component.ts @@ -66,7 +66,7 @@ export class SonarrComponent implements OnInit { this.qualities.unshift({ name: "Please Select", id: -1 }); this.profilesRunning = false; - this.notificationService.success("Quality Profiles", "Successfully retrieved the Quality Profiles"); + this.notificationService.success("Successfully retrieved the Quality Profiles"); }); } @@ -78,7 +78,7 @@ export class SonarrComponent implements OnInit { this.rootFolders.unshift({ path: "Please Select", id: -1 }); this.rootFoldersRunning = false; - this.notificationService.success("Settings Saved", "Successfully retrieved the Root Folders"); + this.notificationService.success("Successfully retrieved the Root Folders"); }); } @@ -90,7 +90,7 @@ export class SonarrComponent implements OnInit { const settings = form.value; this.testerService.sonarrTest(settings).subscribe(x => { if (x) { - this.notificationService.success("Connected", "Successfully connected to Sonarr!"); + this.notificationService.success("Successfully connected to Sonarr!"); } else { this.notificationService.error("We could not connect to Sonarr!"); } @@ -116,7 +116,7 @@ export class SonarrComponent implements OnInit { this.settingsService.saveSonarr(form.value) .subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved Sonarr settings"); + this.notificationService.success("Successfully saved Sonarr settings"); } else { this.notificationService.error("There was an error when saving the Sonarr settings"); } diff --git a/src/Ombi/ClientApp/app/settings/update/update.component.ts b/src/Ombi/ClientApp/app/settings/update/update.component.ts index cbc942c7d..d1ea90a53 100644 --- a/src/Ombi/ClientApp/app/settings/update/update.component.ts +++ b/src/Ombi/ClientApp/app/settings/update/update.component.ts @@ -42,16 +42,16 @@ export class UpdateComponent implements OnInit { this.updateService.checkForNewUpdate().subscribe(x => { if (x === true) { this.updateAvailable = true; - this.notificationService.success("Update", "There is a new update available"); + this.notificationService.success("There is a new update available"); } else { - this.notificationService.success("Update", "You are on the latest version!"); + this.notificationService.success("You are on the latest version!"); } }); } public update() { this.updateService.forceUpdate().subscribe(); - this.notificationService.success("Update", "We triggered the update job"); + this.notificationService.success("We triggered the update job"); } public onSubmit(form: FormGroup) { @@ -63,7 +63,7 @@ export class UpdateComponent implements OnInit { this.settingsService.saveUpdateSettings(form.value) .subscribe(x => { if (x) { - this.notificationService.success("Settings Saved", "Successfully saved Update settings"); + this.notificationService.success("Successfully saved Update settings"); } else { this.notificationService.error("There was an error when saving the Update settings"); } diff --git a/src/Ombi/ClientApp/app/settings/usermanagement/usermanagement.component.ts b/src/Ombi/ClientApp/app/settings/usermanagement/usermanagement.component.ts index 6a6e0b684..66babd94a 100644 --- a/src/Ombi/ClientApp/app/settings/usermanagement/usermanagement.component.ts +++ b/src/Ombi/ClientApp/app/settings/usermanagement/usermanagement.component.ts @@ -95,9 +95,9 @@ export class UserManagementComponent implements OnInit { this.settingsService.saveUserManagementSettings(this.settings).subscribe(x => { if (x === true) { - this.notificationService.success("Saved", "Successfully saved the User Management Settings"); + this.notificationService.success("Successfully saved the User Management Settings"); } else { - this.notificationService.success("Settings Saved", "There was an error when saving the Ombi settings"); + this.notificationService.success( "There was an error when saving the Ombi settings"); } }); } diff --git a/src/Ombi/ClientApp/app/shared/shared.module.ts b/src/Ombi/ClientApp/app/shared/shared.module.ts new file mode 100644 index 000000000..6fe06db43 --- /dev/null +++ b/src/Ombi/ClientApp/app/shared/shared.module.ts @@ -0,0 +1,13 @@ +import { CommonModule } from "@angular/common"; +import { NgModule } from "@angular/core"; +import { FormsModule } from "@angular/forms"; +import { TranslateModule } from "@ngx-translate/core"; + +@NgModule({ + exports: [ + TranslateModule, + CommonModule, + FormsModule, + ], +}) +export class SharedModule {} diff --git a/src/Ombi/ClientApp/app/usermanagement/updatedetails.component.ts b/src/Ombi/ClientApp/app/usermanagement/updatedetails.component.ts index b899f036d..26cb3f16d 100644 --- a/src/Ombi/ClientApp/app/usermanagement/updatedetails.component.ts +++ b/src/Ombi/ClientApp/app/usermanagement/updatedetails.component.ts @@ -46,7 +46,7 @@ export class UpdateDetailsComponent implements OnInit { this.identityService.updateLocalUser(this.form.value).subscribe(x => { if (x.successful) { - this.notificationService.success("Updated", `All of your details have now been updated`); + this.notificationService.success(`All of your details have now been updated`); } else { x.errors.forEach((val) => { this.notificationService.error(val); diff --git a/src/Ombi/ClientApp/app/usermanagement/usermanagement-add.component.ts b/src/Ombi/ClientApp/app/usermanagement/usermanagement-add.component.ts index 43f74badb..76968b126 100644 --- a/src/Ombi/ClientApp/app/usermanagement/usermanagement-add.component.ts +++ b/src/Ombi/ClientApp/app/usermanagement/usermanagement-add.component.ts @@ -54,7 +54,7 @@ export class UserManagementAddComponent implements OnInit { this.identityService.createUser(this.user).subscribe(x => { if (x.successful) { - this.notificationSerivce.success("Updated", `The user ${this.user.userName} has been created successfully`); + this.notificationSerivce.success(`The user ${this.user.userName} has been created successfully`); this.router.navigate(["usermanagement"]); } else { x.errors.forEach((val) => { diff --git a/src/Ombi/ClientApp/app/usermanagement/usermanagement-edit.component.ts b/src/Ombi/ClientApp/app/usermanagement/usermanagement-edit.component.ts index 75196a98f..e82ed2eba 100644 --- a/src/Ombi/ClientApp/app/usermanagement/usermanagement-edit.component.ts +++ b/src/Ombi/ClientApp/app/usermanagement/usermanagement-edit.component.ts @@ -38,7 +38,7 @@ export class UserManagementEditComponent { accept: () => { this.identityService.deleteUser(this.user).subscribe(x => { if (x.successful) { - this.notificationService.success("Deleted", `The user ${this.user.userName} was deleted`); + this.notificationService.success(`The user ${this.user.userName} was deleted`); this.router.navigate(["usermanagement"]); } else { x.errors.forEach((val) => { @@ -57,7 +57,7 @@ export class UserManagementEditComponent { public resetPassword() { this.identityService.submitResetPassword(this.user.emailAddress).subscribe(x => { if (x.successful) { - this.notificationService.success("Reset", `Sent reset password email to ${this.user.emailAddress}`); + this.notificationService.success(`Sent reset password email to ${this.user.emailAddress}`); this.router.navigate(["usermanagement"]); } else { x.errors.forEach((val) => { @@ -82,7 +82,7 @@ export class UserManagementEditComponent { this.identityService.updateUser(this.user).subscribe(x => { if (x.successful) { - this.notificationService.success("Updated", `The user ${this.user.userName} has been updated successfully`); + this.notificationService.success(`The user ${this.user.userName} has been updated successfully`); this.router.navigate(["usermanagement"]); } else { x.errors.forEach((val) => { diff --git a/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.ts b/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.ts index ccce2cb51..d6544e8fc 100644 --- a/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.ts +++ b/src/Ombi/ClientApp/app/usermanagement/usermanagement.component.ts @@ -37,7 +37,7 @@ export class UserManagementComponent implements OnInit { return; } this.identityService.sendWelcomeEmail(user).subscribe(); - this.notificationService.success("Email", `Sent a welcome email to ${user.emailAddress}`); + this.notificationService.success(`Sent a welcome email to ${user.emailAddress}`); } public checkAllBoxes() { diff --git a/src/Ombi/wwwroot/translations/en.json b/src/Ombi/wwwroot/translations/en.json index 54e039f1a..c47402407 100644 --- a/src/Ombi/wwwroot/translations/en.json +++ b/src/Ombi/wwwroot/translations/en.json @@ -11,6 +11,12 @@ }, "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" } @@ -53,5 +59,24 @@ "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" + } } }