0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

update wording of message when trying to drag & remove clips from a list in item view

Browse source
This commit is contained in:
rolux 2013-07-18 08:13:47 +00:00
parent 069cfc155d
commit 5e3e4de939
1 changed files with 42 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
static/js/utils.js
View file

@ -30,7 +30,7 @@ pandora.addEdit = function(options) {
} }
}).reloadList(); }).reloadList();
} }
} };
pandora.addList = function() { pandora.addList = function() {
// addList(isSmart, isFrom) or addList(list) [=duplicate] // addList(isSmart, isFrom) or addList(list) [=duplicate]
@ -286,6 +286,7 @@ pandora.createLinks = function($element) {
}; };
pandora.enableDragAndDrop = function($list, canMove, section) { pandora.enableDragAndDrop = function($list, canMove, section) {
section = section || pandora.user.ui.section; section = section || pandora.user.ui.section;
var $tooltip = Ox.Tooltip({ var $tooltip = Ox.Tooltip({
@ -481,48 +482,67 @@ pandora.enableDragAndDrop = function($list, canMove, section) {
function getTitle() { function getTitle() {
var image, text, var image, text,
targetName = section == 'items' ? {
plural: Ox._('lists'),
singular: Ox._('list')
} : {
plural: Ox._(section),
singular: Ox._(section.slice(0, -1))
},
itemName = section == 'items' ? { itemName = section == 'items' ? {
plural: Ox._(pandora.site.itemName.plural.toLowerCase()), plural: Ox._(pandora.site.itemName.plural.toLowerCase()),
singular: Ox._(pandora.site.itemName.singular.toLowerCase()) singular: Ox._(pandora.site.itemName.singular.toLowerCase())
} : { } : {
plural: Ox._('clips'), plural: Ox._('clips'),
singular: Ox._('clip') singular: Ox._('clip')
},
targetName = section == 'items' ? {
plural: Ox._('lists'),
singular: Ox._('list')
} : {
plural: Ox._('edits'),
singular: Ox._('edit')
}; };
if (drag.action == 'move' && drag.source.user != pandora.user.username) { if (drag.action == 'move' && section == 'edits' && pandora.user.ui.section == 'items') {
image = 'symbolClose'; image = 'symbolClose';
text = Ox._('You can only remove {0}<br/>from your own {1}.', text = Ox._(
[itemName.plural, targetName.plural]); 'You can only remove {0}<br>from {1}.',
[itemName.plural, targetName.plural]
);
} else if (drag.action == 'move' && drag.source.user != pandora.user.username) {
image = 'symbolClose';
text = Ox._(
'You can only remove {0}<br>from your own {1}.',
[itemName.plural, targetName.plural]
);
} else if (drag.action == 'move' && drag.source.type == 'smart') { } else if (drag.action == 'move' && drag.source.type == 'smart') {
image = 'symbolClose'; image = 'symbolClose';
text = Ox._('You can\'t remove {0}<br/>from smart {1}.', text = Ox._(
[itemName.plural, targetName.plural]); 'You can\'t remove {0}<br>from smart {1}.',
[itemName.plural, targetName.plural]
);
} else if (drag.target && drag.target.user != pandora.user.username) { } else if (drag.target && drag.target.user != pandora.user.username) {
image = 'symbolClose'; image = 'symbolClose';
text = Ox._('You can only {0} {1}<br/>to your own {2}', text = Ox._(
[drag.action, itemName.plural, targetName.plural]); 'You can only {0} {1}<br>to your own {2}',
[drag.action, itemName.plural, targetName.plural]
);
} else if (drag.target && drag.target.type == 'smart') { } else if (drag.target && drag.target.type == 'smart') {
image = 'symbolClose'; image = 'symbolClose';
text = Ox._('You can\'t {0} {1}<br/>to smart {2}', text = Ox._(
[drag.action, itemName.plural, targetName.plural]); 'You can\'t {0} {1}<br>to smart {2}',
[drag.action, itemName.plural, targetName.plural]
);
} else { } else {
image = drag.action == 'copy' ? 'symbolAdd' : 'symbolRemove'; image = drag.action == 'copy' ? 'symbolAdd' : 'symbolRemove';
text = Ox._(Ox.toTitleCase(drag.action)) + ' ' + ( text = Ox._(Ox.toTitleCase(drag.action)) + ' ' + (
Ox.isString(drag.item) Ox.isString(drag.item)
? '"' + drag.item + '"' ? '"' + drag.item + '"'
: drag.item + ' ' + itemName[drag.item == 1 ? 'singular' : 'plural'] : drag.item + ' ' + itemName[drag.item == 1 ? 'singular' : 'plural']
) + '<br/>' + ( ) + '<br>' + (
drag.target && !drag.target.selected drag.target && !drag.target.selected
? Ox._('to the {0} "{1}"', [name.singular, Ox.encodeHTMLEntities(drag.target.name)]) ? Ox._(
: Ox._('to ' + (section == 'items' 'to the {0} "{1}"',
[targetName.singular, Ox.encodeHTMLEntities(drag.target.name)]
)
: Ox._(
'to ' + (section == 'items'
? (pandora.user.ui._list ? 'another' : 'a') + ' ' + targetName.singular ? (pandora.user.ui._list ? 'another' : 'a') + ' ' + targetName.singular
: 'an ' + targetName.singular)) : 'an ' + targetName.singular)
)
); );
} }
return $('<div>') return $('<div>')
@ -1306,7 +1326,7 @@ pandora.getStatusText = function(data) {
} }
if (canSeeMedia) { if (canSeeMedia) {
data.files && parts.push( data.files && parts.push(
Ox.formatCount(data.files, 'file') Ox.toTitleCase(Ox.formatCount(data.files, 'file'))
); );
data.duration && parts.push(Ox.formatDuration(data.duration)); data.duration && parts.push(Ox.formatDuration(data.duration));
} }