Add an indication to admin/info whether or not ImageMagick convert is available (#15311).

Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@12278 e93f8b46-1217-0410-a6f0-8f06a7374b81

49 files changed, 50 insertions, 1 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 2cabbd3e1..ad6581120 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -77,7 +77,8 @@ class AdminController < ApplicationController
       [:text_default_administrator_account_changed, User.default_admin_account_changed?],
       [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
       [:text_plugin_assets_writable,   File.writable?(Redmine::Plugin.public_directory)],
-      [:text_rmagick_available,        Object.const_defined?(:Magick)]
+      [:text_rmagick_available,        Object.const_defined?(:Magick)],
+      [:text_convert_available,        Redmine::Thumbnail.convert_available?]
     ]
   end
 end
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 172d7354d..4a4406dc7 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1100,3 +1100,4 @@ ar:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 13cf32e29..0a8edccd2 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1197,3 +1197,4 @@ az:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 41f69701b..7baa17760 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1097,3 +1097,4 @@ bg:
   description_date_from: Въведете начална дата
   description_date_to: Въведете крайна дата
   text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index b01ae81f3..4265a3bbe 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1113,3 +1113,4 @@ bs:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 3084e776c..3bb4948fb 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1102,3 +1102,4 @@ ca:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 112b10897..ce289e990 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1104,3 +1104,4 @@ cs:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 7416664c5..6eec057eb 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1117,3 +1117,4 @@ da:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 3d016893b..805885f27 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1112,3 +1112,4 @@ de:
   version_status_open: offen
 
   warning_attachments_not_saved: "%{count} Datei(en) konnten nicht gespeichert werden."
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/el.yml b/config/locales/el.yml
index c2d0e81a9..1223e32aa 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1100,3 +1100,4 @@ el:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 266dac7d2..bc63046db 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1102,3 +1102,4 @@ en-GB:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ae00c7759..f215bfd17 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1014,6 +1014,7 @@ en:
   text_file_repository_writable: Attachments directory writable
   text_plugin_assets_writable: Plugin assets directory writable
   text_rmagick_available: RMagick available (optional)
+  text_convert_available: ImageMagick convert available (optional)
   text_destroy_time_entries_question: "%{hours} hours were reported on the issues you are about to delete. What do you want to do?"
   text_destroy_time_entries: Delete reported hours
   text_assign_time_entries_to_project: Assign reported hours to the project
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e9fb8781b..b130d7856 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1135,3 +1135,4 @@ es:
   field_must_change_passwd: Cambiar la contraseña en el siguiente identificación
   notice_new_password_must_be_different: Nueva contraseña debe ser diferente de la actual
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 6e4c26e63..59f0551da 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1113,3 +1113,4 @@ et:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index f7ed3f1a6..6686dfa9d 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1101,3 +1101,4 @@ eu:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 441a742e2..70e79b46a 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1102,3 +1102,4 @@ fa:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 94bb063a3..4a5ff7780 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1121,3 +1121,4 @@ fi:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4cf57e739..691336d40 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1111,3 +1111,4 @@ fr:
   setting_repositories_encodings: Encodages des fichiers et des dépôts
   label_search_for_watchers: Rechercher des observateurs
   text_repository_identifier_info: 'Seuls les lettres minuscules (a-z), chiffres, tirets et tirets bas sont autorisés.<br />Un fois sauvegardé, l''identifiant ne pourra plus être modifié.'
+  text_convert_available: Binaire convert de ImageMagick présent (optionel)
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index b00c2f0e9..2829a52ea 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1111,3 +1111,4 @@ gl:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 855269143..2f08bdbf1 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1105,3 +1105,4 @@ he:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index bc7f90910..c8499c17a 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1101,3 +1101,4 @@ hr:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index aad70a1f8..7ee70b5cb 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1119,3 +1119,4 @@
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 7d4e23ee2..2ea37cad3 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1104,3 +1104,4 @@ id:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/it.yml b/config/locales/it.yml
index f654179df..72703fe32 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1099,3 +1099,4 @@ it:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 778f98ad4..beecf3b91 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1127,3 +1127,4 @@ ja:
   field_must_change_passwd: 次回ログイン時にパスワード変更を強制
   notice_new_password_must_be_different: 新しいパスワードは現在のパスワードと異なるものでなければなりません
   setting_mail_handler_excluded_filenames: 除外する添付ファイル名
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 5ed2778eb..296b973dc 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1149,3 +1149,4 @@ ko:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 2dcf39c73..157227b10 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1159,3 +1159,4 @@ lt:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index cb576eefd..5c772ea7b 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1094,3 +1094,4 @@ lv:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 0644ceecf..b6eabc57c 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1100,3 +1100,4 @@ mk:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index 92c537171..20593e7ba 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -1101,3 +1101,4 @@ mn:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e9459be92..58b712576 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1079,3 +1079,4 @@ nl:
   field_must_change_passwd: Moet wachtwoord wijziging bij volgende keer inloggen
   notice_new_password_must_be_different: Het nieuwe wachtwoord mag niet hetzelfde zijn als het huidige wachtwoord
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert beschikbaar (optioneel)
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 79ee6adfc..4deab0ee9 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1090,3 +1090,4 @@
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 5ce7a9c14..a833cb884 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1122,3 +1122,4 @@ pl:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 5d6e74a0b..c8117934a 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1120,3 +1120,4 @@ pt-BR:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 923d4fb66..5427fa9ca 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1106,3 +1106,4 @@ pt:
   field_must_change_passwd: Tem que alterar a palavra-passe no próximo início de sessão
   notice_new_password_must_be_different: A palavra-passe tem de ser diferente da actual
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index b6cef787a..122315548 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1095,3 +1095,4 @@ ro:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 43919806b..af85de658 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1210,3 +1210,4 @@ ru:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 3d665ecd5..adecae918 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1090,3 +1090,4 @@ sk:
   field_must_change_passwd: Pri najbližšom prihlásení je potrebné zmeniť heslo
   notice_new_password_must_be_different: Nové heslo nesmie byť rovnaké ako súčasné heslo
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 1e4f28f8e..eab30a85c 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1100,3 +1100,4 @@ sl:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index b5fdebe8d..953f819c1 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1096,3 +1096,4 @@ sq:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 13803b182..504b0c33f 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -1102,3 +1102,4 @@ sr-YU:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 8152523f5..c9a66a8a2 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1101,3 +1101,4 @@ sr:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index b5df5e6a6..cccdd815a 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1138,3 +1138,4 @@ sv:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/th.yml b/config/locales/th.yml
index f4a51db40..3f77f06ec 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1097,3 +1097,4 @@ th:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 333b02439..15b924a1c 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1119,3 +1119,4 @@ tr:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 0be3dbb8d..fe844f81d 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1095,3 +1095,4 @@ uk:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 3ccb0d38f..6db3af8a4 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1153,3 +1153,4 @@ vi:
   notice_new_password_must_be_different: The new password must be different from the
     current password
   setting_mail_handler_excluded_filenames: Exclude attachments by name
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 87c13d7e0..c4f1fcc29 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1180,3 +1180,4 @@
   description_date_from: 輸入起始日期
   description_date_to: 輸入結束日期
   text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
+  text_convert_available: ImageMagick convert available (optional)
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index c5e4a16e1..84a78e919 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1101,3 +1101,4 @@ zh:
   field_must_change_passwd: 下次登录时必须修改密码
   notice_new_password_must_be_different: 新密码必须和旧密码不同
   setting_mail_handler_excluded_filenames: 移除符合下列名称的附件
+  text_convert_available: ImageMagick convert available (optional)