From f6eee501b7194ad96b54db29a296a898140505a5 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Thu, 28 Feb 2013 13:47:42 +0100 Subject: [PATCH] #82 Save button and #57 en-IS --- app/views/dmsf_state/_user_pref.html.erb | 33 ++-- config/locales/en-IS.yml | 186 ----------------------- 2 files changed, 16 insertions(+), 203 deletions(-) delete mode 100644 config/locales/en-IS.yml diff --git a/app/views/dmsf_state/_user_pref.html.erb b/app/views/dmsf_state/_user_pref.html.erb index 5a62fb02..d10394f8 100644 --- a/app/views/dmsf_state/_user_pref.html.erb +++ b/app/views/dmsf_state/_user_pref.html.erb @@ -15,23 +15,22 @@ <%= submit_tag(l(:submit_save), :title => l(:title_save_preferences)) %> <% end %> - - <%= form_for @project, :url => project_path(@project), :html => {:method=>:post} do %> - <% custom_fields = DmsfFileRevisionCustomField.find(:all) %> - <% unless custom_fields.empty? %> -
<%=l(:label_custom_field_plural)%> - <% custom_fields.each do |custom_field| %> - - <% end %> - <%= hidden_field_tag 'project[dmsf_file_revision_custom_field_ids][]', '' %> - <%= hidden_field_tag '_method', 'put' %> -
- <% end %> - - <%= submit_tag(l(:submit_save), :title => l(:title_save_preferences)) %> + + <% custom_fields = DmsfFileRevisionCustomField.find(:all) %> + <% unless custom_fields.empty? %> + <%= form_for @project, :url => project_path(@project), :html => {:method=>:post} do %> +
<%=l(:label_custom_field_plural)%> + <% custom_fields.each do |custom_field| %> + + <% end %> + <%= hidden_field_tag 'project[dmsf_file_revision_custom_field_ids][]', '' %> + <%= hidden_field_tag '_method', 'put' %> +
+ <%= submit_tag(l(:submit_save), :title => l(:title_save_preferences)) %> + <% end %> <% end %> diff --git a/config/locales/en-IS.yml b/config/locales/en-IS.yml deleted file mode 100644 index 3e5a29b4..00000000 --- a/config/locales/en-IS.yml +++ /dev/null @@ -1,186 +0,0 @@ -en-IS: - :dmsf: "DMSF" - :label_dmsf_file_plural: "Dmsf files" - :warning_no_entries_selected: "No entries selected" - :error_email_to_must_be_entered: "Email To must be entered" - :notice_email_sent: "Email sent" - :warning_file_already_locked: "File already locked" - :notice_file_locked: "File locked" - :warning_file_not_locked: "File not locked" - :notice_file_unlocked: "File unlocked" - :error_only_user_that_locked_file_can_unlock_it: "Only user that locked file can unlock it" - :question_do_you_really_want_to_delete_this_entry: "Do you really want to delete this entry?" - :error_max_files_exceeded: "Limit for %{number} simultaneously downloaded files exceeded" - :question_do_you_really_want_to_delete_this_revision: "Do you really want to delete this revision?" - :error_entry_project_does_not_match_current_project: "Entry project doesn't match current project" - :notice_folder_created: "Folder created" - :error_folder_creation_failed: "Folder creation failed" - :error_folder_title_must_be_entered: "Title must be entered" - :notice_folder_deleted: "Folder deleted" - :error_folder_is_not_empty: "Folder is not empty" - :error_folder_title_is_already_used: "Title is already used" - :notice_folder_details_were_saved: "Folder details were saved" - :error_file_is_locked: "File is locked" - :notice_file_deleted: "File deleted" - :error_at_least_one_revision_must_be_present: "At least one revision must be present" - :notice_revision_deleted: "Revision deleted" - :warning_one_of_files_locked: "One of files locked" - :notice_file_unlocked: "File unlocked" - :notice_file_revision_created: "File revision created" - :notice_your_preferences_were_saved: "Your preferences were saved" - :warning_folder_notifications_already_activated: "Folder notifications already activated" - :notice_folder_notifications_activated: "Folder notifications activated" - :warning_folder_notifications_already_deactivated: "Folder notifications already deactivated" - :notice_folder_notifications_deactivated: "Folder notifications deactivated" - :warning_file_notifications_already_activated: "File notifications already activated" - :notice_file_notifications_activated: "File notifications activated" - :warning_file_notifications_already_deactivated: "File notifications already deactivated" - :notice_file_notifications_deactivated: "File notifications deactivated" - :link_details: "%{title} details" - :link_edit: "Edit %{title}" - :submit_create: "Create" - :link_create_folder: "Create folder" - :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email" - :link_title: "Title" - :link_size: "Size" - :link_modified: "Modified" - :link_ver: "Ver." - :link_author: "Author" - :title_check_for_zip_download_or_email: "Check for Zip download or email" - :title_delete: "Delete" - :title_notifications_active_deactivate: "Notifications active: Deactivate" - :title_notifications_not_active_activate: "Notifications not active: Activate" - :title_title_version_version_download: "%{title} version %{version} download" - :title_locked_by_user: "Locked by %{user}" - :title_locked_by_you: "Locked by you" - :title_waiting_for_approval: "Waiting for Approval" - :title_approved: "Approved" - :title_unlock_file: "Unlock to allow changes for other members" - :title_lock_file: "Lock to prevent changes for other members" - :submit_download: "Download" - :title_download_checked: "Download checked in Zip archive" - :submit_email: "Email" - :title_send_checked_by_email: "Send checked by email" - :link_user_preferences: "Your DMSF project preferences" - :heading_send_documents_by_email: "Send documents by email" - :label_email_from: "From" - :label_email_to: "To" - :label_email_cc: "CC" - :label_email_subject: "Subject" - :label_email_documents: "Documents" - :label_email_body: "Body" - :label_email_send: "Send" - :title_notifications_active: "Notifications active" - :label_file_size: "File size" - :heading_file_upload: "Upload" - :note_uploaded_maximum_files_at_once: "There can be uploaded maximum of %{number} files at once." - :note_upload_files_greater_than_two_gb: "To upload files greater than 2GB you must have 64b browser." - :submit_upload_files: "Upload" - :info_file_locked: "File locked!" - :label_notifications: "Notifications" - :select_option_default: "Default" - :select_option_deactivated: "Deactivated" - :select_option_activated: "Activated" - :title_save_preferences: "Save preferences" - :heading_revisions: "Revisions" - :title_download: "Download" - :title_delete_revision: "Delete revision" - :label_created: "Created" - :label_changed: "Changed" - :info_changed_by_user: "%{changed} by %{user}" - :label_filename: "Filename" - :label_version: "Version" - :label_workflow: "Workflow" - :option_workflow_waiting_for_approval: "Waiting for approval" - :option_workflow_approved: "Approved" - :option_workflow_none: "None" - :label_mime: "Mime" - :label_size: "Size" - :label_comment: "Comment" - :heading_new_revision: "New Revision" - :option_version_same: "Same" - :option_version_minor: "Minor" - :option_version_major: "Major" - :label_new_content: "New content" - :label_maximum_files_upload: "Maximum files upload" - :note_maximum_number_of_files_uploaded: "Limits maximum number of files uploaded at once. 0 means unlimited." - :label_maximum_files_download: "Maximum files download" - :note_maximum_number_of_files_downloaded: "Limits maximum number of files downloaded in zip or sent via email. 0 means unlimited." - :label_file_storage_directory: "File storage directory" - :label_index_database: "Index database" - :label_stemming_language: "Stemming Language" - :note_possible_values: "Possible values" - :note_pass_none_to_disable_stemming: "pass 'none' to disable stemming" - :label_stem_strategy: "Stem strategy" - :option_stem_none: "Stem none (default)" - :option_stem_some: "Stem some" - :option_stem_all: "Stem all" - :label_stemming_description: "This controls how the query parser will apply the stemming algorithm. The default value is STEM_NONE. The possible values are" - :note_do_not_stem: "Don't perform any stemming." - :note_stem_some: "Search for stemmed forms of terms except for those which start with a capital letter, or are followed by certain characters, or are used with operators which need positional information. Stemmed terms are prefixed with 'Z'." - :note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)." - :note_stemming_applied: "Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed." - :label_default_notifications: "File default notifications" - :heading_uploaded_files: "Uploaded Files" - :submit_commit: "Commit" - :link_documents: "Documents" - :permission_view_dmsf_folders: "Browse documents" - :permission_user_preferences: "User preferences" - :permission_view_dmsf_files: "View documents" - :permission_folder_manipulation: "Folder manipulation" - :permission_file_manipulation: "File manipulation" - :permission_file_approval: "File approval" - :permission_force_file_unlock: "Force file unlock" - :label_file: "File" - :field_folder: "Folder" - :error_create_cycle_in_folder_dependency: "create cycle in folder dependency" - :error_contains_invalid_character: "contains invalid character(s)" - :error_file_commit_require_uploaded_file: "File commit require uploaded file" - :warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}" - :error_user_has_not_right_delete_folder: "User hasn't right to delete forders" - :error_user_has_not_right_delete_file: "User hasn't right to delete file" - :notice_entries_deleted: "Entries deleted" - :warning_some_entries_were_not_deleted: "Some entries weren't deleted: %{entries}" - :question_do_you_really_want_to_delete_entries: "Do you really want to delete checked entries?" - :title_delete_checked: "Delete checked" - :title_number_of_files_in_directory: "Number of files in directory" - :title_filename_for_download: "Filename used for download or in Zip archive" - :label_number_of_folders: "Folders" - :label_number_of_documents: "Documents" - :label_zip_names_encoding: "Zip names encoding" - :note_zip_names_encoding_iconv: "Iconv is used for charset conversion from utf-8 to target encoding" - :error_file_storage_directory_does_not_exist: "File storage directory doesn't exist and can't be created" - :error_file_can_not_be_created: "File can't be created in storage directory" - :error_wrong_zip_encoding: "Wrong Zip encoding" - :warning_xapian_not_available: "Xapian not available" - :menu_dmsf: "DMSF" - :label_physical_file_delete: "Physical file delete" - :user_is_not_project_member: "You are not member of the project" - :heading_access_downloads_emails: "Downloads/Emails" - :heading_access_first: "First" - :heading_access_last: "Last" - :label_dmsf_updated: "DMSF updated" - :title_total_size_of_all_files: "Total size of all files under this folder" - :project_module_dmsf: "DMSF" - :warning_no_project_to_copy_file_to: "No project to copy file to" - :comment_copied_from: "Copied from %{source}" - :notice_file_copied: "File copied" - :notice_file_moved: "File moved" - :label_target_project: "Target project" - :label_target_folder: "Target folder" - :title_copy_or_move: "Copy/Move" - :label_dmsf_folder_plural: "Dmsf folders" - :comment_moved_from: "Moved from %{source}" - :error_target_folder_same: "Target folder and project are the same as current" - :error_file_cannot_be_moved: "File can't be moved" - :error_file_cannot_be_copied: "File can't be copied" - :warning_no_project_to_copy_folder_to: "No project to copy folder to" - :title_copy: "Copy" - :error_folder_cannot_be_copied: "Folder can't be copied" - :notice_folder_copied: "Folder copied" - :error_max_email_filesize_exceeded: "You've exceeded the maximum filesize for sending via email. (%{number} MB)" - :note_maximum_email_filesize: "Limits maximum filesize that can be sent via email. 0 means unlimited. Number is in MB." - :label_maximum_email_filesize: "Maximum email attachment size" - :parent_directory: "Parent Directory" - :note_webdav: "Webdav once enabled can be found at http://.../dmsf/webdav/" - :label_webdav: "Webdav functionality"