From 74b02db3371992968ced963f104afd368b7e6473 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 5 Apr 2013 01:56:32 +0200 Subject: [PATCH] Fixed things in alert-messages Two parameters for OC.dialogs.alert, otherwise one will be "undefined". Also fixed missing translation. --- apps/files/js/files.js | 8 ++++---- apps/files_trashbin/js/trash.js | 8 ++++---- core/js/oc-vcategories.js | 12 ++++++------ settings/js/apps.js | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 6c5536aafa..e847550444 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -615,7 +615,7 @@ $(document).ready(function() { tr.find('td.filename').attr('style','background-image:url('+path+')'); }); } else { - OC.dialogs.alert(result.data.message, 'Error'); + OC.dialogs.alert(result.data.message, t('files', 'Error')); } } ); @@ -631,7 +631,7 @@ $(document).ready(function() { var tr=$('tr').filterAttr('data-file',name); tr.attr('data-id', result.data.id); } else { - OC.dialogs.alert(result.data.message, 'Error'); + OC.dialogs.alert(result.data.message, t('files', 'Error')); } } ); @@ -920,7 +920,7 @@ var folderDropOptions={ $('#notification').fadeIn(); } } else { - OC.dialogs.alert(t('Error moving file')); + OC.dialogs.alert(t('Error moving file'), t('files', 'Error')); } }); }); @@ -958,7 +958,7 @@ var crumbDropOptions={ $('#notification').fadeIn(); } } else { - OC.dialogs.alert(t('Error moving file')); + OC.dialogs.alert(t('Error moving file'), t('files', 'Error')); } }); }); diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 39e76e10c9..8bac2af60d 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -16,7 +16,7 @@ $(document).ready(function() { row.parentNode.removeChild(row); } if (result.status != 'success') { - OC.dialogs.alert(result.data.message, 'Error'); + OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error')); } }); @@ -43,7 +43,7 @@ $(document).ready(function() { row.parentNode.removeChild(row); } if (result.status != 'success') { - OC.dialogs.alert(result.data.message, 'Error'); + OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error')); } }); @@ -111,7 +111,7 @@ $(document).ready(function() { row.parentNode.removeChild(row); } if (result.status != 'success') { - OC.dialogs.alert(result.data.message, 'Error'); + OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error')); } }); }); @@ -136,7 +136,7 @@ $(document).ready(function() { row.parentNode.removeChild(row); } if (result.status != 'success') { - OC.dialogs.alert(result.data.message, 'Error'); + OC.dialogs.alert(result.data.message, t('files_trashbin', 'Error')); } }); }); diff --git a/core/js/oc-vcategories.js b/core/js/oc-vcategories.js index 3e75767c49..c745dbc5fb 100644 --- a/core/js/oc-vcategories.js +++ b/core/js/oc-vcategories.js @@ -11,7 +11,7 @@ var OCCategories= { try { var jsondata = jQuery.parseJSON(response); if(response.status == 'error') { - OC.dialogs.alert(response.data.message, 'Error'); + OC.dialogs.alert(response.data.message, t('core', 'Error')); return; } } catch(e) { @@ -77,7 +77,7 @@ var OCCategories= { if(jsondata.status == 'success') { OCCategories._update(jsondata.data.categories); } else { - OC.dialogs.alert(jsondata.data.message, 'Error'); + OC.dialogs.alert(jsondata.data.message, t('core', 'Error')); } }, favorites:function(type, cb) { @@ -107,7 +107,7 @@ var OCCategories= { cb(jsondata); } else { if(jsondata.status !== 'success') { - OC.dialogs.alert(jsondata.data.message, 'Error'); + OC.dialogs.alert(jsondata.data.message, t('core', 'Error')); } } }); @@ -169,7 +169,7 @@ var OCCategories= { if(jsondata.status === 'success') { OCCategories._update(jsondata.data.categories); } else { - OC.dialogs.alert(jsondata.data.message, 'Error'); + OC.dialogs.alert(jsondata.data.message, t('core', 'Error')); } } }); @@ -186,7 +186,7 @@ var OCCategories= { if(jsondata.status === 'success') { OCCategories._update(jsondata.data.categories); } else { - OC.dialogs.alert(jsondata.data.message, 'Error'); + OC.dialogs.alert(jsondata.data.message, t('core', 'Error')); } } }).error(function(xhr){ @@ -196,7 +196,7 @@ var OCCategories= { if(typeof cb == 'function') { cb({status:'error', data:{message:errormessage}}); } else { - OC.dialogs.alert(errormessage); + OC.dialogs.alert(errormessage, t('core', 'Error')); } } }); diff --git a/settings/js/apps.js b/settings/js/apps.js index dd20bc0a9c..49cf6cb675 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -56,7 +56,7 @@ OC.Settings.Apps = OC.Settings.Apps || { if(active) { $.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) { if(!result || result.status!='success') { - OC.dialogs.alert('Error while disabling app','Error'); + OC.dialogs.alert('Error while disabling app', t('settings', 'Error')); } else { element.data('active',false); @@ -68,7 +68,7 @@ OC.Settings.Apps = OC.Settings.Apps || { } else { $.post(OC.filePath('settings','ajax','enableapp.php'),{appid:appid},function(result) { if(!result || result.status!='success') { - OC.dialogs.alert('Error while enabling app','Error'); + OC.dialogs.alert('Error while enabling app', t('settings', 'Error')); } else { OC.Settings.Apps.addNavigation(appid); @@ -77,7 +77,7 @@ OC.Settings.Apps = OC.Settings.Apps || { } },'json') .fail(function() { - OC.dialogs.alert('Error while enabling app','Error'); + OC.dialogs.alert('Error while enabling app', t('settings', 'Error')); element.data('active',false); OC.Settings.Apps.removeNavigation(appid); element.val(t('settings','Enable'));