diff options
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 2 | ||||
| -rw-r--r-- | core/js/multiselect.js | 13 | ||||
| -rw-r--r-- | core/js/share.js | 2 | ||||
| -rw-r--r-- | core/js/update.js | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/core/js/js.js b/core/js/js.js index f5991cfc9dd..d9b3b54e0a1 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -115,7 +115,7 @@ t.cache = {}; */ function n(app, text_singular, text_plural, count, vars) { initL10N(app); - var identifier = '_' + text_singular + '__' + text_plural + '_'; + var identifier = '_' + text_singular + '_::_' + text_plural + '_'; if( typeof( t.cache[app][identifier] ) !== 'undefined' ){ var translation = t.cache[app][identifier]; if ($.isArray(translation)) { diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 2210df3bc7a..02699636a20 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -27,6 +27,7 @@ 'onuncheck':false, 'minWidth': 'default;' }; + var slideDuration = 200; $(this).attr('data-msid', multiSelectId); $.extend(settings,options); $.each(this.children(),function(i,option) { @@ -68,12 +69,12 @@ var button=$(this); if(button.parent().children('ul').length>0) { if(self.menuDirection === 'down') { - button.parent().children('ul').slideUp(400,function() { + button.parent().children('ul').slideUp(slideDuration,function() { button.parent().children('ul').remove(); button.removeClass('active down'); }); } else { - button.parent().children('ul').fadeOut(400,function() { + button.parent().children('ul').fadeOut(slideDuration,function() { button.parent().children('ul').remove(); button.removeClass('active up'); }); @@ -81,7 +82,7 @@ return; } var lists=$('ul.multiselectoptions'); - lists.slideUp(400,function(){ + lists.slideUp(slideDuration,function(){ lists.remove(); $('div.multiselect').removeClass('active'); button.addClass('active'); @@ -276,7 +277,7 @@ }); list.addClass('down'); button.addClass('down'); - list.slideDown(); + list.slideDown(slideDuration); } else { list.css('max-height', $(document).height()-($(document).height()-(pos.top)+50)+'px'); list.css({ @@ -299,12 +300,12 @@ if(!button.parent().data('preventHide')) { // How can I save the effect in a var? if(self.menuDirection === 'down') { - button.parent().children('ul').slideUp(400,function() { + button.parent().children('ul').slideUp(slideDuration,function() { button.parent().children('ul').remove(); button.removeClass('active down'); }); } else { - button.parent().children('ul').fadeOut(400,function() { + button.parent().children('ul').fadeOut(slideDuration,function() { button.parent().children('ul').remove(); button.removeClass('active up'); }); diff --git a/core/js/share.js b/core/js/share.js index e2911ae2ff3..10ab5f47f27 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -461,7 +461,7 @@ OC.Share={ if (password != null) { $('#linkPass').show('blind'); $('#showPassword').attr('checked', true); - $('#linkPassText').attr('placeholder', t('core', 'Password protected')); + $('#linkPassText').attr('placeholder', '**********'); } $('#expiration').show(); $('#emailPrivateLink #email').show(); diff --git a/core/js/update.js b/core/js/update.js index 2c28e72f7cd..b1b7f6e37e8 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -5,7 +5,7 @@ $(document).ready(function () { }); updateEventSource.listen('error', function(message) { $('<span>').addClass('error').append(message).append('<br />').appendTo($('.update')); - message = 'Please reload the page.'; + message = t('core', 'Please reload the page.'); $('<span>').addClass('error').append(message).append('<br />').appendTo($('.update')); updateEventSource.close(); }); |