]> source.dussan.org Git - redmine.git/commitdiff
Add an indication to admin/info whether or not ImageMagick convert is available ...
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Fri, 15 Nov 2013 20:11:00 +0000 (20:11 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Fri, 15 Nov 2013 20:11:00 +0000 (20:11 +0000)
Patch by Mischa The Evil.

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

49 files changed:
app/controllers/admin_controller.rb
config/locales/ar.yml
config/locales/az.yml
config/locales/bg.yml
config/locales/bs.yml
config/locales/ca.yml
config/locales/cs.yml
config/locales/da.yml
config/locales/de.yml
config/locales/el.yml
config/locales/en-GB.yml
config/locales/en.yml
config/locales/es.yml
config/locales/et.yml
config/locales/eu.yml
config/locales/fa.yml
config/locales/fi.yml
config/locales/fr.yml
config/locales/gl.yml
config/locales/he.yml
config/locales/hr.yml
config/locales/hu.yml
config/locales/id.yml
config/locales/it.yml
config/locales/ja.yml
config/locales/ko.yml
config/locales/lt.yml
config/locales/lv.yml
config/locales/mk.yml
config/locales/mn.yml
config/locales/nl.yml
config/locales/no.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/pt.yml
config/locales/ro.yml
config/locales/ru.yml
config/locales/sk.yml
config/locales/sl.yml
config/locales/sq.yml
config/locales/sr-YU.yml
config/locales/sr.yml
config/locales/sv.yml
config/locales/th.yml
config/locales/tr.yml
config/locales/uk.yml
config/locales/vi.yml
config/locales/zh-TW.yml
config/locales/zh.yml

index 2cabbd3e1fdd412616149ead619745571317021b..ad658112052a17ab7094496355bf0644d5fec8e9 100644 (file)
@@ -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
index 172d7354d54efc3108ebffd6cfc20b6f6a6876e3..4a4406dc71fb53f2d1353e0cb43d9ca3a3edb80f 100644 (file)
@@ -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)
index 13cf32e299ad9e55a1810bc29f16f5186cec077b..0a8edccd216bccbd953f98b57df408a06eb3d9a8 100644 (file)
@@ -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)
index 41f69701b18136a94817ffbaaf07883b64cd50fa..7baa177606fc63d97671685038607837765fdeb8 100644 (file)
@@ -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)
index b01ae81f3f76bb5084f32186fff9390a3d1287e3..4265a3bbe0d11daeac87beeda20b000e08919c91 100644 (file)
@@ -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)
index 3084e776c6b420f5e1bf8069224503a5749df65b..3bb4948fbbdfdec30dc26fe687c119517294e6ef 100644 (file)
@@ -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)
index 112b108978dc8bff834138e025de0611553c3ea4..ce289e9904579eb9b63040fd4923a16358d5eb07 100644 (file)
@@ -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)
index 7416664c555aaf38a1723b02a4ff8bbe97e08883..6eec057eb7c6f82be1247d59fbca0bd11496229a 100644 (file)
@@ -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)
index 3d016893b4960d7982f3d9bf0694ed06a60aecb7..805885f276a4752c287e05e26d57efe882707e17 100644 (file)
@@ -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)
index c2d0e81a993a88fbdb2d968bb07faaa3a537144b..1223e32aaec750f24974d968a0bd5e0f11d30ca0 100644 (file)
@@ -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)
index 266dac7d204e53498a30e8bb679b628a046192a2..bc63046dbd38eb2c839861843a18c25efee71424 100644 (file)
@@ -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)
index ae00c7759ba08d60099f9eb8973ba2734d4a7f2c..f215bfd173dbf6b2d8b25be3401069a614d08788 100644 (file)
@@ -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
index e9fb8781bf9084f6a8b7fdc457234b018e5ba0f7..b130d7856edb1e42afebef4446ae86f15c0357a8 100644 (file)
@@ -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)
index 6e4c26e63adc199c44fc23096c79848e857d9165..59f0551da3226d3b931bbe3c6c6a04c8b4975dad 100644 (file)
@@ -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)
index f7ed3f1a643cea98cc786e4d09fbb4310f690092..6686dfa9d00059b7e0ed74f9c644dced0809a2e8 100644 (file)
@@ -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)
index 441a742e2d8050534eea4f3a3a7974d963936b6b..70e79b46a6552756c697f6e42591d5165d258ecf 100644 (file)
@@ -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)
index 94bb063a35e969766bd258851a5f8fc1173f7f82..4a5ff7780737b39367e8667edd37bbaf7a21da29 100644 (file)
@@ -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)
index 4cf57e73914815aea5052ea558496c20b96c5c69..691336d40114399e9d70fbb52a3ad8956995f1f5 100644 (file)
@@ -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)
index b00c2f0e9a9052def6444cb55434cb2bcf82b863..2829a52ea5c648b043958e5426d3fc7311b5ff95 100644 (file)
@@ -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)
index 855269143696ceecb6e5bc0a3312884937777a2d..2f08bdbf13d74a827ddf7c37715ddce1f125f5dd 100644 (file)
@@ -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)
index bc7f9091025bc8234b835429eaddde9c58acb205..c8499c17a85dc2f974c44ea69b07561ae9c648df 100644 (file)
@@ -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)
index aad70a1f8046cec86984cb212501ddf1116bbbe7..7ee70b5cba51cf3cbe20371fc8228a851a9c4de5 100644 (file)
   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)
index 7d4e23ee27eecc042668d8d375da77d25dce0f69..2ea37cad33c3612c6474e0851ea9afe254ef2bfc 100644 (file)
@@ -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)
index f654179df3774745abbb07457d6d697012e53c6b..72703fe3211c4371bbd13a6c092c1d186b1e0e76 100644 (file)
@@ -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)
index 778f98ad4337fb1c34363ca9c2ec9d9bca21f961..beecf3b91b681f219d8581fa374fa1ebb0e53784 100644 (file)
@@ -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)
index 5ed2778ebaaa7b078a07e3be662d199b3f5ae7b1..296b973dcd02ca92a48511953e561607bfc6ec82 100644 (file)
@@ -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)
index 2dcf39c7355eb3a998e0e79b204f3863446b64c8..157227b10033f8a90cda02908fd548cf8e8aaa85 100644 (file)
@@ -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)
index cb576eefda5bbd8a32581dde57bd3f74d4fecf91..5c772ea7b10a7531a0cf4dc92ecdff3701fb3b5b 100644 (file)
@@ -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)
index 0644ceecf4ad1956d104004092957118e8f50775..b6eabc57cbc99a5b1e4a1d911063481e75ceb291 100644 (file)
@@ -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)
index 92c537171d9724504ffea0cd709d0e35f018bf57..20593e7bace4d9bb398ee4b032758d7d5244236d 100644 (file)
@@ -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)
index e9459be92a087c2b4f5628478ef52baba487a15d..58b71257687958d9c86ac94b5836643f12d8de17 100644 (file)
@@ -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)
index 79ee6adfc067cd39953dfe751ba9e618fed8c588..4deab0ee9d61804e33c5e4b103fdf8a27ead879c 100644 (file)
   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)
index 5ce7a9c1444accc64688f093172bedd87a8b16c4..a833cb88413300790a16be9eca894e3b3b367efc 100644 (file)
@@ -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)
index 5d6e74a0bb077ae9787e11878b0240124eb3b821..c8117934aaa8bcb88d438adc48afc554c1de400b 100644 (file)
@@ -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)
index 923d4fb66abbff49b30badf910f018fba8607f58..5427fa9ca02413e62f19884a782b98b84712c98d 100644 (file)
@@ -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)
index b6cef787a59b14e67e3bef1b4490125167ed0428..122315548730355f08b0ebf2b9c594040420e556 100644 (file)
@@ -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)
index 43919806b712f5dc7dba031457d2ba7ddbb488f3..af85de65814fbf7381dc197ce136fff9d1beb784 100644 (file)
@@ -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)
index 3d665ecd5d7ad4a7f8998f8b968f52cc8036ee0e..adecae9181a8d4098760917ebed39fdf52810efa 100644 (file)
@@ -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)
index 1e4f28f8e3e862e292941daa7c07d7bcb5cfc229..eab30a85ce427cec21f8b917124c1991b08c1fd8 100644 (file)
@@ -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)
index b5fdebe8dc779885d583d26e1d34bee537f3c652..953f819c1ddea0da958b2f356f32dd6930170f27 100644 (file)
@@ -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)
index 13803b182fa7161db16c3418bb92f3e8b1d119d4..504b0c33f6c38119ad1a38ef20e941356261b03b 100644 (file)
@@ -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)
index 8152523f557f4292aa94749c8869d778bfae1bf2..c9a66a8a20dace1c6b7798583b8f87d56a7bde86 100644 (file)
@@ -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)
index b5df5e6a6ac27201f4c9b21157af7f763d97f153..cccdd815a5e076d1fab16d0569573b946777e4d5 100644 (file)
@@ -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)
index f4a51db407e7499427d372e7c58957e3f35eaa28..3f77f06ec22d990c71913c01e4fdf261096ba82a 100644 (file)
@@ -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)
index 333b02439c6dbbe0a2d47ba4dac849ffbce4a064..15b924a1c91870939ac0087596e9507c0867bcab 100644 (file)
@@ -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)
index 0be3dbb8ddd8ec00d7fb79a441b90c359c51d6a6..fe844f81d3ff6bd7614703908fd9938770687b4c 100644 (file)
@@ -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)
index 3ccb0d38f471e552409956f13ac2e8ff1c9d6526..6db3af8a44427d6b87c7225653640647d2455202 100644 (file)
@@ -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)
index 87c13d7e0f32d0a29a7ab96071959ff0b075c8c1..c4f1fcc292fba02b82e6412c848eac4049a6c7ac 100644 (file)
   description_date_from: 輸入起始日期
   description_date_to: 輸入結束日期
   text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
+  text_convert_available: ImageMagick convert available (optional)
index c5e4a16e15787fa6b4543be4c96122e3319aeee2..84a78e91916bc30e9868175e7fc638d01cb4745f 100644 (file)
@@ -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)