Index: openacs-4/packages/file-storage/www/file-move-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move-2.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/file-storage/www/file-move-2.tcl 18 Sep 2002 12:09:59 -0000 1.6 +++ openacs-4/packages/file-storage/www/file-move-2.tcl 5 Nov 2002 17:19:59 -0000 1.7 @@ -10,13 +10,13 @@ } -validate { valid_file -requires {file_id} { if ![fs_file_p $file_id] { - ad_complain "The specified file is not valid." + ad_complain "[_ file-storage.lt_The_specified_file_is]" } } valid_folder -requires {parent_id} { if ![fs_folder_p $parent_id] { - ad_complain "The specified parent folder is not valid." + ad_complain "[_ file-storage.lt_The_specified_parent_]" } } } @@ -48,28 +48,11 @@ # JS: to like quering a table that has just aborted a transaction on it. Instead, I copied # JS: the error reporting of file-copy-2.tcl does - ad_return_complaint 1 "We received an error from the database. Probably - the folder you selected already contains a file with the same name. + ad_return_complaint 1 "[_ file-storage.lt_We_received_an_error_]
$errmsg
" - #set filename [db_string filename " - #select name from cr_items where item_id = :file_id"] - - #if [db_string duplicate_check " - #select count(*) - #from cr_items - #where name = :filename - #and parent_id = :parent_id"] { - # ad_return_complaint 1 "Either there is already a file in the specified folder with the name \"$filename\" or you clicked on the button more than once. You can return to the directory listing to see if your file is there." - #} else { - #ad_return_complaint 1 "We got an error that we couldn't readily identify. Please let the system owner know about this. - - #
$errmsg
" - #} - ad_script_abort } ad_returnredirect "?folder_id=$parent_id" -