Index: openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	5 Nov 2002 17:19:56 -0000	1.1
+++ openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	11 Dec 2002 13:27:48 -0000	1.2
@@ -1,114 +1,115 @@
 <?xml version="1.0"?>
-<!-- Generated by lang::catalog::export_package_to_files on 2002 November 05 19:46 -->
+<!-- Generated by lang::catalog::export_package_to_files on 2002 December 06 11:49 -->
 <message_catalog package_key="file-storage" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="Action">Action</msg>
+  <msg key="Actions">Actions:</msg>
+  <msg key="Actions_1">Actions</msg>
+  <msg key="Add_File">Add File</msg>
+  <msg key="Add_pretty_name">Add %pretty_name%</msg>
+  <msg key="Author">Author</msg>
+  <msg key="Change_Name">Change Name</msg>
+  <msg key="Copy">Copy</msg>
+  <msg key="Create">Create</msg>
+  <msg key="Create_a_new_folder">Create a new folder</msg>
+  <msg key="Create_a_URL">Create a URL</msg>
+  <msg key="Create_New_Folder">Create New Folder</msg>
+  <msg key="day">day</msg>
+  <msg key="days_as_new">days as new.</msg>
+  <msg key="Delete">Delete</msg>
   <msg key="delete">delete</msg>
-  <msg key="Size">Size</msg>
+  <msg key="Delete_this_folder">Delete this folder</msg>
+  <msg key="Delete_Version">Delete Version</msg>
   <msg key="Description">Description:</msg>
-  <msg key="Version_filename_">Version filename :</msg>
-  <msg key="days_as_new">days as new.</msg>
-  <msg key="Upload">Upload</msg>
-  <msg key="day">day</msg>
-  <msg key="Create_a_URL">Create a URL</msg>
   <msg key="Edit">Edit</msg>
-  <msg key="lt_administer_permission">administer permissions</msg>
-  <msg key="Add_pretty_name">Add %pretty_name%</msg>
-  <msg key="Name">Name</msg>
-  <msg key="Actions_1">Actions</msg>
-  <msg key="lt_ncluding_items_from_s">ncluding items from subfolders
-      (</msg>
+  <msg key="edit">edit</msg>
+  <msg key="Edit_Folder">Edit Folder</msg>
+  <msg key="Edit_URL">Edit URL</msg>
   <msg key="exclude">exclude</msg>
-  <msg key="lt_There_are_no_versions">There are no versions of this file availible to you</msg>
-  <msg key="lt_version_not_valid">The specified version is not valid.</msg>
-  <msg key="lt_The_specified_folder__1">The specified folder is not valid.</msg>
-  <msg key="Upload_New_File">Upload New File</msg>
-  <msg key="Version_Notes">Version Notes</msg>
-  <msg key="Action">Action</msg>
-  <msg key="lt_Your_file_is_larger_t_1">Your file is larger than the maximum file size allowed on this system (%max_number_of_bytes% bytes)</msg>
-  <msg key="lt_We_received_an_error_">We received an error from the database.  Probably
-    the folder you selected already contains a file with the same name.</msg>
-  <msg key="Yes_Delete_It">Yes, Delete It</msg>
-  <msg key="Rename">Rename</msg>
-  <msg key="lt_Use_the_Browse_button">Use the &quot;Browse...&quot; button to locate your file, 
-    then click &quot;Open&quot;.</msg>
-  <msg key="Recurse">Recurse?</msg>
-  <msg key="lt_This_may_take_a_while">This may take a while, please be patient.</msg>
-  <msg key="Modified">Modified</msg>
-  <msg key="lt_We_got_an_error_that_">We got an error that we couldn't readily identify.  Please let the system owner know about this.</msg>
-  <msg key="new">new</msg>
-  <msg key="Type">Type</msg>
-  <msg key="URL">URL:</msg>
-  <msg key="Copy">Copy</msg>
-  <msg key="Author">Author</msg>
+  <msg key="file">file</msg>
   <msg key="folder">folder</msg>
-  <msg key="lt_Download_an_archive_o">Download an archive of the contents of this folder</msg>
-  <msg key="lt_Showing_files_modifie">Showing files modified within the past</msg>
-  <msg key="lt_Modify_permissions_on">Modify permissions on this file</msg>
-  <msg key="lt_Your_file_is_larger_t">Your file is larger than the maximum file size allowed on this system (%number_of_bytes% bytes)</msg>
-  <msg key="Save">Save</msg>
-  <msg key="Not_i">Not i</msg>
-  <msg key="show_all_versions">show all versions</msg>
-  <msg key="items">items</msg>
-  <msg key="lt_You_probably_clicked_">You probably clicked on the Add button more than once. Check if the file is properly loaded on the %folder_link% you want, or you can use the Back button to return and re-enter the version file.</msg>
+  <msg key="Folder_ID">Folder ID</msg>
   <msg key="Folder_Name">Folder Name:</msg>
-  <msg key="Version_filename_1">Version filename:</msg>
-  <msg key="lt_It_appears_that_there">It appears that there is already a file with that name in this folder (although possibly you clicked more than once on the submit button.)</msg>
-  <msg key="lt_show_only_live_versio">show only live version</msg>
+  <msg key="folder_type_pretty_name">folder</msg>
+  <msg key="include">include</msg>
+  <msg key="item">item</msg>
+  <msg key="items">items</msg>
+  <msg key="Last_Modified">Last Modified</msg>
+  <msg key="lt_administer_permission">administer permissions</msg>
+  <msg key="lt_Are_you_sure_that_you">Are you sure that you want to delete this version &quot;%version_name%&quot; of &quot;%title%&quot;?
+This action cannot be reversed.</msg>
   <msg key="lt_bad_folder_id_folder_">missing folder id</msg>
-  <msg key="No_such_type">No such type</msg>
-  <msg key="Create_a_new_folder">Create a new folder</msg>
-  <msg key="view_details">view details</msg>
-  <msg key="file">file</msg>
-  <msg key="Add_File">Add File</msg>
-  <msg key="Edit_URL">Edit URL</msg>
   <msg key="lt_delete_file">Are you sure you want to delete the file &quot;%title%&quot; and all of its versions?  This action cannot be reversed.</msg>
-  <msg key="Delete">Delete</msg>
-  <msg key="Upload_New_Version">Upload New Version</msg>
   <msg key="lt_delete_folder">Are you sure you want to delete the folder &quot;%folder_name%&quot; and all the items it contains?  This action cannot be reversed.</msg>
-  <msg key="edit">edit</msg>
-  <msg key="lt_This_file_has_version">This file has versions that you do not have permission to delete,
-so you cannot delete the file.</msg>
-  <msg key="lt_The_folder_link_you_s">The %folder_link% you selected already contains a file with the same name.</msg>
-  <msg key="lt_Were_sorry_but_at_the">We're sorry, but at the moment you cannot delete folders unless they are already empty.</msg>
-  <msg key="Change_Name">Change Name</msg>
-  <msg key="Delete_Version">Delete Version</msg>
-  <msg key="Create_New_Folder">Create New Folder</msg>
+  <msg key="lt_Delete_this_file_incl">Delete this file (including all versions)</msg>
+  <msg key="lt_Download_an_archive_o">Download an archive of the contents of this folder</msg>
+  <msg key="lt_Either_there_is_alrea">Either there is already a folder with the name &quot;%folder_name%&quot; or you clicked on the button more than once.  You can use the Back button to return and choose a new name, or &lt;a href=&quot;%directory_url%&quot;&gt;return to the directory listing&lt;/a&gt; to see if your folder is there.</msg>
   <msg key="lt_Folder_folder_name_is">Folder %folder_name% is empty.</msg>
-  <msg key="Title_">Title :</msg>
+  <msg key="lt_It_appears_that_there">It appears that there is already a file with that name in this folder (although possibly you clicked more than once on the submit button.)</msg>
+  <msg key="lt_Modify_permissions_on">Modify permissions on this file</msg>
+  <msg key="lt_Modify_permissions_on_1">Modify permissions on this folder</msg>
+  <msg key="lt_ncluding_items_from_s">ncluding items from subfolders
+      (</msg>
+  <msg key="lt_Please_enter_the_new_">Please enter the new name for this file:</msg>
   <msg key="lt_Show_files_modified_i">Show files modified in the past</msg>
-  <msg key="Upload_a_new_version">Upload a new version</msg>
+  <msg key="lt_show_only_live_versio">show only live version</msg>
+  <msg key="lt_Showing_files_modifie">Showing files modified within the past</msg>
+  <msg key="lt_The_folder_link_you_s">The %folder_link% you selected already contains a file with the same name.</msg>
+  <msg key="lt_The_specified_file_is">The specified file is not valid.</msg>
+  <msg key="lt_The_specified_folder_">The specified folder does not exist.</msg>
+  <msg key="lt_The_specified_folder__1">The specified folder is not valid.</msg>
   <msg key="lt_The_specified_parent_">The specified parent folder is not valid.</msg>
-  <msg key="Last_Modified">Last Modified</msg>
-  <msg key="Delete_this_folder">Delete this folder</msg>
-  <msg key="lt_Either_there_is_alrea">Either there is already a folder with the name &quot;%folder_name%&quot; or you clicked on the button more than once.  You can use the Back button to return and choose a new name, or &lt;a href=&quot;%directory_url%&quot;&gt;return to the directory listing&lt;/a&gt; to see if your folder is there.</msg>
-  <msg key="Order_By">Order By</msg>
-  <msg key="Move">Move</msg>
-  <msg key="item">item</msg>
+  <msg key="lt_There_are_no_versions">There are no versions of this file availible to you</msg>
+  <msg key="lt_This_file_has_version">This file has versions that you do not have permission to delete,
+so you cannot delete the file.</msg>
+  <msg key="lt_This_folder_contains_">This folder contains items that you do not have permission to
+delete, therefore you cannot delete it.</msg>
+  <msg key="lt_This_may_take_a_while">This may take a while, please be patient.</msg>
+  <msg key="lt_Use_the_Browse_button">Use the &quot;Browse...&quot; button to locate your file, 
+    then click &quot;Open&quot;.</msg>
+  <msg key="lt_version_not_valid">The specified version is not valid.</msg>
+  <msg key="lt_We_got_an_error_that_">We got an error that we couldn't readily identify.  Please let the system owner know about this.</msg>
+  <msg key="lt_We_received_an_error_">We received an error from the database.  Probably
+    the folder you selected already contains a file with the same name.</msg>
+  <msg key="lt_Were_sorry_but_at_the">We're sorry, but at the moment you cannot delete folders unless they are already empty.</msg>
   <msg key="lt_You_may_not_delete_th">You may not delete the root folder.</msg>
+  <msg key="lt_You_probably_clicked_">You probably clicked on the Add button more than once. Check if the file is properly loaded on the %folder_link% you want, or you can use the Back button to return and re-enter the version file.</msg>
+  <msg key="lt_Your_file_is_larger_t">Your file is larger than the maximum file size allowed on this system (%number_of_bytes% bytes)</msg>
+  <msg key="lt_Your_file_is_larger_t_1">Your file is larger than the maximum file size allowed on this system (%max_number_of_bytes% bytes)</msg>
+  <msg key="Modified">Modified</msg>
+  <msg key="Move">Move</msg>
+  <msg key="Name">Name</msg>
+  <msg key="new">new</msg>
+  <msg key="No_such_type">No such type</msg>
   <msg key="no_such_URL">no such URL</msg>
-  <msg key="Size_bytes">Size (bytes)</msg>
-  <msg key="Actions">Actions:</msg>
-  <msg key="include">include</msg>
-  <msg key="Upload_a_file">Upload a file</msg>
-  <msg key="Create">Create</msg>
-  <msg key="lt_The_specified_folder_">The specified folder does not exist.</msg>
-  <msg key="Search_again">Search again:</msg>
-  <msg key="lt_The_specified_file_is">The specified file is not valid.</msg>
-  <msg key="lt_Are_you_sure_that_you">Are you sure that you want to delete this version &quot;%version_name%&quot; of &quot;%title%&quot;?
-This action cannot be reversed.</msg>
-  <msg key="Version_filename">Version filename</msg>
+  <msg key="Not_i">Not i</msg>
   <msg key="Note">Note:</msg>
-  <msg key="Version_Notes_1">Version Notes:</msg>
-  <msg key="lt_This_folder_contains_">This folder contains items that you do not have permission to
-delete, therefore you cannot delete it.</msg>
-  <msg key="Search_Results">Search Results</msg>
-  <msg key="Folder_ID">Folder ID</msg>
-  <msg key="Edit_Folder">Edit Folder</msg>
+  <msg key="Order_By">Order By</msg>
+  <msg key="Recurse">Recurse?</msg>
+  <msg key="Rename">Rename</msg>
   <msg key="Rename_this_folder">Rename this folder</msg>
+  <msg key="Save">Save</msg>
+  <msg key="Search">Search</msg>
+  <msg key="Search_again">Search again:</msg>
+  <msg key="Search_Results">Search Results</msg>
+  <msg key="show_all_versions">show all versions</msg>
+  <msg key="Size">Size</msg>
+  <msg key="Size_bytes">Size (bytes)</msg>
   <msg key="Title">Title:</msg>
+  <msg key="Title_">Title :</msg>
+  <msg key="Type">Type</msg>
   <msg key="Update">Update</msg>
-  <msg key="lt_Delete_this_file_incl">Delete this file (including all versions)</msg>
-  <msg key="lt_Please_enter_the_new_">Please enter the new name for this file:</msg>
-  <msg key="lt_Modify_permissions_on_1">Modify permissions on this folder</msg>
-  <msg key="Search">Search</msg>
+  <msg key="Upload">Upload</msg>
+  <msg key="Upload_a_file">Upload a file</msg>
+  <msg key="Upload_a_new_version">Upload a new version</msg>
+  <msg key="Upload_New_File">Upload New File</msg>
+  <msg key="Upload_New_Version">Upload New Version</msg>
+  <msg key="URL">URL:</msg>
+  <msg key="Version_filename">Version filename</msg>
+  <msg key="Version_filename_">Version filename :</msg>
+  <msg key="Version_filename_1">Version filename:</msg>
+  <msg key="Version_Notes">Version Notes</msg>
+  <msg key="Version_Notes_1">Version Notes:</msg>
+  <msg key="view_details">view details</msg>
+  <msg key="Yes_Delete_It">Yes, Delete It</msg>
 </message_catalog>
Index: openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql	17 Sep 2002 21:03:24 -0000	1.5
+++ openacs-4/packages/file-storage/sql/oracle/file-storage-views-create.sql	11 Dec 2002 13:27:59 -0000	1.6
@@ -97,6 +97,3 @@
            fs_urls_full.url as key,
            1 as sort_key
     from fs_urls_full;
-
-
-
Index: openacs-4/packages/file-storage/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/file-storage/www/folder-chunk.adp	30 Nov 2002 17:34:29 -0000	1.13
+++ openacs-4/packages/file-storage/www/folder-chunk.adp	11 Dec 2002 13:28:09 -0000	1.14
@@ -18,7 +18,7 @@
 <if @contents.type@ eq "folder">
       <td><a href="@fs_url@index?folder_id=@contents.object_id@&n_past_days=@n_past_days@"><img src="graphics/folder.gif" border=0 alt="#file-storage.folder#"></a></td>
       <td>
-        <a href="@fs_url@index?folder_id=@contents.object_id@&n_past_days=@n_past_days@">@contents.name@</a>
+        <a href="@fs_url@index?folder_id=@contents.object_id@&n_past_days=@n_past_days@"><%= [lang::util::localize @contents.name@] %></a>
 <if @contents.new_p@ and @contents.content_size@ gt 0><font color="red">#file-storage.new#</font></if>
       </td>
       <td>&nbsp;</td>