summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-04-06 08:24:43 -0700
committerBart Visscher <bartv@thisnet.nl>2013-04-06 08:24:43 -0700
commit46a552fd561f676a4cf7a70ae71ffbd4e9473d9a (patch)
tree981eb3f2b5ae769984367b8d962a84c8749c28e2 /apps
parente91e8b1170fa564cdfbe00e416829983914804fe (diff)
parentde2e5466178202c9ea18cdc732b88d79322285cd (diff)
downloadnextcloud-server-46a552fd561f676a4cf7a70ae71ffbd4e9473d9a.tar.gz
nextcloud-server-46a552fd561f676a4cf7a70ae71ffbd4e9473d9a.zip
Merge pull request #2738 from Kondou-ger/fix_alert_issues
Fixed things in alert-messages
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/files.js8
-rw-r--r--apps/files_trashbin/js/trash.js8
2 files changed, 8 insertions, 8 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 6c5536aafab..7d27d8370cb 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('core', '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('core', '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('core', '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('core', 'Error'));
}
});
});
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 39e76e10c9c..eed253d6602 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('core', '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('core', '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('core', '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('core', 'Error'));
}
});
});