Merge branch 'develop' of https://github.com/tidusjar/ombi into develop

pull/3200/head
tidusjar 5 years ago
commit be848387e7

@ -56,7 +56,9 @@ namespace Ombi.Schedule.Jobs.Radarr
var movieIds = new List<RadarrCache>();
foreach (var m in movies)
{
if (m.tmdbId > 0 && m.monitored)
if(m.monitored)
{
if (m.tmdbId > 0)
{
movieIds.Add(new RadarrCache
{
@ -69,6 +71,7 @@ namespace Ombi.Schedule.Jobs.Radarr
Logger.LogError("TMDBId is not > 0 for movie {0}", m.title);
}
}
}
using (var tran = await _ctx.Database.BeginTransactionAsync())
{

@ -22,6 +22,14 @@ import { fadeInOutAnimation } from "../animations/fadeinout";
})
export class LoginComponent implements OnDestroy, OnInit {
public get appName(): string {
if (this.customizationSettings.applicationName) {
return this.customizationSettings.applicationName;
} else {
return "Ombi";
}
}
public form: FormGroup;
public customizationSettings: ICustomizationSettings;
public authenticationSettings: IAuthenticationSettings;
@ -32,20 +40,14 @@ export class LoginComponent implements OnDestroy, OnInit {
public loginWithOmbi: boolean;
public pinTimer: any;
public get appName(): string {
if (this.customizationSettings.applicationName) {
return this.customizationSettings.applicationName;
} else {
return "Ombi";
}
}
private timer: any;
private clientId: string;
private errorBody: string;
private errorValidation: string;
private oAuthWindow: Window|null;
constructor(private authService: AuthService, private router: Router, private notify: NotificationService, private status: StatusService,
private fb: FormBuilder, private settingsService: SettingsService, private images: ImageService, private sanitizer: DomSanitizer,
private route: ActivatedRoute, private location: PlatformLocation, private translate: TranslateService, private plexTv: PlexTvService) {
@ -127,7 +129,7 @@ export class LoginComponent implements OnDestroy, OnInit {
}
public oauth() {
const oAuthWindow = window.open(window.location.toString(), "_blank", `toolbar=0,
this.oAuthWindow = window.open(window.location.toString(), "_blank", `toolbar=0,
location=0,
status=0,
menubar=0,
@ -138,7 +140,7 @@ export class LoginComponent implements OnDestroy, OnInit {
this.plexTv.GetPin(this.clientId, this.appName).subscribe((pin: any) => {
this.authService.login({ usePlexOAuth: true, password: "", rememberMe: true, username: "", plexTvPin: pin }).subscribe(x => {
oAuthWindow!.location.replace(x.url);
this.oAuthWindow!.location.replace(x.url);
this.pinTimer = setInterval(() => {
this.notify.info("Authenticating", "Loading... Please Wait");
@ -155,6 +157,7 @@ export class LoginComponent implements OnDestroy, OnInit {
if (this.authService.loggedIn()) {
this.ngOnDestroy();
this.oAuthWindow.close();
this.router.navigate(["search"]);
return;
}

@ -45,7 +45,7 @@
},
"NavigationBar": {
"Search": "Rechercher",
"Requests": "Demandes",
"Requests": "En attente",
"UserManagement": "Gestion des utilisateurs",
"Issues": "Problèmes",
"Vote": "Vote",
@ -64,7 +64,7 @@
"Title": "Rechercher",
"Paragraph": "Vous voulez regarder quelque chose qui n'est pas disponible actuellement ? Pas de problème, recherchez-le ci-dessous et demandez-le !",
"MoviesTab": "Films",
"TvTab": "TV",
"TvTab": "Séries",
"MusicTab": "Musique",
"Suggestions": "Suggestions",
"NoResults": "Désolé, nous n'avons trouvé aucun résultat !",
@ -104,7 +104,7 @@
"Title": "Demandes",
"Paragraph": "Vous pouvez voir ci-dessous vos demandes et celles des autres, ainsi que leur statut de téléchargement et d'approbation.",
"MoviesTab": "Films",
"TvTab": "Émissions",
"TvTab": "Séries",
"MusicTab": "Musique",
"RequestedBy": "Demandé par :",
"Status": "Statut :",

@ -62,7 +62,7 @@
},
"Search": {
"Title": "Szukaj",
"Paragraph": "Chcesz obejrzeć coś, co nie jest obecnie dostępne? Żaden problem, po prostu wyszukaj poniżej i dodaj zgłoszenie!",
"Paragraph": "Chcesz obejrzeć coś, co nie jest obecnie dostępne? Żaden problem! Po prostu wyszukaj poniżej i dodaj zgłoszenie!",
"MoviesTab": "Filmy",
"TvTab": "Seriale",
"MusicTab": "Muzyka",

@ -16,171 +16,171 @@
"Monitored": "Мониторинг",
"NotAvailable": "Недоступно",
"ProcessingRequest": "Обработка запроса",
"PendingApproval": "Ожидание утверждения",
"PendingApproval": "В ожидании одобрения",
"RequestDenied": "Запрос отклонен",
"NotRequested": "Не запрошено",
"Requested": "Запрос отправлен",
"Request": "Запрос",
"Denied": "Запрещено",
"Approve": "Утвердить",
"PartlyAvailable": "Partly Available",
"Requested": "Запрошено",
"Request": "Запросить",
"Denied": "Отказано",
"Approve": "Одобрить",
"PartlyAvailable": "Частично доступно",
"Errors": {
"Validation": "Please check your entered values"
"Validation": "Пожалуйста, проверьте введенные значения"
}
},
"PasswordReset": {
"EmailAddressPlaceholder": "Email Address",
"ResetPasswordButton": "Reset Password"
"EmailAddressPlaceholder": "Адрес эл. почты",
"ResetPasswordButton": "Сбросить пароль"
},
"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": "Сейчас в сети",
"OnlineParagraph": "Медиа-сервер в настоящее время в сети",
"PartiallyOnlineHeading": "Частично в сети",
"PartiallyOnlineParagraph": "Медиа-сервер частично в сети.",
"MultipleServersUnavailable": "В сети нет {{serversUnavailable}} серверов из {{totalServers}}.",
"SingleServerUnavailable": "В сети нет {{serversUnavailable}} серверов из {{totalServers}}.",
"OfflineHeading": "В настоящее время в offline",
"OfflineParagraph": "Медиа-сервер в настоящее время не в сети.",
"CheckPageForUpdates": "Проверьте эту страницу для получения последних новостей сайта."
},
"NavigationBar": {
"Search": "Search",
"Requests": "Requests",
"UserManagement": "User Management",
"Issues": "Issues",
"Vote": "Vote",
"Donate": "Donate!",
"DonateLibraryMaintainer": "Donate to Library Maintainer",
"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",
"OpenMobileApp": "Open Mobile App",
"RecentlyAdded": "Recently Added"
"Search": "Поиск",
"Requests": "Запросы",
"UserManagement": "Управление пользователями",
"Issues": "Проблемы",
"Vote": "Голосование",
"Donate": "Поддержать!",
"DonateLibraryMaintainer": "Поддержать библиотекаря",
"DonateTooltip": "Так я убедил свою жену позволить мне тратить своё свободное время на разработку Ombi ;)",
"UpdateAvailableTooltip": "Доступно обновление!",
"Settings": "Настройки",
"Welcome": "Добро пожаловать, {{username}}",
"UpdateDetails": "Обновить детали",
"Logout": "Выйти",
"OpenMobileApp": "Открыть моб. приложение",
"RecentlyAdded": "Недавно добавленные"
},
"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",
"MusicTab": "Music",
"Suggestions": "Suggestions",
"NoResults": "Sorry, we didn't find any results!",
"DigitalDate": "Digital Release: {{date}}",
"TheatricalRelease": "Theatrical Release: {{date}}",
"ViewOnPlex": "View On Plex",
"ViewOnEmby": "View On Emby",
"RequestAdded": "Request for {{title}} has been added successfully",
"Similar": "Similar",
"Refine": "Refine",
"SearchBarPlaceholder": "Type Here to Search",
"Title": "Поиск",
"Paragraph": "Хотите посмотреть что-то, чего нет в доступе? Нет проблем, просто вбейте название и запросите!",
"MoviesTab": "Фильмы",
"TvTab": "Сериалы",
"MusicTab": "Музыка",
"Suggestions": "Рекомендации",
"NoResults": "Извините, мы ничего не нашли!",
"DigitalDate": "Дигитальный релиз: {{date}}",
"TheatricalRelease": "Релиз в кинотеатрах: {{date}}",
"ViewOnPlex": "Смотреть в Plex",
"ViewOnEmby": "Смотреть в Emby",
"RequestAdded": "Запрос на {{title}} успешно добавлен",
"Similar": "Похожие",
"Refine": "Уточнить",
"SearchBarPlaceholder": "Поиск...",
"Movies": {
"PopularMovies": "Popular Movies",
"UpcomingMovies": "Upcoming Movies",
"TopRatedMovies": "Top Rated Movies",
"NowPlayingMovies": "Now Playing Movies",
"HomePage": "Home Page",
"Trailer": "Trailer"
"PopularMovies": "Популярные фильмы",
"UpcomingMovies": "В скором времени",
"TopRatedMovies": "Фильмы с высоким рейтингом",
"NowPlayingMovies": "Сейчас в кинотеатрах",
"HomePage": "Главная страница",
"Trailer": "Трейлер"
},
"TvShows": {
"Popular": "Popular",
"Trending": "Trending",
"MostWatched": "Most Watched",
"MostAnticipated": "Most Anticipated",
"Results": "Results",
"AirDate": "Air Date:",
"AllSeasons": "All Seasons",
"FirstSeason": "First Season",
"LatestSeason": "Latest Season",
"Select": "Select ...",
"SubmitRequest": "Submit Request",
"Season": "Season: {{seasonNumber}}",
"SelectAllInSeason": "Select All in Season {{seasonNumber}}"
"Popular": "Популярное",
"Trending": "Сейчас смотрят",
"MostWatched": "Самые просматриваемые",
"MostAnticipated": "Самые ожидаемые",
"Results": "Результаты",
"AirDate": "Дата выхода:",
"AllSeasons": "Все сезоны",
"FirstSeason": "Первый сезон",
"LatestSeason": "Последний сезон",
"Select": "Выбрать...",
"SubmitRequest": "Подать запрос",
"Season": "Сезон: {{seasonNumber}}",
"SelectAllInSeason": "Выбрать все в сезоне {{seasonNumber}}"
}
},
"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",
"MusicTab": "Music",
"RequestedBy": "Requested By:",
"Status": "Status:",
"RequestStatus": "Request status:",
"Denied": " Denied:",
"TheatricalRelease": "Theatrical Release: {{date}}",
"ReleaseDate": "Released: {{date}}",
"TheatricalReleaseSort": "Theatrical Release",
"DigitalRelease": "Digital Release: {{date}}",
"RequestDate": "Request Date:",
"QualityOverride": "Quality Override:",
"RootFolderOverride": "Root Folder Override:",
"ChangeRootFolder": "Root Folder",
"ChangeQualityProfile": "Quality Profile",
"MarkUnavailable": "Mark Unavailable",
"MarkAvailable": "Mark Available",
"Remove": "Remove",
"Deny": "Deny",
"Season": "Season:",
"GridTitle": "Title",
"AirDate": "AirDate",
"GridStatus": "Status",
"ReportIssue": "Report Issue",
"Filter": "Filter",
"Sort": "Sort",
"SeasonNumberHeading": "Season: {seasonNumber}",
"SortTitleAsc": "Title ▲",
"SortTitleDesc": "Title ▼",
"SortRequestDateAsc": "Request Date ▲",
"SortRequestDateDesc": "Request Date ▼",
"SortStatusAsc": "Status ▲",
"SortStatusDesc": "Status ▼",
"Title": "Запросы",
"Paragraph": "Ниже вы можете увидеть ваши и все другие запросы, а также их статус загрузки и одобрения.",
"MoviesTab": "Фильмы",
"TvTab": "Сериалы",
"MusicTab": "Музыка",
"RequestedBy": "Автор запроса:",
"Status": "Статус:",
"RequestStatus": "Статус запроса:",
"Denied": " Отказано:",
"TheatricalRelease": "Релиз в кинотеатрах: {{date}}",
"ReleaseDate": "Дата выхода: {{date}}",
"TheatricalReleaseSort": "Релиз в кинотеатрах",
"DigitalRelease": "Дигитальный релиз: {{date}}",
"RequestDate": "Дата запроса:",
"QualityOverride": "Переопределение качества:",
"RootFolderOverride": "Переопределение корневой папки:",
"ChangeRootFolder": "Корневая папка",
"ChangeQualityProfile": "Профиль качества",
"MarkUnavailable": "Отметить недоступным",
"MarkAvailable": "Отметить доступным",
"Remove": "Удалить",
"Deny": "Отклонить",
"Season": "Сезон:",
"GridTitle": "Название",
"AirDate": "Дата",
"GridStatus": "Статус",
"ReportIssue": "Сообщить о проблеме",
"Filter": "Фильтр",
"Sort": "Сортировать",
"SeasonNumberHeading": "Сезон: {seasonNumber}",
"SortTitleAsc": "Название ▲",
"SortTitleDesc": "Название ▼",
"SortRequestDateAsc": "Дата запроса ▲",
"SortRequestDateDesc": "Дата запроса ▼",
"SortStatusAsc": "Статус ▲",
"SortStatusDesc": "Статус ▼",
"Remaining": {
"Quota": "{{remaining}}/{{total}} requests remaining",
"NextDays": "Another request will be added in {{time}} days",
"NextHours": "Another request will be added in {{time}} hours",
"NextMinutes": "Another request will be added in {{time}} minutes",
"NextMinute": "Another request will be added in {{time}} minute"
"Quota": "Осталось запросов: {{remaining}}/{{total}}",
"NextDays": "Следующий запрос будет добавлен через {{time}} дней",
"NextHours": "Следующий запрос будет добавлен через {{time}} часов",
"NextMinutes": "Следующий запрос будет добавлен через {{time}} минут",
"NextMinute": "Следующий запрос будет добавлен через {{time}} минуту"
}
},
"Issues": {
"Title": "Issues",
"PendingTitle": "Pending Issues",
"InProgressTitle": "In Progress Issues",
"ResolvedTitle": "Resolved Issues",
"ColumnTitle": "Title",
"Category": "Category",
"Status": "Status",
"Details": "Details",
"Description": "Description",
"NoComments": "No Comments!",
"MarkInProgress": "Mark In Progress",
"MarkResolved": "Mark Resolved",
"SendMessageButton": "Send",
"Subject": "Subject",
"Comments": "Comments",
"WriteMessagePlaceholder": "Write your message here...",
"ReportedBy": "Reported By"
"Title": "Проблемы",
"PendingTitle": "Проблемы в ожидании",
"InProgressTitle": "Проблемы в процессе",
"ResolvedTitle": "Решенные проблемы",
"ColumnTitle": "Название",
"Category": "Категория",
"Status": "Статус",
"Details": "Подробная информация",
"Description": "Описание",
"NoComments": "Нет комментариев!",
"MarkInProgress": "Отметить в процессе",
"MarkResolved": "Отметить как решенное",
"SendMessageButton": "Отправить",
"Subject": "Тема",
"Comments": "Комментарии",
"WriteMessagePlaceholder": "Введите текст сообщения здесь...",
"ReportedBy": "Жалоба поступила от"
},
"Filter": {
"ClearFilter": "Clear Filter",
"FilterHeaderAvailability": "Availability",
"FilterHeaderRequestStatus": "Status",
"Approved": "Approved",
"PendingApproval": "Pending Approval"
"ClearFilter": "Сбросить фильтр",
"FilterHeaderAvailability": "Доступность",
"FilterHeaderRequestStatus": "Статус",
"Approved": "Одобрено",
"PendingApproval": "В ожидании одобрения"
},
"UserManagment": {
"TvRemaining": "TV: {{remaining}}/{{total}} remaining",
"MovieRemaining": "Movies: {{remaining}}/{{total}} remaining",
"MusicRemaining": "Music: {{remaining}}/{{total}} remaining",
"TvDue": "TV: {{date}}",
"MovieDue": "Movie: {{date}}",
"MusicDue": "Music: {{date}}"
"TvRemaining": "Сериалы: {{remaining}}/{{total}} осталось",
"MovieRemaining": "Фильмы: {{remaining}}/{{total}} осталось",
"MusicRemaining": "Музыка: {{remaining}}/{{total}} осталось",
"TvDue": "Сериалы: {{date}}",
"MovieDue": "Фильм: {{date}}",
"MusicDue": "Музыка: {{date}}"
},
"Votes": {
"CompletedVotesTab": "Voted",
"VotesTab": "Votes Needed"
"CompletedVotesTab": "Проголосовано",
"VotesTab": "Необходимы голоса"
}
}

Loading…
Cancel
Save