mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-08-20 21:33:15 -07:00
Merge branch 'develop' of https://github.com/tidusjar/ombi into develop
This commit is contained in:
commit
291af1f0ad
6 changed files with 272 additions and 44 deletions
|
@ -1,6 +1,6 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## (unreleased)
|
## v3.0.4817 (2019-10-15)
|
||||||
|
|
||||||
### **New Features**
|
### **New Features**
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,7 @@
|
||||||
<!-- Movie tab -->
|
<!-- Movie tab -->
|
||||||
<div role="tabpanel" class="tab-pane active" id="MoviesTab">
|
<div role="tabpanel" class="tab-pane active" id="MoviesTab">
|
||||||
|
|
||||||
<div class="input-group search-bar-background">
|
<ng-template #FilterRef>
|
||||||
<input id="search" type="text" placeholder="{{ 'Search.SearchBarPlaceholder' | translate}}" class="form-control form-control-custom form-control-search form-control-withbuttons"
|
|
||||||
(keyup)="search($event)">
|
|
||||||
<div class="input-group-addon right-radius">
|
|
||||||
<div class="btn-group" role="group">
|
<div class="btn-group" role="group">
|
||||||
<a href="#" class="btn btn-sm btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
|
<a href="#" class="btn btn-sm btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
|
||||||
{{ 'Search.Suggestions' | translate }}
|
{{ 'Search.Suggestions' | translate }}
|
||||||
|
@ -21,10 +18,24 @@
|
||||||
<i class="fa" [ngClass]="{'fa-chevron-down': !refineSearchEnabled, 'fa-chevron-up': refineSearchEnabled}"></i>
|
<i class="fa" [ngClass]="{'fa-chevron-down': !refineSearchEnabled, 'fa-chevron-up': refineSearchEnabled}"></i>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
</ng-template>
|
||||||
|
|
||||||
|
<div class="input-group search-bar-background">
|
||||||
|
<input id="search" type="text" placeholder="{{ 'Search.SearchBarPlaceholder' | translate}}"
|
||||||
|
class="form-control form-control-custom form-control-search form-control-withbuttons"
|
||||||
|
(keyup)="search($event)">
|
||||||
|
<div class="input-group-addon right-radius">
|
||||||
|
<div class="search-button-container-inline">
|
||||||
|
<ng-template [ngTemplateOutlet]="FilterRef"></ng-template>
|
||||||
|
</div>
|
||||||
<i class="fa fa-search"></i>
|
<i class="fa fa-search"></i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="row search-button-container">
|
||||||
|
<ng-template [ngTemplateOutlet]="FilterRef"></ng-template>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Refine search options -->
|
<!-- Refine search options -->
|
||||||
<div class="row top-spacing form-group vcenter" *ngIf="refineSearchEnabled">
|
<div class="row top-spacing form-group vcenter" *ngIf="refineSearchEnabled">
|
||||||
<div class="col-md-1">
|
<div class="col-md-1">
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
padding-top: 5%
|
padding-top: 5%
|
||||||
}
|
}
|
||||||
.form-control-search {
|
.form-control-search {
|
||||||
width: 77%;
|
padding-right: 165px;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
<!-- Movie tab -->
|
<!-- Movie tab -->
|
||||||
<div role="tabpanel" class="tab-pane" id="TvShowTab">
|
<div role="tabpanel" class="tab-pane" id="TvShowTab">
|
||||||
<div class="input-group">
|
<ng-template #FilterRef>
|
||||||
<input id="search" type="text" placeholder="{{ 'Search.SearchBarPlaceholder' | translate }}" class="form-control form-control-custom form-control-search form-control-withbuttons" (keyup)="search($event)">
|
<div class="btn-group" role="group">
|
||||||
<div class="input-group-addon right-radius">
|
|
||||||
<div class="btn-group">
|
|
||||||
<a href="#" class="btn btn-sm btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
|
<a href="#" class="btn btn-sm btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
|
||||||
{{ 'Search.Suggestions' | translate }}
|
{{ 'Search.Suggestions' | translate }}
|
||||||
<i class="fa fa-chevron-down"></i>
|
<i class="fa fa-chevron-down"></i>
|
||||||
|
@ -23,10 +21,24 @@
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
</ng-template>
|
||||||
|
|
||||||
|
<div class="input-group">
|
||||||
|
<input id="search" type="text" placeholder="{{ 'Search.SearchBarPlaceholder' | translate }}"
|
||||||
|
class="form-control form-control-custom form-control-search form-control-withbuttons"
|
||||||
|
(keyup)="search($event)">
|
||||||
|
<div class="input-group-addon right-radius">
|
||||||
|
<div class="search-button-container-inline">
|
||||||
|
<ng-template [ngTemplateOutlet]="FilterRef"></ng-template>
|
||||||
|
</div>
|
||||||
<i id="tvSearchButton" class="fa fa-search"></i>
|
<i id="tvSearchButton" class="fa fa-search"></i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="row search-button-container">
|
||||||
|
<ng-template [ngTemplateOutlet]="FilterRef"></ng-template>
|
||||||
|
</div>
|
||||||
|
|
||||||
<remaining-requests [tv]="true" [quotaRefreshEvents]="tvRequested.asObservable()" #remainingTvShows></remaining-requests>
|
<remaining-requests [tv]="true" [quotaRefreshEvents]="tvRequested.asObservable()" #remainingTvShows></remaining-requests>
|
||||||
|
|
||||||
<!-- Movie content -->
|
<!-- Movie content -->
|
||||||
|
@ -161,6 +173,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<issue-report [movie]="false" [visible]="issuesBarVisible" (visibleChange)="issuesBarVisible = $event;" [title]="issueRequestTitle"
|
<issue-report [movie]="false" [visible]="issuesBarVisible" (visibleChange)="issuesBarVisible = $event;" [title]="issueRequestTitle"
|
||||||
|
|
|
@ -389,6 +389,27 @@ $border-radius: 10px;
|
||||||
padding-right: 105px;
|
padding-right: 105px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.search-button-container {
|
||||||
|
margin-top: 10px;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 450px) {
|
||||||
|
.form-control-search {
|
||||||
|
padding-right: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.search-button-container-inline {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 450px) {
|
||||||
|
.search-button-container {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.input-group-addon .btn-group {
|
.input-group-addon .btn-group {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 45px;
|
right: 45px;
|
||||||
|
|
|
@ -1,3 +1,186 @@
|
||||||
{
|
{
|
||||||
|
"Login": {
|
||||||
|
"SignInButton": "Prihláste sa",
|
||||||
|
"UsernamePlaceholder": "Užívateľské meno",
|
||||||
|
"PasswordPlaceholder": "Heslo",
|
||||||
|
"RememberMe": "Zapamätať prihlásenie",
|
||||||
|
"ForgottenPassword": "Zabudli ste heslo?",
|
||||||
|
"Errors": {
|
||||||
|
"IncorrectCredentials": "Nesprávne meno alebo heslo"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Common": {
|
||||||
|
"ContinueButton": "Pokračovať",
|
||||||
|
"Available": "Dostupné",
|
||||||
|
"PartiallyAvailable": "Čiastočne dostupné",
|
||||||
|
"Monitored": "Sledované",
|
||||||
|
"NotAvailable": "Nie je k dispozícii",
|
||||||
|
"ProcessingRequest": "Spracovávanie požiadavky",
|
||||||
|
"PendingApproval": "Čaká na schválenie",
|
||||||
|
"RequestDenied": "Požiadavka zamietnutá",
|
||||||
|
"NotRequested": "Nepožiadané",
|
||||||
|
"Requested": "Požiadané",
|
||||||
|
"Request": "Požiadať",
|
||||||
|
"Denied": "Zamietnuté",
|
||||||
|
"Approve": "Schválené",
|
||||||
|
"PartlyAvailable": "Čiastočne dostupné",
|
||||||
|
"Errors": {
|
||||||
|
"Validation": "Skontrolujte zadaný obsah"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"PasswordReset": {
|
||||||
|
"EmailAddressPlaceholder": "Emailová adresa",
|
||||||
|
"ResetPasswordButton": "Nastaviť nové heslo"
|
||||||
|
},
|
||||||
|
"LandingPage": {
|
||||||
|
"OnlineHeading": "Momentálne online",
|
||||||
|
"OnlineParagraph": "Mediálny server je momentálne online",
|
||||||
|
"PartiallyOnlineHeading": "Čiastočne online",
|
||||||
|
"PartiallyOnlineParagraph": "Mediálny server je momentálne online.",
|
||||||
|
"MultipleServersUnavailable": "Momntálne je {{serversUnavailable}} serverov offline z {{totalServers}}.",
|
||||||
|
"SingleServerUnavailable": "Momntálne je {{serversUnavailable}} server offline z {{totalServers}}.",
|
||||||
|
"OfflineHeading": "Momentálne offline",
|
||||||
|
"OfflineParagraph": "Mediálny server je momentálne offline.",
|
||||||
|
"CheckPageForUpdates": "Prezrite túto stránku pre aktualizácie."
|
||||||
|
},
|
||||||
|
"NavigationBar": {
|
||||||
|
"Search": "Hľadať",
|
||||||
|
"Requests": "Požiadavky",
|
||||||
|
"UserManagement": "Správa užívateľov",
|
||||||
|
"Issues": "Problémy",
|
||||||
|
"Vote": "Hlasovať",
|
||||||
|
"Donate": "Prispieť!",
|
||||||
|
"DonateLibraryMaintainer": "Darovať správcovi knižnice",
|
||||||
|
"DonateTooltip": "Takto som presvedčil svoju manželku, aby mi umožnila tráviť svoj voľný čas vývojom Ombi ;)",
|
||||||
|
"UpdateAvailableTooltip": "K dispozícii je aktualizácia!",
|
||||||
|
"Settings": "Nastavenie",
|
||||||
|
"Welcome": "Vitaj {{username}}",
|
||||||
|
"UpdateDetails": "Aktualizovať údaje",
|
||||||
|
"Logout": "Odhlásiť sa",
|
||||||
|
"OpenMobileApp": "Otvoriť mobilnú aplikáciu",
|
||||||
|
"RecentlyAdded": "Nedávno pridané"
|
||||||
|
},
|
||||||
|
"Search": {
|
||||||
|
"Title": "Hľadať",
|
||||||
|
"Paragraph": "Chcete sledovať niečo, čo v súčasnosti nie je k dispozícii? Žiadny problém. Vyhľadajte to nižšie a požiadajte o to!",
|
||||||
|
"MoviesTab": "Filmy",
|
||||||
|
"TvTab": "Seriály",
|
||||||
|
"MusicTab": "Hudba",
|
||||||
|
"Suggestions": "Návrhy",
|
||||||
|
"NoResults": "Ľutujeme, nenašli sme žiadne výsledky!",
|
||||||
|
"DigitalDate": "Online vydanie: {{date}}",
|
||||||
|
"TheatricalRelease": "Kino vydanie: {{date}}",
|
||||||
|
"ViewOnPlex": "Zobraziť na Plex",
|
||||||
|
"ViewOnEmby": "Zobraziť na Emby",
|
||||||
|
"RequestAdded": "Žiadosť o {{title}} bola úspešne pridaná",
|
||||||
|
"Similar": "Podobné",
|
||||||
|
"Refine": "Filtrovať",
|
||||||
|
"SearchBarPlaceholder": "Tu zadajte pre vyhľadávanie",
|
||||||
|
"Movies": {
|
||||||
|
"PopularMovies": "Populárne filmy",
|
||||||
|
"UpcomingMovies": "Očakávané filmy",
|
||||||
|
"TopRatedMovies": "Najlepšie hodnotené filmy",
|
||||||
|
"NowPlayingMovies": "Teraz prehrávané filmy",
|
||||||
|
"HomePage": "Úvodná stránka",
|
||||||
|
"Trailer": "Upútavka"
|
||||||
|
},
|
||||||
|
"TvShows": {
|
||||||
|
"Popular": "Populárne",
|
||||||
|
"Trending": "Trendy",
|
||||||
|
"MostWatched": "Najsledovanejšie",
|
||||||
|
"MostAnticipated": "Najočakávanejšie",
|
||||||
|
"Results": "Výsledky",
|
||||||
|
"AirDate": "Dátum vysielania:",
|
||||||
|
"AllSeasons": "Všetky série",
|
||||||
|
"FirstSeason": "Prvá séria",
|
||||||
|
"LatestSeason": "Posledná séria",
|
||||||
|
"Select": "Vybrať ...",
|
||||||
|
"SubmitRequest": "Poslať žiadosť",
|
||||||
|
"Season": "Séria: {{seasonNumber}}",
|
||||||
|
"SelectAllInSeason": "Vybrať všetko v danej sérii {{seasonNumber}}"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Requests": {
|
||||||
|
"Title": "Požiadavky",
|
||||||
|
"Paragraph": "Nižšie nájdete svoje a všetky ďalšie žiadosti, ako aj stav ich sťahovania a schvaľovania.",
|
||||||
|
"MoviesTab": "Filmy",
|
||||||
|
"TvTab": "Seriály",
|
||||||
|
"MusicTab": "Hudba",
|
||||||
|
"RequestedBy": "Vyžiadané od:",
|
||||||
|
"Status": "Stav:",
|
||||||
|
"RequestStatus": "Stav požiadavky:",
|
||||||
|
"Denied": " Zamietnuté:",
|
||||||
|
"TheatricalRelease": "Kino vydanie: {{date}}",
|
||||||
|
"ReleaseDate": "Vydané: {{date}}",
|
||||||
|
"TheatricalReleaseSort": "Kino vydanie",
|
||||||
|
"DigitalRelease": "Online vydanie: {{date}}",
|
||||||
|
"RequestDate": "Dátum požiadavky:",
|
||||||
|
"QualityOverride": "Prepísanie kvality:",
|
||||||
|
"RootFolderOverride": "Prepísanie Root priečinku:",
|
||||||
|
"ChangeRootFolder": "Koreňový priečinok",
|
||||||
|
"ChangeQualityProfile": "Profil kvality",
|
||||||
|
"MarkUnavailable": "Označiť nedostupné",
|
||||||
|
"MarkAvailable": "Označiť dostupné",
|
||||||
|
"Remove": "Odstrániť",
|
||||||
|
"Deny": "Odmietnuť",
|
||||||
|
"Season": "Séria:",
|
||||||
|
"GridTitle": "Názov",
|
||||||
|
"AirDate": "Dátum vysielania",
|
||||||
|
"GridStatus": "Stav",
|
||||||
|
"ReportIssue": "Nahlásiť problém",
|
||||||
|
"Filter": "Filter",
|
||||||
|
"Sort": "Triediť",
|
||||||
|
"SeasonNumberHeading": "Séria: {seasonNumber}",
|
||||||
|
"SortTitleAsc": "Názov ▲",
|
||||||
|
"SortTitleDesc": "Názov ▼",
|
||||||
|
"SortRequestDateAsc": "Dátum požiadavky ▲",
|
||||||
|
"SortRequestDateDesc": "Dátum požiadavky ▼",
|
||||||
|
"SortStatusAsc": "Stav ▲",
|
||||||
|
"SortStatusDesc": "Stav ▼",
|
||||||
|
"Remaining": {
|
||||||
|
"Quota": "{{remaining}}/{{total}} zostávajúce žiadosti",
|
||||||
|
"NextDays": "Ďalšia žiadosť bude pridaná o {{time}} dní",
|
||||||
|
"NextHours": "Ďalšia žiadosť bude pridaná o {{time}} hodín",
|
||||||
|
"NextMinutes": "Ďalšia žiadosť bude pridaná o {{time}} minút",
|
||||||
|
"NextMinute": "Ďalšia žiadosť bude pridaná o {{time}} minútu"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Issues": {
|
||||||
|
"Title": "Problémy",
|
||||||
|
"PendingTitle": "Nevyriešené problémy",
|
||||||
|
"InProgressTitle": "Riešené problémy",
|
||||||
|
"ResolvedTitle": "Vyiešené problémy",
|
||||||
|
"ColumnTitle": "Názov",
|
||||||
|
"Category": "Kategória",
|
||||||
|
"Status": "Stav",
|
||||||
|
"Details": "Podrobnosti",
|
||||||
|
"Description": "Popis",
|
||||||
|
"NoComments": "Žiadne komentáre!",
|
||||||
|
"MarkInProgress": "Označiť ako prebiehajúce",
|
||||||
|
"MarkResolved": "Označiť ako vyriešené",
|
||||||
|
"SendMessageButton": "Odoslať",
|
||||||
|
"Subject": "Predmet",
|
||||||
|
"Comments": "Komentáre",
|
||||||
|
"WriteMessagePlaceholder": "Napíšte správu sem...",
|
||||||
|
"ReportedBy": "Nahlásené od"
|
||||||
|
},
|
||||||
|
"Filter": {
|
||||||
|
"ClearFilter": "Vymazať filter",
|
||||||
|
"FilterHeaderAvailability": "Dostupnosť",
|
||||||
|
"FilterHeaderRequestStatus": "Stav",
|
||||||
|
"Approved": "Schválené",
|
||||||
|
"PendingApproval": "Čaká na schválenie"
|
||||||
|
},
|
||||||
|
"UserManagment": {
|
||||||
|
"TvRemaining": "TV: {{remaining}}/{{total}} zostávajúce",
|
||||||
|
"MovieRemaining": "Filmy: {{remaining}}/{{total}} zostávajúce",
|
||||||
|
"MusicRemaining": "Hudba: {{remaining}}/{{total}} zostávajúce",
|
||||||
|
"TvDue": "TV: {{date}}",
|
||||||
|
"MovieDue": "Film: {{date}}",
|
||||||
|
"MusicDue": "Hudba: {{date}}"
|
||||||
|
},
|
||||||
|
"Votes": {
|
||||||
|
"CompletedVotesTab": "Hlasované",
|
||||||
|
"VotesTab": "Potrebné hlasovanie"
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Add table
Add a link
Reference in a new issue