milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update translations

Browse source
This commit is contained in:
Luke Pulverenti 2014-08-14 09:24:30 -04:00
parent 6f781f5a96
commit 668f8ba11f
22 changed files with 164 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/scripts/channelsettings.js
View file

@ -47,6 +47,7 @@
.selectmenu("refresh");
$('#txtDownloadAge', page).val(config.MaxDownloadAge || '');
$('#txtDownloadSizeLimit', page).val(config.DownloadSizeLimit || '');
$('#txtCachePath', page).val(config.DownloadPath || '');
@ -108,6 +109,7 @@
// This should be null if empty
config.PreferredStreamingWidth = $('#selectChannelResolution', form).val() || null;
config.MaxDownloadAge = $('#txtDownloadAge', form).val() || null;
config.DownloadSizeLimit = $('#txtDownloadSizeLimit', form).val() || null;
config.DownloadPath = $('#txtCachePath', form).val() || null;

7
dashboard-ui/scripts/dashboardpage.js
View file

@ -1145,10 +1145,15 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow)
limit = limit || parseInt(elem.getAttribute('data-activitylimit') || '7');
// Show last 24 hours
var minDate = new Date();
minDate.setTime(minDate.getTime() - 86400000);
ApiClient.getJSON(ApiClient.getUrl('System/ActivityLog/Entries', {
startIndex: startIndex,
limit: limit
limit: limit,
minDate: minDate.toISOString()
})).done(function (result) {

6
dashboard-ui/scripts/dlnaprofile.js
View file

@ -78,6 +78,9 @@
$('#txtMaxAllowedBitrate', page).val(profile.MaxStreamingBitrate || '');
$('#txtMaxStaticBitrate', page).val(profile.MaxStaticBitrate || '');
$('#txtMusicStreamingTranscodingBitrate', page).val(profile.MusicStreamingTranscodingBitrate || '');
$('#txtMusicStaticBitrate', page).val(profile.MusicSyncBitrate || '');
$('#chkRequiresPlainFolders', page).checked(profile.RequiresPlainFolders).checkboxradio('refresh');
$('#chkRequiresPlainVideoItems', page).checked(profile.RequiresPlainVideoItems).checkboxradio('refresh');
@ -785,6 +788,9 @@
profile.MaxStreamingBitrate = $('#txtMaxAllowedBitrate', page).val();
profile.MaxStaticBitrate = $('#LabelMaxStaticBitrateHelp', page).val();
profile.MusicStreamingTranscodingBitrate = $('#txtMusicStreamingTranscodingBitrate', page).val();
profile.MusicSyncBitrate = $('#txtMusicStaticBitrate', page).val();
profile.ProtocolInfo = $('#txtProtocolInfo', page).val();
profile.XDlnaCap = $('#txtXDlnaCap', page).val();
profile.XDlnaDoc = $('#txtXDlnaDoc', page).val();

3
dashboard-ui/scripts/indexpage.js
View file

@ -130,8 +130,7 @@
Limit: screenWidth >= 2400 ? 24 : (screenWidth >= 1600 ? 20 : (screenWidth >= 1440 ? 12 : (screenWidth >= 800 ? 9 : 8))),
Fields: "PrimaryImageAspectRatio",
IsPlayed: false,
IsFolder: false
IsPlayed: false
};
ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).done(function (items) {

12
dashboard-ui/scripts/itemlistpage.js
View file

@ -37,6 +37,12 @@
updateFilterControls(page);
var context = getParameterByName('context');
if (context == 'home') {
context = 'folders';
}
if (view == "Backdrop") {
html = LibraryBrowser.getPosterViewHtml({
@ -44,7 +50,8 @@
shape: "smallBackdrop",
showTitle: true,
centerText: true,
preferBackdrop: true
preferBackdrop: true,
context: context
});
}
else if (view == "Poster") {
@ -52,7 +59,8 @@
items: result.Items,
shape: "auto",
showTitle: true,
centerText: true
centerText: true,
context: context
});
}

54
dashboard-ui/scripts/librarybrowser.js
View file

@ -370,7 +370,7 @@
$(this).off("popupafterclose").remove();
}).parents(".ui-popup-container").css("margin-left", 55);
}).parents(".ui-popup-container").css("margin-left", 30);
},
closePlayMenu: function () {
@ -426,7 +426,7 @@
getHref: function (item, context, topParentId) {
var href = LibraryBrowser.getHrefInternal(item);
var href = LibraryBrowser.getHrefInternal(item, context);
if (context) {
href += href.indexOf('?') == -1 ? "?context=" : "&context=";
@ -445,7 +445,7 @@
return href;
},
getHrefInternal: function (item) {
getHrefInternal: function (item, context) {
if (!item) {
throw new Error('item cannot be null');
@ -466,35 +466,37 @@
return 'channelslatest.html';
}
if (item.CollectionType == 'movies') {
return 'movieslatest.html?topParentId=' + item.Id;
}
if (context != 'folders') {
if (item.CollectionType == 'movies') {
return 'movieslatest.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'boxsets') {
return 'collections.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'boxsets') {
return 'collections.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'trailers') {
return 'movietrailers.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'trailers') {
return 'movietrailers.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'movies') {
return 'movieslatest.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'movies') {
return 'movieslatest.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'tvshows') {
return 'tvrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'tvshows') {
return 'tvrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'music') {
return 'musicrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'music') {
return 'musicrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'games') {
return 'gamesrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'playlists') {
return 'playlists.html?topParentId=' + item.Id;
if (item.CollectionType == 'games') {
return 'gamesrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'playlists') {
return 'playlists.html?topParentId=' + item.Id;
}
}
if (item.Type == 'CollectionFolder') {
return 'itemlist.html?topParentId=' + item.Id + '&parentid=' + item.Id;

1
dashboard-ui/scripts/librarylist.js
View file

@ -381,7 +381,6 @@
Limit: parseInt($('.playedIndicator', card).html() || '10'),
Fields: "PrimaryImageAspectRatio,DateCreated",
ParentId: itemId,
IsFolder: false,
GroupItems: false
};

2
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -1253,7 +1253,7 @@
errorMsg += '</p>';
}
if ($.browser.msie && !$.browser.mobile) {
if ($.browser.msie && !$.browser.mobile && !self.canPlayWebm()) {
errorMsg += '<p>';
errorMsg += '<a href="https://tools.google.com/dlpage/webmmf/" target="_blank">';
errorMsg += Globalize.translate('MessageInternetExplorerWebm');

12
dashboard-ui/scripts/mediaplayer.js
View file

@ -84,7 +84,7 @@
}
// Chrome or IE with plugin installed
if (canPlayWebm()) {
if (self.canPlayWebm()) {
return '.webm';
}
@ -139,7 +139,7 @@
if (finalParams.isStatic) {
currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4');
} else {
currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension);
currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension).replace('.mkv', transcodingExtension);
}
currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate);
@ -289,7 +289,7 @@
//return false;
}
if (extension == 'm4v') {
if (extension == 'm4v' || extension == 'mkv') {
return $.browser.chrome;
}
@ -1094,7 +1094,7 @@
$(self).trigger('volumechange', [state]);
};
self.cleanup = function() {
self.cleanup = function () {
};
@ -1167,10 +1167,10 @@
}
}
function canPlayWebm() {
self.canPlayWebm = function() {
return testableVideoElement.canPlayType('video/webm').replace(/no/, '');
}
};
self.canAutoPlayAudio = function () {

16
dashboard-ui/scripts/metadataadvanced.js
View file

@ -7,6 +7,14 @@
$('#chkEnableFanartUpdates', page).checked(config.EnableFanArtUpdates).checkboxradio("refresh");
$('#txtMetadataPath', page).val(config.MetadataPath || '');
$('#chkPeopleActors', page).checked(config.PeopleMetadataOptions.DownloadActorMetadata).checkboxradio("refresh");
$('#chkPeopleComposers', page).checked(config.PeopleMetadataOptions.DownloadComposerMetadata).checkboxradio("refresh");
$('#chkPeopleDirectors', page).checked(config.PeopleMetadataOptions.DownloadDirectorMetadata).checkboxradio("refresh");
$('#chkPeopleProducers', page).checked(config.PeopleMetadataOptions.DownloadProducerMetadata).checkboxradio("refresh");
$('#chkPeopleWriters', page).checked(config.PeopleMetadataOptions.DownloadWriterMetadata).checkboxradio("refresh");
$('#chkPeopleOthers', page).checked(config.PeopleMetadataOptions.DownloadOtherPeopleMetadata).checkboxradio("refresh");
$('#chkPeopleGuestStars', page).checked(config.PeopleMetadataOptions.DownloadGuestStarMetadata).checkboxradio("refresh");
Dashboard.hideLoadingMsg();
}
@ -171,6 +179,14 @@
config.EnableFanArtUpdates = $('#chkEnableFanartUpdates', form).checked();
config.MetadataPath = $('#txtMetadataPath', form).val();
config.PeopleMetadataOptions.DownloadActorMetadata = $('#chkPeopleActors', form).checked();
config.PeopleMetadataOptions.DownloadComposerMetadata = $('#chkPeopleComposers', form).checked();
config.PeopleMetadataOptions.DownloadDirectorMetadata = $('#chkPeopleDirectors', form).checked();
config.PeopleMetadataOptions.DownloadGuestStarMetadata = $('#chkPeopleGuestStars', form).checked();
config.PeopleMetadataOptions.DownloadProducerMetadata = $('#chkPeopleProducers', form).checked();
config.PeopleMetadataOptions.DownloadWriterMetadata = $('#chkPeopleWriters', form).checked();
config.PeopleMetadataOptions.DownloadOtherPeopleMetadata = $('#chkPeopleOthers', form).checked();
ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
});
}

2
dashboard-ui/scripts/mypreferencesdisplay.js
View file

@ -7,6 +7,7 @@
$('#chkGroupMoviesIntoCollections', page).checked(user.Configuration.GroupMoviesIntoBoxSets || false).checkboxradio("refresh");
$('#chkDisplayCollectionView', page).checked(user.Configuration.DisplayCollectionsView || false).checkboxradio("refresh");
$('#chkDisplayFolderView', page).checked(user.Configuration.DisplayFoldersView || false).checkboxradio("refresh");
ApiClient.getItems(user.Id, {}).done(function (result) {
@ -77,6 +78,7 @@
user.Configuration.GroupMoviesIntoBoxSets = $('#chkGroupMoviesIntoCollections', page).checked();
user.Configuration.DisplayCollectionsView = $('#chkDisplayCollectionView', page).checked();
user.Configuration.DisplayFoldersView = $('#chkDisplayFolderView', page).checked();
user.Configuration.ExcludeFoldersFromGrouping = $(".chkGroupFolder:not(:checked)", page).get().map(function (i) {

2
dashboard-ui/scripts/playlistmanager.js
View file

@ -33,6 +33,7 @@
function getNewPlaylistPanel() {
Dashboard.showLoadingMsg();
$('.newPlaylistPanel').panel('destroy').remove();
var html = '<div data-role="panel" data-position="right" data-display="overlay" class="newPlaylistPanel" data-position-fixed="true" data-theme="a">';
@ -103,6 +104,7 @@
select.html(selectHtml).selectmenu('refresh');
select.val(lastPlaylistId || '').selectmenu('refresh').trigger('change');
Dashboard.hideLoadingMsg();
});
$('form', elem).on('submit', onAddToPlaylistFormSubmit);

13
dashboard-ui/scripts/playlists.js
View file

@ -18,9 +18,18 @@
return 'playlists' + (query.ParentId || '');
}
function showLoadingMessage(page) {
$('.popupLoading', page).popup('open');
}
function hideLoadingMessage(page) {
$('.popupLoading', page).popup('close');
}
function reloadItems(page) {
Dashboard.showLoadingMsg();
showLoadingMessage(page);
var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query);
var promise2 = Dashboard.getCurrentUser();
@ -91,7 +100,7 @@
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
Dashboard.hideLoadingMsg();
hideLoadingMessage(page);
});
}