diff --git a/README.md b/README.md index 3d954464..6d202f3e 100644 --- a/README.md +++ b/README.md @@ -175,13 +175,13 @@ E.g. **dmsf_upload_controller_after_commit** -Called after all uploaded files are commited. +Called after all uploaded files are committed. parameters: *files* **dmsf_helper_upload_after_commit** -Called after an individual file is commited. The controller is not available. +Called after an individual file is committed. The controller is not available. Parameters: *file* diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb index ccad2ba8..c4df39f2 100644 --- a/app/controllers/dmsf_upload_controller.rb +++ b/app/controllers/dmsf_upload_controller.rb @@ -83,7 +83,7 @@ class DmsfUploadController < ApplicationController end def commit_files - commit_files_internal params[:commited_files] + commit_files_internal params[:committed_files] end # REST API file commit @@ -123,8 +123,8 @@ class DmsfUploadController < ApplicationController private - def commit_files_internal(commited_files) - @files, failed_uploads = DmsfUploadHelper.commit_files_internal(commited_files, @project, @folder, self) + def commit_files_internal(committed_files) + @files, failed_uploads = DmsfUploadHelper.commit_files_internal(committed_files, @project, @folder, self) call_hook :dmsf_upload_controller_after_commit, { files: @files } respond_to do |format| format.js diff --git a/app/helpers/dmsf_upload_helper.rb b/app/helpers/dmsf_upload_helper.rb index 88673ce0..45c1d479 100644 --- a/app/helpers/dmsf_upload_helper.rb +++ b/app/helpers/dmsf_upload_helper.rb @@ -22,13 +22,13 @@ module DmsfUploadHelper include Redmine::I18n - def self.commit_files_internal(commited_files, project, folder, controller = nil, container = nil, new_object: false) + def self.commit_files_internal(committed_files, project, folder, controller = nil, container = nil, new_object: false) failed_uploads = [] files = [] - if commited_files + if committed_files failed_uploads = [] - commited_files.each do |_, commited_file| - name = commited_file[:name] + committed_files.each do |_, committed_file| + name = committed_file[:name] new_revision = DmsfFileRevision.new file = DmsfFile.visible.find_file_by_name(project, folder, name) unless file @@ -55,27 +55,27 @@ module DmsfUploadHelper new_revision.dmsf_file = file new_revision.user = User.current new_revision.name = name - new_revision.title = commited_file[:title] - new_revision.description = commited_file[:description] - new_revision.comment = commited_file[:comment] - new_revision.major_version = if commited_file[:version_major].present? - DmsfUploadHelper.db_version commited_file[:version_major] + new_revision.title = committed_file[:title] + new_revision.description = committed_file[:description] + new_revision.comment = committed_file[:comment] + new_revision.major_version = if committed_file[:version_major].present? + DmsfUploadHelper.db_version committed_file[:version_major] else 1 end - new_revision.minor_version = if commited_file[:version_minor].present? - DmsfUploadHelper.db_version commited_file[:version_minor] + new_revision.minor_version = if committed_file[:version_minor].present? + DmsfUploadHelper.db_version committed_file[:version_minor] end - new_revision.patch_version = if commited_file[:version_patch].present? - DmsfUploadHelper.db_version commited_file[:version_patch] + new_revision.patch_version = if committed_file[:version_patch].present? + DmsfUploadHelper.db_version committed_file[:version_patch] end - new_revision.mime_type = commited_file[:mime_type] - new_revision.size = commited_file[:size] - new_revision.digest = commited_file[:digest] + new_revision.mime_type = committed_file[:mime_type] + new_revision.size = committed_file[:size] + new_revision.digest = committed_file[:digest] - if commited_file[:custom_field_values].present? + if committed_file[:custom_field_values].present? i = 0 - commited_file[:custom_field_values].each do |_, v| + committed_file[:custom_field_values].each do |_, v| new_revision.custom_field_values[i].value = v i += 1 end @@ -97,9 +97,9 @@ module DmsfUploadHelper new_revision.disk_filename = new_revision.new_storage_filename if new_revision.save - new_revision.assign_workflow commited_file[:dmsf_workflow_id] + new_revision.assign_workflow committed_file[:dmsf_workflow_id] begin - FileUtils.mv commited_file[:tempfile_path], new_revision.disk_file(search_if_not_exists: false) + FileUtils.mv committed_file[:tempfile_path], new_revision.disk_file(search_if_not_exists: false) FileUtils.chmod 'u=wr,g=r', new_revision.disk_file(search_if_not_exists: false) if defined?(EasyExtensions) # We need to trigger Xapian indexing after the file is moved to its target destination @@ -118,9 +118,9 @@ module DmsfUploadHelper failed_uploads.push new_revision end # Approval workflow - next if commited_file[:workflow_id].blank? + next if committed_file[:workflow_id].blank? - wf = DmsfWorkflow.find_by(id: commited_file[:workflow_id]) + wf = DmsfWorkflow.find_by(id: committed_file[:workflow_id]) next unless wf # Assign the workflow @@ -155,7 +155,7 @@ module DmsfUploadHelper end end if failed_uploads.present? && controller - controller.flash[:warning] = l(:warning_some_files_were_not_commited, + controller.flash[:warning] = l(:warning_some_files_were_not_committed, files: failed_uploads.map { |u| u['name'] }.join(', ')) end [files, failed_uploads] diff --git a/app/views/dmsf_upload/_upload_file.html.erb b/app/views/dmsf_upload/_upload_file.html.erb index 35e8f873..0671cf85 100644 --- a/app/views/dmsf_upload/_upload_file.html.erb +++ b/app/views/dmsf_upload/_upload_file.html.erb @@ -21,39 +21,39 @@ %>
- <%= hidden_field_tag "commited_files[#{i}][disk_filename]", upload.disk_filename %> - <%= hidden_field_tag "commited_files[#{i}][tempfile_path]", upload.tempfile_path %> - <%= hidden_field_tag "commited_files[#{i}][size]", upload.size %> - <%= hidden_field_tag "commited_files[#{i}][mime_type]", upload.mime_type %> - <%= hidden_field_tag "commited_files[#{i}][digest]", upload.digest %> + <%= hidden_field_tag "committed_files[#{i}][disk_filename]", upload.disk_filename %> + <%= hidden_field_tag "committed_files[#{i}][tempfile_path]", upload.tempfile_path %> + <%= hidden_field_tag "committed_files[#{i}][size]", upload.size %> + <%= hidden_field_tag "committed_files[#{i}][mime_type]", upload.mime_type %> + <%= hidden_field_tag "committed_files[#{i}][digest]", upload.digest %>

- <%= label_tag "commited_files[#{i}][title]", l(:label_title) %> - <%= text_field_tag "commited_files[#{i}][title]", upload.title, required:true %> + <%= label_tag "committed_files[#{i}][title]", l(:label_title) %> + <%= text_field_tag "committed_files[#{i}][title]", upload.title, required:true %>

<%= label_tag '', l(:label_filename) %> <%= text_field_tag :name, h(upload.name), readonly: true %> - <%= hidden_field_tag "commited_files[#{i}][name]", upload.name %> + <%= hidden_field_tag "committed_files[#{i}][name]", upload.name %>

- <%= label_tag "commited_files[#{i}][description]", l(:label_description) %> - <%= text_area_tag "commited_files[#{i}][description]", upload.description, rows: 6, + <%= label_tag "committed_files[#{i}][description]", l(:label_description) %> + <%= text_area_tag "committed_files[#{i}][description]", upload.description, rows: 6, class: 'wiki-edit dmsf-description' %>

<%= render partial: 'dmsf_files/version_selector', locals: { - label_tag_name: "commited_files[#{i}][version]", - select_tag_name_patch: "commited_files[#{i}][version_patch]", - select_tag_name_minor: "commited_files[#{i}][version_minor]", - select_tag_name_major: "commited_files[#{i}][version_major]", + label_tag_name: "committed_files[#{i}][version]", + select_tag_name_patch: "committed_files[#{i}][version_patch]", + select_tag_name_minor: "committed_files[#{i}][version_minor]", + select_tag_name_major: "committed_files[#{i}][version_major]", revision_or_upload: upload } %>

@@ -69,16 +69,16 @@

<% upload.custom_values.each do |value| %> <% value.value = nil if value.custom_field.dmsf_not_inheritable %> -

<%= custom_field_tag_with_label "commited_files[#{i}]", value %>

+

<%= custom_field_tag_with_label "committed_files[#{i}]", value %>

<% end %>

- <%= label_tag "commited_files[#{i}][comment]", l(:label_comment) %> - <%= text_area_tag "commited_files[#{i}][comment]", upload.comment, rows: 2, class: 'wiki-edit dmsf-description' %> + <%= label_tag "committed_files[#{i}][comment]", l(:label_comment) %> + <%= text_area_tag "committed_files[#{i}][comment]", upload.comment, rows: 2, class: 'wiki-edit dmsf-description' %>

-<%= wikitoolbar_for "commited_files_#{i}_description" %> -<%= wikitoolbar_for "commited_files_#{i}_comment" %> +<%= wikitoolbar_for "committed_files_#{i}_description" %> +<%= wikitoolbar_for "committed_files_#{i}_comment" %> diff --git a/app/views/dmsf_upload/_upload_file_locked.html.erb b/app/views/dmsf_upload/_upload_file_locked.html.erb index 6eeb34be..b80b341d 100644 --- a/app/views/dmsf_upload/_upload_file_locked.html.erb +++ b/app/views/dmsf_upload/_upload_file_locked.html.erb @@ -21,12 +21,12 @@ %>
- <%= hidden_field_tag "commited_files[#{i}][disk_filename]", upload.disk_filename %> - <%= hidden_field_tag "commited_files[#{i}][tempfile_path]", upload.tempfile_path %> - <%= hidden_field_tag "commited_files[#{i}][size]", upload.size %> - <%= hidden_field_tag "commited_files[#{i}][mime_type]", upload.mime_type %> - <%= hidden_field_tag "commited_files[#{i}][name]", upload.name %> - <%= hidden_field_tag "commited_files[#{i}][digest]", upload.digest %> + <%= hidden_field_tag "committed_files[#{i}][disk_filename]", upload.disk_filename %> + <%= hidden_field_tag "committed_files[#{i}][tempfile_path]", upload.tempfile_path %> + <%= hidden_field_tag "committed_files[#{i}][size]", upload.size %> + <%= hidden_field_tag "committed_files[#{i}][mime_type]", upload.mime_type %> + <%= hidden_field_tag "committed_files[#{i}][name]", upload.name %> + <%= hidden_field_tag "committed_files[#{i}][digest]", upload.digest %>

<%= l(:info_file_locked) %>

diff --git a/config/locales/cs.yml b/config/locales/cs.yml index c0100df7..c7a2f8a6 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -162,7 +162,7 @@ cs: field_folder: Složka error_file_commit_require_uploaded_file: Potvrzení vyžaduje nahraný soubor - warning_some_files_were_not_commited: "Některé soubory nebyly potvrzené z důvodu chyb při validaci: %{files}" + warning_some_files_were_not_committed: "Některé soubory nebyly potvrzené z důvodu chyb při validaci: %{files}" error_user_has_not_right_delete_folder: Uživatel nemá právo mazat složky diff --git a/config/locales/de.yml b/config/locales/de.yml index 0674a29e..4609a30e 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -162,7 +162,7 @@ de: label_file: Datei field_folder: Ordner error_file_commit_require_uploaded_file: Das Hinzufügen erfordet eine hochgeladene Datei - warning_some_files_were_not_commited: "Einige Dateien wurden wegen Validierungsfehlern nicht hinzugefügt: %{files}" + warning_some_files_were_not_committed: "Einige Dateien wurden wegen Validierungsfehlern nicht hinzugefügt: %{files}" error_user_has_not_right_delete_folder: Der Nutzer hat kein Recht den Ordner zu löschen. error_user_has_not_right_delete_file: Der Nutzer hat kein Recht die Datei zu löschen. notice_entries_deleted: Einträge löschen diff --git a/config/locales/en.yml b/config/locales/en.yml index 6c2b4f77..64b9e419 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -162,7 +162,7 @@ en: field_folder: Folder error_file_commit_require_uploaded_file: File commit require uploaded file - warning_some_files_were_not_commited: "Some files were not committed due to validation errors: %{files}" + warning_some_files_were_not_committed: "Some files were not committed due to validation errors: %{files}" error_user_has_not_right_delete_folder: "User hasn't right to delete folders" diff --git a/config/locales/es.yml b/config/locales/es.yml index cbb7f304..f2e47bcc 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -162,7 +162,7 @@ es: field_folder: Directorio error_file_commit_require_uploaded_file: El commit requiere archivos subidos - warning_some_files_were_not_commited: "Algunos archivos no fueron registrados por un error de validación: %{files}" + warning_some_files_were_not_committed: "Algunos archivos no fueron registrados por un error de validación: %{files}" error_user_has_not_right_delete_folder: "No tiene permisos para eliminar el directorio" diff --git a/config/locales/fa.yml b/config/locales/fa.yml index e9edcf4c..7e50f0d4 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -156,7 +156,7 @@ fa: field_folder: پوشه error_file_commit_require_uploaded_file: ثبت پرونده، نیازمند پرونده‌ی بارگذاری شده است - warning_some_files_were_not_commited: "بعضی از پرونده‌ها به دلیل خطای اعتبارسنجی بارگذاری نشدند: %{files}" + warning_some_files_were_not_committed: "بعضی از پرونده‌ها به دلیل خطای اعتبارسنجی بارگذاری نشدند: %{files}" error_user_has_not_right_delete_folder: "کاربر دسترسی حذف پوشه را ندارد" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2e457fc5..87b0d177 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -162,7 +162,7 @@ fr: field_folder: Dossier error_file_commit_require_uploaded_file: "Transmission des fichiers nécessaire avant l'enregistrement" - warning_some_files_were_not_commited: "Erreur d'enregsitrement de certains fichiers %{files}" + warning_some_files_were_not_committed: "Erreur d'enregsitrement de certains fichiers %{files}" error_user_has_not_right_delete_folder: "L'utilisateur ne dispose pas des droits nécessaires permettant la suppression du dossier" diff --git a/config/locales/hu.yml b/config/locales/hu.yml index abb3d2f8..e3885a20 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -162,7 +162,7 @@ hu: field_folder: Mappa error_file_commit_require_uploaded_file: Fájl beíratáshoz szükséges a feltöltött fájl - warning_some_files_were_not_commited: "Néhány fájl nem került beíratásra validálási locked_documents: Zárolt + warning_some_files_were_not_committed: "Néhány fájl nem került beíratásra validálási locked_documents: Zárolt dokumentum" error_user_has_not_right_delete_folder: A felhasználónak nincs jogosultsága a mappa törléséhez diff --git a/config/locales/it.yml b/config/locales/it.yml index 4011d781..116fcd07 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -162,7 +162,7 @@ it: # Italian strings thx 2 Matteo Arceci! field_folder: Cartella error_file_commit_require_uploaded_file: L'aggiornamento del documento richiede un documento già caricato in precedenza - warning_some_files_were_not_commited: "Alcuni documenti non sono stati aggiornati a causa di errori di validazione: + warning_some_files_were_not_committed: "Alcuni documenti non sono stati aggiornati a causa di errori di validazione: %{files}" error_user_has_not_right_delete_folder: "L'utente non ha i diritti per eliminare le cartelle" diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 5e8c567f..fcd4eeac 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -162,7 +162,7 @@ ja: field_folder: フォルダ error_file_commit_require_uploaded_file: コミットするには、まずファイルをアップロードしてください - warning_some_files_were_not_commited: "いくつかのファイルは、バリデーションエラーのためにコミットされませんでした: %{files}" + warning_some_files_were_not_committed: "いくつかのファイルは、バリデーションエラーのためにコミットされませんでした: %{files}" error_user_has_not_right_delete_folder: ユーザーにフォルダを削除する権限がありません diff --git a/config/locales/ko.yml b/config/locales/ko.yml index e7b9bc03..c5bce6eb 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -162,7 +162,7 @@ ko: field_folder: 폴더 error_file_commit_require_uploaded_file: 파일은 업로드 파일이 필요합니다 - warning_some_files_were_not_commited: "다음 오류로 인하여 파일을 실행할 수 없습니다: %{files}" + warning_some_files_were_not_committed: "다음 오류로 인하여 파일을 실행할 수 없습니다: %{files}" error_user_has_not_right_delete_folder: 사용자는 폴더를 삭제할 수 없습니다 diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 8244e00b..4ea563ad 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -162,7 +162,7 @@ nl: field_folder: Map error_file_commit_require_uploaded_file: Bestand indienen vereist geüpload bestand - warning_some_files_were_not_commited: Sommige bestanden zijn niet ingediend door + warning_some_files_were_not_committed: Sommige bestanden zijn niet ingediend door error_user_has_not_right_delete_folder: Gebruiker heeft geen recht om mappen te verwijderen diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 1a5977c5..28d9888d 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -162,7 +162,7 @@ pl: field_folder: Folder error_file_commit_require_uploaded_file: Commit pliku wymaga jego uprzedniego przesłania - warning_some_files_were_not_commited: "Niektóre pliki nie zostały zacommitowane ze względu na błędy walidacji: + warning_some_files_were_not_committed: "Niektóre pliki nie zostały zacommitowane ze względu na błędy walidacji: %{files}" error_user_has_not_right_delete_folder: "Użytkownik nie posiada uprawnień do usuwania folderów" diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 9d5068f4..0447a798 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -162,7 +162,7 @@ pt-BR: field_folder: Pasta error_file_commit_require_uploaded_file: É necessário carregar um arquivo - warning_some_files_were_not_commited: "O(s) arquivo(s) não foram salvos: %{files}" + warning_some_files_were_not_committed: "O(s) arquivo(s) não foram salvos: %{files}" error_user_has_not_right_delete_folder: "Usuário não possui permissão para excluir pastas" diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 02861aad..de4e4b24 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -162,7 +162,7 @@ sl: field_folder: Pod mapo error_file_commit_require_uploaded_file: Ukaz zahteva naloženo datoteko - warning_some_files_were_not_commited: "Nekatere datoteke niso shranje zaradi napak v validaciji: %{files}" + warning_some_files_were_not_committed: "Nekatere datoteke niso shranje zaradi napak v validaciji: %{files}" error_user_has_not_right_delete_folder: Uporabnik nima privilegija brisati mapo diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 0a638a4c..52a0edc9 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -162,7 +162,7 @@ zh-TW: field_folder: 資料夾 error_file_commit_require_uploaded_file: 檔案提交,需要上傳檔案。 - warning_some_files_were_not_commited: "部份檔案因為驗証失敗無法提交: %{files}" + warning_some_files_were_not_committed: "部份檔案因為驗証失敗無法提交: %{files}" error_user_has_not_right_delete_folder: 使用者沒有權限,刪除資料夾。 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 442bc27b..93cfff52 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -162,7 +162,7 @@ zh: field_folder: 件夹 error_file_commit_require_uploaded_file: 文件提交要求上传文件 - warning_some_files_were_not_commited: "某些文件因验证错误未能被提交: %{files}" + warning_some_files_were_not_committed: "某些文件因验证错误未能被提交: %{files}" error_user_has_not_right_delete_folder: 用户没有权限删除文件夹