From 82c0d8edb32eeb4dc38784df54ae294db42367ec Mon Sep 17 00:00:00 2001 From: "vit.jonas@gmail.com" Date: Sun, 5 Jun 2011 16:18:49 +0000 Subject: [PATCH] * fixes in setting evaluation * error message translation git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@124 5e329b0b-a2ee-ea63-e329-299493fc886d --- app/views/settings/_dmsf_settings.erb | 5 ++++- config/locales/cs.yml | 4 ++++ config/locales/de.yml | 4 ++++ config/locales/en-GB.yml | 4 ++++ config/locales/en.yml | 5 +++++ config/locales/es.yml | 4 ++++ config/locales/fr.yml | 4 ++++ config/locales/ja.yml | 4 ++++ config/locales/ru.yml | 4 ++++ 9 files changed, 37 insertions(+), 1 deletion(-) diff --git a/app/views/settings/_dmsf_settings.erb b/app/views/settings/_dmsf_settings.erb index 14b2aa46..b00c43a8 100644 --- a/app/views/settings/_dmsf_settings.erb +++ b/app/views/settings/_dmsf_settings.erb @@ -16,7 +16,10 @@

<%=content_tag(:label, l(:label_file_storage_directory) + ":") %> - <% storage_dir = @settings["dmsf_storage_directory"].strip %> + <% + storage_dir = @settings["dmsf_storage_directory"].strip + storage_dir = "#{RAILS_ROOT}/files/dmsf" if storage_dir.blank? + %> <%=text_field_tag "settings[dmsf_storage_directory]", storage_dir, :size=>50 %>
(<%=l(:label_default)%>: <%="#{RAILS_ROOT}/files/dmsf"%>)

diff --git a/config/locales/cs.yml b/config/locales/cs.yml index bf4c42cd..87113a5a 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -153,4 +153,8 @@ cs: :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" \ No newline at end of file diff --git a/config/locales/de.yml b/config/locales/de.yml index afd5de47..18f78e27 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -155,4 +155,8 @@ de: :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" \ No newline at end of file diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 2c887d31..2614a22b 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -149,4 +149,8 @@ en-GB: :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" \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 30ee464b..8ba5c15c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -153,4 +153,9 @@ en: :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" \ No newline at end of file diff --git a/config/locales/es.yml b/config/locales/es.yml index 3e9f6bd9..8afaeda8 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -151,4 +151,8 @@ es: :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" \ No newline at end of file diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 4877cc2f..73e201fa 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -149,4 +149,8 @@ fr: :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" \ No newline at end of file diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 30ee464b..b6fca078 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -153,4 +153,8 @@ en: :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" \ No newline at end of file diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 2ae5ad13..6747ee4c 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -149,4 +149,8 @@ ru: :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" \ No newline at end of file