1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

fix recording cancel

This commit is contained in:
Luke Pulverenti 2016-10-25 02:17:02 -04:00
parent da603728ba
commit be5357c365
48 changed files with 60 additions and 18 deletions

View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.322",
"_release": "1.4.322",
"version": "1.4.324",
"_release": "1.4.324",
"_resolution": {
"type": "version",
"tag": "1.4.322",
"commit": "2d485829160b70374abe2d36631e7725096d1285"
"tag": "1.4.324",
"commit": "65e5d919b19f4b447aee6914ee8c40347c4e98ff"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

View file

@ -964,8 +964,8 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
if (item.RecordAnyChannel) {
lines.push(globalize.translate('sharedcomponents#AllChannels'));
}
else if (item.ChannelId) {
lines.push(item.ChannelName || '');
else {
lines.push(item.ChannelName || globalize.translate('sharedcomponents#OneChannel'));
}
}

View file

@ -1,4 +1,4 @@
define(['globalize', 'loading'], function (globalize, loading) {
define(['globalize', 'loading', 'connectionManager'], function (globalize, loading, connectionManager) {
'use strict';
function changeRecordingToSeries(apiClient, timerId, programId) {

View file

@ -350,5 +350,6 @@
"MessageDidYouKnowCinemaMode": "Did you know that with Emby Premiere, you can enhance your experience with features like Cinema Mode?",
"MessageDidYouKnowCinemaMode2": "Cinema Mode gives you the true cinema experience with trailers and custom intros before the main feature.",
"HeaderPlayMyMedia": "Play my Media",
"HeaderDiscoverEmbyPremiere": "Discover Emby Premiere"
"HeaderDiscoverEmbyPremiere": "Discover Emby Premiere",
"OneChannel": "One channel"
}

View file

@ -25,7 +25,7 @@
<div class="is-active pageTabContent ehsContent fullWidth" id="suggestionsTab" data-index="0">
<div id="resumableSection" class="homePageSection hide">
<div>
<h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderResume}</h1>
<h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderContinueWatching}</h1>
<button is="emby-button" type="button" class="raised submit mini categorySyncButton button-accent" data-category="Resume">
<span>${ButtonSync}</span>
</button>

View file

@ -503,7 +503,7 @@
var html = '';
if (result.Items.length) {
html += '<h1 class="listHeader">' + Globalize.translate('HeaderResume') + '</h1>';
html += '<h1 class="listHeader">' + Globalize.translate('HeaderContinueWatching') + '</h1>';
if (enableScrollX()) {
html += '<div is="emby-itemscontainer" class="hiddenScrollX itemsContainer">';
} else {

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "\u062e\u0631\u0648\u062c",
"LabelApiDocumentation": "\u0645\u0639\u0644\u0648\u0645\u0627\u062a \u0645\u062f\u062e\u0644 \u0628\u0631\u0645\u062c\u0629 \u0627\u0644\u062a\u0637\u0628\u064a\u0642",
"LabelBrowseLibrary": "\u062a\u0635\u0641\u062d \u0627\u0644\u0645\u0643\u062a\u0628\u0629",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "\u0412\u044b\u0445\u0430\u0434",
"LabelApiDocumentation": "\u0414\u0430\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u044b\u044f \u043f\u0430 API",
"LabelBrowseLibrary": "\u041d\u0430\u0432\u0456\u0433\u0430\u0446\u044b\u044f \u043f\u0430 \u043c\u0435\u0434\u044b\u044f\u0442\u044d\u0446\u044b",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "\u0418\u0437\u0445\u043e\u0434",
"LabelApiDocumentation": "API \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f",
"LabelBrowseLibrary": "\u0420\u0430\u0437\u0433\u043b\u0435\u0434\u0430\u0439 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430\u0442\u0430",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Sortir",
"LabelApiDocumentation": "Documentaci\u00f3 de l'API",
"LabelBrowseLibrary": "Examina la Biblioteca",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Zav\u0159\u00edt",
"LabelApiDocumentation": "Dokumentace API",
"LabelBrowseLibrary": "Proch\u00e1zet knihovnu",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Afslut",
"LabelApiDocumentation": "Api dokumentation",
"LabelBrowseLibrary": "Gennemse bibliotek",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Beenden",
"LabelApiDocumentation": "Api Dokumentation",
"LabelBrowseLibrary": "Bibliothek durchsuchen",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "\u0388\u03be\u03bf\u03b4\u03bf\u03c2",
"LabelApiDocumentation": "\u03a4\u03b5\u03ba\u03bc\u03b7\u03c1\u03af\u03c9\u03c3\u03b7 API",
"LabelBrowseLibrary": "\u03a0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03b8\u03b5\u03af\u03c4\u03b5 \u03c3\u03c4\u03b7 \u03b2\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Exit",
"LabelApiDocumentation": "API Documentation",
"LabelBrowseLibrary": "Browse Library",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Salir",
"LabelApiDocumentation": "Documentaci\u00f3n API",
"LabelBrowseLibrary": "Browse Library",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Salir",
"LabelApiDocumentation": "Documentaci\u00f3n de la API",
"LabelBrowseLibrary": "Explorar Biblioteca",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Salir",
"LabelApiDocumentation": "Documentaci\u00f3n API",
"LabelBrowseLibrary": "Navegar biblioteca",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Poistu",
"LabelApiDocumentation": "Api Documentation",
"LabelBrowseLibrary": "Selaa Kirjastoa",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Quitter",
"LabelApiDocumentation": "Documentation de l'API",
"LabelBrowseLibrary": "Parcourir la biblioth\u00e8que",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Quitter",
"LabelApiDocumentation": "Documentation Api",
"LabelBrowseLibrary": "Parcourir la Biblioth\u00e8que",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Quitter",
"LabelApiDocumentation": "Documentation de l'API",
"LabelBrowseLibrary": "Parcourir la biblioth\u00e8que",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Verlasse",
"LabelApiDocumentation": "API Dokumentatione",
"LabelBrowseLibrary": "Dursuech d'Bibliothek",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "\u05d9\u05e6\u05d9\u05d0\u05d4",
"LabelApiDocumentation": "\u05ea\u05d9\u05e2\u05d5\u05d3 API",
"LabelBrowseLibrary": "\u05d3\u05e4\u05d3\u05e3 \u05d1\u05e1\u05e4\u05e8\u05d9\u05d4",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Izlaz",
"LabelApiDocumentation": "Api dokumentacija",
"LabelBrowseLibrary": "Pregledaj biblioteku",
@ -1557,7 +1558,7 @@
"LabelPlayMethodDirectPlay": "Direktno izvo\u0111enje",
"LabelAudioCodec": "Audio: {0}",
"LabelVideoCodec": "Video: {0}",
"LabelLocalAccessUrl": "Lokalni pristup: {0}",
"LabelLocalAccessUrl": "Lokalni (ku\u0107ni) pristup: {0}",
"LabelRemoteAccessUrl": "Udaljeni pristup: {0}",
"LabelRunningOnPort": "Izvodi se na http port-u {0}.",
"LabelRunningOnPorts": "Izvodi se na http port-u {0} i na https port-u {1}.",
@ -1932,8 +1933,8 @@
"SyncJobItemStatusCancelled": "Otkazan",
"LabelProfile": "Profil:",
"LabelBitrateMbps": "Brzina prijenosa (Mbps):",
"EmbyIntroDownloadMessage": "Da biste preuzeli i instalirali Emby Server posjetite {0}",
"EmbyIntroDownloadMessageWithoutLink": "Da biste preuzeli i instalirali Emby Server posjetite Emby web stranice.",
"EmbyIntroDownloadMessage": "Da biste preuzeli i instalirali besplatni Emby Server posjetite {0}.",
"EmbyIntroDownloadMessageWithoutLink": "Da biste preuzeli i instalirali besplatni Emby Server posjetite Emby web stranice.",
"ButtonNewServer": "Novi Server",
"MyDevice": "Moj ure\u0111aj",
"ButtonRemote": "Daljinski",
@ -2094,7 +2095,7 @@
"MapChannels": "Mapiraj kanale",
"LabelffmpegPath": "FFmpeg putanja:",
"LabelffmpegVersion": "FFmpeg verzija:",
"LabelffmpegPathHelp": "Putanja do preuzete FFmpeg aplikacije ili mape koja sadr\u017ei FFmpeg.",
"LabelffmpegPathHelp": "Putanja do FFmpeg aplikacijske datoteke ili mape koja sadr\u017ei FFmpeg.",
"SetupFFmpeg": "FFmpeg postavke",
"SetupFFmpegHelp": "Emby mo\u017ee zahtijevati biblioteku ili program za konvertiranje odre\u0111enih vrsta medija. Postoji mnogo razli\u010ditih aplikacija koje su dostupne, me\u0111utim, Emby je testiran za rad s FFmpeg. Emby ni na koji na\u010din nije povezan s FFmpeg, vlasni\u0161tvo, kod ili distribuciju.",
"EnterFFmpegLocation": "Unesi FFmpeg putanju",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Kil\u00e9p\u00e9s",
"LabelApiDocumentation": "Api dokument\u00e1ci\u00f3",
"LabelBrowseLibrary": "M\u00e9diat\u00e1r tall\u00f3z\u00e1sa",
@ -1800,7 +1801,7 @@
"MediaInfoLongitude": "Longitude",
"MediaInfoShutterSpeed": "Shutter speed",
"MediaInfoSoftware": "Software",
"HeaderMoreLikeThis": "More Like This",
"HeaderMoreLikeThis": "M\u00e9g t\u00f6bb hasonl\u00f3",
"HeaderMovies": "Filmek",
"HeaderAlbums": "Albumok",
"HeaderGames": "Games",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Keluar",
"LabelApiDocumentation": "Dokumentasi Api",
"LabelBrowseLibrary": "Telusuri Pustaka",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Esci",
"LabelApiDocumentation": "Documentazione Api",
"LabelBrowseLibrary": "Esplora la libreria",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "\u0428\u044b\u0493\u0443",
"LabelApiDocumentation": "API \u049b\u04b1\u0436\u0430\u0442\u0442\u0430\u043c\u0430\u0441\u044b",
"LabelBrowseLibrary": "\u0422\u0430\u0441\u044b\u0493\u044b\u0448\u0445\u0430\u043d\u0430\u043d\u044b \u0448\u043e\u043b\u0443",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "\uc885\ub8cc",
"LabelApiDocumentation": "Api \ubb38\uc11c",
"LabelBrowseLibrary": "\ub77c\uc774\ube0c\ub7ec\ub9ac \ud0d0\uc0c9",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Tutup",
"LabelApiDocumentation": "Api Documentation",
"LabelBrowseLibrary": "Imbas Pengumpulan",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Avslutt",
"LabelApiDocumentation": "API-dokumentasjon",
"LabelBrowseLibrary": "Browse biblioteket",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Afsluiten",
"LabelApiDocumentation": "Api documentatie",
"LabelBrowseLibrary": "Bekijk bibliotheek",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Wyj\u015bcie",
"LabelApiDocumentation": "Dokumantacja API",
"LabelBrowseLibrary": "Przegl\u0105daj bibliotek\u0119",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Sair",
"LabelApiDocumentation": "Documenta\u00e7\u00e3o da Api",
"LabelBrowseLibrary": "Explorar Biblioteca",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Sair",
"LabelApiDocumentation": "Documenta\u00e7\u00e3o da API",
"LabelBrowseLibrary": "Navegar pela Biblioteca",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Iesire",
"LabelApiDocumentation": "Documentatie Api",
"LabelBrowseLibrary": "Rasfoieste Librarie",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "\u0412\u044b\u0445\u043e\u0434",
"LabelApiDocumentation": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u043f\u043e API",
"LabelBrowseLibrary": "\u041d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044f \u043f\u043e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0435",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Exit",
"LabelApiDocumentation": "Api Documentation",
"LabelBrowseLibrary": "Browse Library",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Izhod",
"LabelApiDocumentation": "Api Dokumentacija",
"LabelBrowseLibrary": "Brskanje po knjiznici",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Avsluta",
"LabelApiDocumentation": "Api-dokumentation",
"LabelBrowseLibrary": "Bl\u00e4ddra i biblioteket",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Cikis",
"LabelApiDocumentation": "Api Documentation",
"LabelBrowseLibrary": "K\u00fct\u00fcphane",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "\u0412\u0438\u0439\u0442\u0438",
"LabelApiDocumentation": "Api Documentation",
"LabelBrowseLibrary": "Browse Library",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "Tho\u00e1t",
"LabelApiDocumentation": "Api Documentation",
"LabelBrowseLibrary": "Duy\u1ec7t th\u01b0 vi\u1ec7n",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "\u9000\u51fa",
"LabelApiDocumentation": "API\u6587\u6863",
"LabelBrowseLibrary": "\u6d4f\u89c8\u5a92\u4f53\u5e93",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "\u96e2\u958b",
"LabelApiDocumentation": "Api \u6587\u4ef6",
"LabelBrowseLibrary": "\u700f\u89bd\u8cc7\u6599\u5eab",

View file

@ -1,4 +1,5 @@
{
"HeaderContinueWatching": "Continue Watching",
"LabelExit": "\u96e2\u958b",
"LabelApiDocumentation": "API\u8aaa\u660e\u6587\u4ef6",
"LabelBrowseLibrary": "\u700f\u89bd\u5a92\u9ad4\u6ac3",

View file

@ -29,7 +29,7 @@
<div class="is-active pageTabContent ehsContent fullWidth" id="suggestionsTab" data-index="0">
<div id="resumableSection" class="homePageSection">
<div>
<h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderResume}</h1>
<h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderContinueWatching}</h1>
<button is="emby-button" type="button" class="raised mini categorySyncButton button-accent" data-category="Resume">
<span>${ButtonSync}</span>
</button>