open-source-mirrors
/
Ombi
mirror of https://github.com/Ombi-app/Ombi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issues from the merge

Browse Source
pull/470/head
tidusjar 9 years ago
parent f590c4ac2c
commit 8d0f890494
3 changed files with 154 additions and 106 deletions
Show Stats Download Patch File Download Diff File

1
PlexRequests.UI/Modules/SearchModule.cs
Unescape View File

@ -496,6 +496,7 @@ namespace PlexRequests.UI.Modules
return Response.AsJson(new JsonResponseModel
{
Result = false,
Message = Resources.UI.Search_CouchPotatoError
});
}

115
PlexRequests.UI/Resources/UI.it.resx
Unescape View File

@ -148,19 +148,19 @@
<value>Plex Requests</value>
</data>
<data name="Layout_UpdateAvailablePart1" xml:space="preserve">
<value>C'è un nuovo aggiornamento disponibile! Clic</value>
<value>C'è un nuovo aggiornamento disponibile!</value>
</data>
<data name="Layout_Search" xml:space="preserve">
<value>Cerca!</value>
<value>Cerca</value>
</data>
<data name="Layout_Requests" xml:space="preserve">
<value>Requests</value>
<value>Richieste</value>
</data>
<data name="Layout_Issues" xml:space="preserve">
<value>problemi quantificati</value>
<value>Problemi</value>
</data>
<data name="Layout_Donate" xml:space="preserve">
<value>Donazione</value>
<value>Dona!</value>
</data>
<data name="Layout_Admin" xml:space="preserve">
<value>admin</value>
@ -172,7 +172,7 @@
<value>Modifica password</value>
</data>
<data name="Layout_Logout" xml:space="preserve">
<value>Disconnettersi</value>
<value>Disconnettiti</value>
</data>
<data name="Layout_English" xml:space="preserve">
<value>Inglese</value>
@ -208,31 +208,31 @@
<value>Film</value>
</data>
<data name="Search_TvShows" xml:space="preserve">
<value>Spettacoli TV</value>
<value>Serie TV</value>
</data>
<data name="Search_Albums" xml:space="preserve">
<value>Album</value>
<value>Msuica</value>
</data>
<data name="Search_Paragraph" xml:space="preserve">
<value>Voglia di guardare qualcosa che non è attualmente il Plex?! Non c'è problema! Basta cercare per esso qui sotto e richiederla!</value>
<value>Vuoi guardare qualcosa che non è attualmente in Plex?! Non c'è problema! Basta cercarla qui sotto e richiederla!</value>
</data>
<data name="Search_Suggestions" xml:space="preserve">
<value>Suggerimenti</value>
</data>
<data name="Search_ComingSoon" xml:space="preserve">
<value>Novita</value>
<value>Novità</value>
</data>
<data name="Search_InTheaters" xml:space="preserve">
<value>Nei Cinema</value>
</data>
<data name="Search_SendNotificationText" xml:space="preserve">
<value>Inviami una notifica quando sono stati aggiunti elementi che ho chiesto!</value>
<value>Inviami una notifica quando sono stati aggiunti gli elementi che ho richiesto!</value>
</data>
<data name="Common_Save" xml:space="preserve">
<value>Salva</value>
</data>
<data name="Search_Available" xml:space="preserve">
<value>disponibili</value>
<value>Disponibile</value>
</data>
<data name="Search_Requested" xml:space="preserve">
<value>Richiesto</value>
@ -250,7 +250,7 @@
<value>Ultima stagione</value>
</data>
<data name="Search_SelectSeason" xml:space="preserve">
<value>seleziona</value>
<value>Seleziona</value>
</data>
<data name="Search_ReportIssue" xml:space="preserve">
<value>Segnala il problema</value>
@ -268,10 +268,10 @@
<value>Problemi di riproduzione</value>
</data>
<data name="Issues_Other" xml:space="preserve">
<value>Altre</value>
<value>Altro</value>
</data>
<data name="Search_TrackCount" xml:space="preserve">
<value>Conta di pista</value>
<value>Numero della traccia</value>
</data>
<data name="Search_Country" xml:space="preserve">
<value>Nazione</value>
@ -286,19 +286,19 @@
<value>Aggiungere un problema</value>
</data>
<data name="Issues_Modal_Save" xml:space="preserve">
<value>Salva Cambia</value>
<value>Salva cambiamenti</value>
</data>
<data name="Search_Season" xml:space="preserve">
<value>Stagione</value>
</data>
<data name="Layout_Welcome" xml:space="preserve">
<value>Benvenuta</value>
<value>Benvenuto/a</value>
</data>
<data name="Requests_Title" xml:space="preserve">
<value>Requests</value>
<value>Richieste</value>
</data>
<data name="Requests_Paragraph" xml:space="preserve">
<value>Qui sotto potete vedere il vostro e tutte le altre richieste, così come il loro download e l'approvazione dello stato</value>
<value>Qui sotto potete vedere le vostre e tutte le altre richieste, così come il loro download e l'approvazione</value>
</data>
<data name="Requests_MoviesTabTitle" xml:space="preserve">
<value>Film</value>
@ -307,37 +307,37 @@
<value>Spettacoli TV</value>
</data>
<data name="Requests_AlbumsTabTitle" xml:space="preserve">
<value>Album</value>
<value>Musica</value>
</data>
<data name="Requests_DeleteMovies" xml:space="preserve">
<value>Cancellare i filmati</value>
<value>Elimina richiesta film</value>
</data>
<data name="Requests_ApproveMovies" xml:space="preserve">
<value>Approva Film</value>
</data>
<data name="Requests_DeleteTVShows" xml:space="preserve">
<value>Cancellare programmi TV</value>
<value>Elimina richiesta Serie TV</value>
</data>
<data name="Requests_ApproveTvShows" xml:space="preserve">
<value>Approvare programmi TV</value>
<value>Approva Serie TV</value>
</data>
<data name="Requests_DeleteMusic" xml:space="preserve">
<value>Eliminare la musica</value>
<value>Elimina richieste musica</value>
</data>
<data name="Requests_ApproveMusic" xml:space="preserve">
<value>Approva Musica</value>
</data>
<data name="Requests_Filter_All" xml:space="preserve">
<value>Tutto ciò</value>
<value>Tutto</value>
</data>
<data name="Requests_Filter_Approved" xml:space="preserve">
<value>Approvato</value>
</data>
<data name="Requests_Filter_NotApproved" xml:space="preserve">
<value>Approvato</value>
<value>Non approvato</value>
</data>
<data name="Requests_Filter_Available" xml:space="preserve">
<value>disponibili</value>
<value>Disponibile</value>
</data>
<data name="Requests_Filter_NotAvailable" xml:space="preserve">
<value>Non disponibile</value>
@ -355,28 +355,28 @@
<value>Filtro</value>
</data>
<data name="Requests_Order_LatestRequests" xml:space="preserve">
<value>Ultimi Richieste</value>
<value>Ultime richieste</value>
</data>
<data name="Requests_Order_OldestRequests" xml:space="preserve">
<value>I più vecchi richieste</value>
<value>Richieste più vecchie</value>
</data>
<data name="Requests_Order_LatestReleases" xml:space="preserve">
<value>Ultime uscite</value>
</data>
<data name="Requests_Order_OldestReleases" xml:space="preserve">
<value>I più vecchi uscite</value>
<value>Uscite più vecchie</value>
</data>
<data name="Requests_ReleaseDate" xml:space="preserve">
<value>Data di disponibilità</value>
</data>
<data name="Requests_SeasonsRequested" xml:space="preserve">
<value>Stagioni obbligatorio</value>
<value>Stagioni richieste</value>
</data>
<data name="Requests_RequestedBy" xml:space="preserve">
<value>Richiesto</value>
<value>Richiesto da</value>
</data>
<data name="Requests_RequestedDate" xml:space="preserve">
<value>Richiesto</value>
<value>Richiesto il</value>
</data>
<data name="Requests_ToggleDropdown" xml:space="preserve">
<value>Imposta/rimuovi a discesa</value>
@ -385,7 +385,7 @@
<value>Approva</value>
</data>
<data name="Common_Remove" xml:space="preserve">
<value>Togliere</value>
<value>Rimuovere</value>
</data>
<data name="Requests_MarkUnavailable" xml:space="preserve">
<value>Segna non disponibile</value>
@ -397,9 +397,54 @@
<value>Approvato</value>
</data>
<data name="Requests_Available" xml:space="preserve">
<value>disponibili</value>
<value>Disponibile</value>
</data>
<data name="Issues_Issue" xml:space="preserve">
<value>Problema</value>
</data>
<data name="Search_SuccessfullyAdded" xml:space="preserve">
<value>è stato aggiunto correttamente!</value>
</data>
<data name="Search_AlreadyRequested" xml:space="preserve">
<value>è già stato richiesto!</value>
</data>
<data name="Search_CouldNotCheckPlex" xml:space="preserve">
<value>Non siamo riusciti a controllare se {0} è in Plex, sei sicuro che sia configurato correttamente?</value>
</data>
<data name="Search_CouchPotatoError" xml:space="preserve">
<value>Qualcosa è andato storto aggiungendo il film a CouchPotato! Controlla le impostazioni</value>
</data>
<data name="Search_WeeklyRequestLimitMovie" xml:space="preserve">
<value>Hai raggiunto il numero massimo di richieste settimanali per i Film! Contatta l'amministratore</value>
</data>
<data name="Search_AlreadyInPlex" xml:space="preserve">
<value>è già disponibile in Plex!</value>
</data>
<data name="Search_SickrageError" xml:space="preserve">
<value>Qualcosa è andato storto aggiungendo il film a SickRage! Controlla le impostazioni</value>
</data>
<data name="Search_TvNotSetUp" xml:space="preserve">
<value>Le richieste per le Serie TV non sono correttamente impostate. Contatta l'amministratore</value>
</data>
<data name="Search_WeeklyRequestLimitAlbums" xml:space="preserve">
<value>Hai raggiunto il numero massimo di richieste settimanali per la Musica! Contatta l'amministratore</value>
</data>
<data name="Search_MusicBrainzError" xml:space="preserve">
<value>Non siamo riusciti a trovare l'artista in MusicBrainz. Riprova più tardi oppure contatta l'amministratore</value>
</data>
<data name="Search_WeeklyRequestLimitTVShow" xml:space="preserve">
<value>Hai raggiunto il numero massimo di richieste settimanali per le Serie TV! Contatta l'amministratore</value>
</data>
<data name="Search_ErrorPlexAccountOnly" xml:space="preserve">
<value>Spiacente, ma questa funzione è disponibile solo per gli utenti con un account Plex.</value>
</data>
<data name="Search_ErrorNotEnabled" xml:space="preserve">
<value>Spiacente, ma l'amministratore non ha ancora abilitato questa funzionalità.</value>
</data>
<data name="Search_NotificationError" xml:space="preserve">
<value>Non è stato possibile rimuovere la notifica perchè non l'hai mai avuta.</value>
</data>
<data name="Common_CouldNotSave" xml:space="preserve">
<value>Impossibile salvare, riprova più tardi.</value>
</data>
</root>

140
PlexRequests.UI/Views/Shared/_Layout.cshtml
Unescape View File

@ -24,74 +24,76 @@
<body>
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="@url/search">@UI.Layout_Title</a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
@Html.GetNavbarUrl(Context, "/search", UI.Layout_Search, "search")
@Html.GetNavbarUrl(Context, "/requests", UI.Layout_Requests, "plus-circle")
@Html.GetNavbarUrl(Context, "/issues", UI.Layout_Issues, "exclamation", "<span id=\"issueCount\"></span>")
@if (Context.CurrentUser.IsAuthenticated()) // TODO replace with IsAdmin
{
<li><a id="donate" href="https://www.paypal.me/PlexRequestsNet" target="_blank"><i class="fa fa-heart" style="color: red"></i> @UI.Layout_Donate</a></li>
}
</ul>
<ul class="nav navbar-nav navbar-right">
@if (!Context.CurrentUser.IsAuthenticated() && Context.Request.Session[SessionKeys.UsernameKey] == null) // TODO replace with IsAdmin
{
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="@url/search">@UI.Layout_Title</a>
</div>
<li><a href="@url/login?redirect=@Context.Request.Path"><i class="fa fa-user"></i> @UI.Layout_Admin</a></li>
}
@if (Context.CurrentUser.IsAuthenticated()) // TODO replace with IsAdmin
{
<li><a>@UI.Layout_Welcome @Context.Request.Session[SessionKeys.UsernameKey]</a></li>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
@Html.GetNavbarUrl(Context, "/search", UI.Layout_Search, "search")
@Html.GetNavbarUrl(Context, "/requests", UI.Layout_Requests, "plus-circle")
@Html.GetNavbarUrl(Context, "/issues", UI.Layout_Issues, "exclamation", "<span id=\"issueCount\"></span>")
@if (Context.CurrentUser.IsAuthenticated()) // TODO replace with IsAdmin
{
<li><a id="donate" href="https://www.paypal.me/PlexRequestsNet" target="_blank"><i class="fa fa-heart" style="color: red"></i> @UI.Layout_Donate</a></li>
}
</ul>
<ul class="nav navbar-nav navbar-right">
@if (!Context.CurrentUser.IsAuthenticated() && Context.Request.Session[SessionKeys.UsernameKey] == null) // TODO replace with IsAdmin
{
<li><a href="@url/login?redirect=@Context.Request.Path"><i class="fa fa-user"></i> @UI.Layout_Admin</a></li>
}
@if (Context.CurrentUser.IsAuthenticated()) // TODO replace with IsAdmin
{
<li><a>@UI.Layout_Welcome @Context.Request.Session[SessionKeys.UsernameKey]</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-user"></i> @UI.Layout_Admin <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="@url/admin"><i class="fa fa-cog"></i> @UI.Layout_Settings</a></li>
<li><a href="@url/changepassword"><i class="fa fa-key"></i> @UI.Layout_ChangePassword</a></li>
<li class="divider"></li>
<li><a href="@url/logout"><i class="fa fa-sign-out"></i> @UI.Layout_Logout</a></li>
</ul>
</li>
}
@if (Context.Request.Session[SessionKeys.UsernameKey] != null && !Context.CurrentUser.IsAuthenticated())
{
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-user"></i> @UI.Layout_Welcome @Context.Request.Session[SessionKeys.UsernameKey] <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="@url/login?redirect=@Context.Request.Path"><i class="fa fa-user"></i> @UI.Layout_Admin</a></li>
<li class="divider"></li>
<li><a href="@url/userlogin/logout"><i class="fa fa-sign-out"></i> @UI.Layout_Logout</a></li>
</ul>
</li>
}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-user"></i> @UI.Layout_Admin <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="@url/admin"><i class="fa fa-cog"></i> @UI.Layout_Settings</a></li>
<li><a href="@url/changepassword"><i class="fa fa-key"></i> @UI.Layout_ChangePassword</a></li>
<li class="divider"></li>
<li><a href="@url/logout"><i class="fa fa-sign-out"></i> @UI.Layout_Logout</a></li>
</ul>
</li>
}
@if (Context.Request.Session[SessionKeys.UsernameKey] != null && !Context.CurrentUser.IsAuthenticated())
{
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-user"></i> @UI.Layout_Welcome @Context.Request.Session[SessionKeys.UsernameKey] <span class="caret"></span></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-language" aria-hidden="true"><span class="caret"></span></i></a>
<ul class="dropdown-menu" role="menu">
<li><a href="@url/login?redirect=@Context.Request.Path"><i class="fa fa-user"></i> @UI.Layout_Admin</a></li>
<li class="divider"></li>
<li><a href="@url/userlogin/logout"><i class="fa fa-sign-out"></i> @UI.Layout_Logout</a></li>
<li><a href="@url/culture?l=en&u=@Context.Request.Path">@UI.Layout_English</a></li>
<li><a href="@url/culture?l=nl&u=@Context.Request.Path">@UI.Layout_Dutch</a></li>
<li><a href="@url/culture?l=es&u=@Context.Request.Path">@UI.Layout_Spanish</a></li>
<li><a href="@url/culture?l=de&u=@Context.Request.Path">@UI.Layout_German</a></li>
<li><a href="@url/culture?l=da&u=@Context.Request.Path">@UI.Layout_Danish</a></li>
<li><a href="@url/culture?l=pt&u=@Context.Request.Path">@UI.Layout_Portuguese</a></li>
<li><a href="@url/culture?l=sv&u=@Context.Request.Path">@UI.Layout_Swedish</a></li>
<li><a href="@url/culture?l=it&u=@Context.Request.Path">@UI.Layout_Italian</a></li>
</ul>
</li>
}
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-language" aria-hidden="true"><span class="caret"></span></i></a>
<ul class="dropdown-menu" role="menu">
<li><a href="@url/culture?l=en&u=@Context.Request.Path">@UI.Layout_English</a></li>
<li><a href="@url/culture?l=nl&u=@Context.Request.Path">@UI.Layout_Dutch</a></li>
<li><a href="@url/culture?l=es&u=@Context.Request.Path">@UI.Layout_Spanish</a></li>
<li><a href="@url/culture?l=de&u=@Context.Request.Path">@UI.Layout_German</a></li>
<li><a href="@url/culture?l=da&u=@Context.Request.Path">@UI.Layout_Danish</a></li>
<li><a href="@url/culture?l=pt&u=@Context.Request.Path">@UI.Layout_Portuguese</a></li>
<li><a href="@url/culture?l=sv&u=@Context.Request.Path">@UI.Layout_Swedish</a></li>
<li><a href="@url/culture?l=it&u=@Context.Request.Path">@UI.Layout_Italian</a></li>
<li />
</ul>
</div>
</div>
@ -107,15 +109,10 @@
</span>
</div>
</body>
@Html.GetInformationalVersion();
</html>
<script>
function donateClick(url) {
ga('send', 'event', 'Navbar', 'Donate', 'Donate Clicked');
var redirectWindow = window.open(url, '_blank');
redirectWindow.location;
}
$(function () {
var urlBase = '@Html.GetBaseUrl()';
@ -177,6 +174,11 @@
// End issue count
$('#donate').click(function () {
ga('send', 'event', 'Navbar', 'Donate', 'Donate Clicked');
});
});
function scrollToTop() {

Write Preview
Loading…
Cancel
Save