diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb index af06b2f7..936c6052 100644 --- a/app/controllers/dmsf_controller.rb +++ b/app/controllers/dmsf_controller.rb @@ -75,7 +75,7 @@ class DmsfController < ApplicationController DmsfMailer.send_documents(User.current, @email_params["to"], @email_params["cc"], @email_params["subject"], @email_params["zipped_content"], @email_params["body"]).deliver File.delete(@email_params["zipped_content"]) - flash[:notice] = l(:notice_email_sent) + flash[:notice] = l(:notice_email_sent, @email_params['to']) redirect_to({:controller => "dmsf", :action => "show", :id => @project, :folder_id => @folder}) end diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 59b804b9..54465479 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -3,8 +3,7 @@ cs: dmsf: DMSF label_dmsf_file_plural: Dmsf soubory warning_no_entries_selected: Není nic vybráno - error_email_to_must_be_entered: Musí být zadán adresát - notice_email_sent: Email byl odeslán + error_email_to_must_be_entered: Musí být zadán adresát warning_file_already_locked: Soubor už je zamčen notice_file_locked: Soubor byl zamčen warning_file_not_locked: Soubor není zamčen diff --git a/config/locales/de.yml b/config/locales/de.yml index 4b1634b6..b34b979d 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -3,8 +3,7 @@ de: dmsf: DMS label_dmsf_file_plural: DMS warning_no_entries_selected: Keine Einträge ausgewählt - error_email_to_must_be_entered: Es muss ein Email-Empfänger angegeben werden. - notice_email_sent: Email gesendet + error_email_to_must_be_entered: Es muss ein Email-Empfänger angegeben werden. warning_file_already_locked: Datei schon gesperrt notice_file_locked: Datei gesperrt warning_file_not_locked: Datei nicht gesperrt diff --git a/config/locales/en.yml b/config/locales/en.yml index 692733f2..4f38d307 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,8 +3,7 @@ en: 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 + error_email_to_must_be_entered: Email To must be entered warning_file_already_locked: File already locked notice_file_locked: File locked warning_file_not_locked: File not locked diff --git a/config/locales/es.yml b/config/locales/es.yml index fef545c9..d5c5e7c2 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -3,8 +3,7 @@ es: dmsf: DMSF label_dmsf_file_plural: DMSF Archivos warning_no_entries_selected: No ha seleccionado ningún ítem - error_email_to_must_be_entered: Ingrese un email - notice_email_sent: Email sent + error_email_to_must_be_entered: Ingrese un email warning_file_already_locked: El archivo ya está bloqueado notice_file_locked: Archivo bloqueado warning_file_not_locked: Archivo no bloqueado diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 16f0f84f..7de2f395 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -3,8 +3,7 @@ fr: dmsf: DMSF label_dmsf_file_plural: Fichiers DMSF warning_no_entries_selected: Aucun fichier sélectionné - error_email_to_must_be_entered: La saisie d'une adresse mail est obligatoire - notice_email_sent: Mail envoyé + error_email_to_must_be_entered: La saisie d'une adresse mail est obligatoire warning_file_already_locked: Fichier déjà verrouillé notice_file_locked: Fichier verrouillé warning_file_not_locked: Fichier déverrouillé diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 64447a7c..3c8101ea 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -3,8 +3,7 @@ ja: dmsf: DMSF label_dmsf_file_plural: Dmsf ファイル warning_no_entries_selected: エントリーが選ばれていません - error_email_to_must_be_entered: 電子メールの To 先は省略できません - notice_email_sent: 電子メールを送信しました + error_email_to_must_be_entered: 電子メールの To 先は省略できません warning_file_already_locked: ファイルは既にロックされています notice_file_locked: ファイルをロックしました warning_file_not_locked: ファイルはロックされていません diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 9c4ccc24..4f4d999e 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -3,8 +3,7 @@ ru: dmsf: DMSF label_dmsf_file_plural: Файлы DMSF warning_no_entries_selected: Файлы не выбраны - error_email_to_must_be_entered: Нужно указать, на какую почту отправить письмо - notice_email_sent: Письмо отправлено + error_email_to_must_be_entered: Нужно указать, на какую почту отправить письмо warning_file_already_locked: Файл уже заблокирован notice_file_locked: Файл заблокирован warning_file_not_locked: Файл не заблокирован diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 0034d3c0..e5b45007 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -3,8 +3,7 @@ zh: dmsf: 文档管家 label_dmsf_file_plural: Dmsf files warning_no_entries_selected: 未选择任何条目 - error_email_to_must_be_entered: 请输入电子邮件 - notice_email_sent: 邮件已发送 + error_email_to_must_be_entered: 请输入电子邮件 warning_file_already_locked: 文件已经锁定 notice_file_locked: 文件锁定 warning_file_not_locked: 文件未锁定