diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-10-23 11:08:30 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-10-23 11:08:30 +0200 |
| commit | 8ed73e5cedac5e22a8e50d1fdf04feb400b676fd (patch) | |
| tree | fa304394a179b0d9f7b2359d58c89161a14d18d0 /apps | |
| parent | a9735c8a6ffeb84ab5ad4c7669174ca84af67c74 (diff) | |
| download | nextcloud-server-8ed73e5cedac5e22a8e50d1fdf04feb400b676fd.tar.gz nextcloud-server-8ed73e5cedac5e22a8e50d1fdf04feb400b676fd.zip | |
use a more descriptive error message when the user tries to create '/Shared'
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/file-upload.js | 4 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 17673dacfd3..5bf4f5c0981 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -508,11 +508,11 @@ $(document).ready(function() { var checkInput = function () { var filename = input.val(); if (type === 'web' && filename.length === 0) { - throw t('files', 'URL cannot be empty.'); + throw t('files', 'URL cannot be empty'); } else if (type !== 'web' && !Files.isFileNameValid(filename)) { // Files.isFileNameValid(filename) throws an exception itself } else if ($('#dir').val() === '/' && filename === 'Shared') { - throw t('files','Invalid name. Usage of \'Shared\' is reserved by ownCloud'); + throw t('files', 'In the home folder \'Shared\' is a reserved filename'); } else if (FileList.inList(filename)) { throw t('files', '{new_name} already exists', {new_name: filename}); } else { diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 78eaa9761a0..980260928e8 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -359,7 +359,7 @@ var FileList={ if (!Files.isFileNameValid(filename)) { // Files.isFileNameValid(filename) throws an exception itself } else if($('#dir').val() === '/' && filename === 'Shared') { - throw t('files','Invalid name. Usage of \'Shared\' is reserved by ownCloud'); + throw t('files','In the home folder \'Shared\' is a reserved filename'); } else if (FileList.inList(filename)) { throw t('files', '{new_name} already exists', {new_name: filename}); } |