From 8ed73e5cedac5e22a8e50d1fdf04feb400b676fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 23 Oct 2013 11:08:30 +0200 Subject: [PATCH] use a more descriptive error message when the user tries to create '/Shared' --- apps/files/js/file-upload.js | 4 ++-- 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 17673dacfd..5bf4f5c098 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 78eaa9761a..980260928e 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}); }