Commit d755d6b1 authored by jplang's avatar jplang

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

Patch by Mischa The Evil.

git-svn-id: https://svn.redmine.org/redmine/trunk@12278 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent aa6a5ab6
......@@ -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
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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
......
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -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)
......@@ -1180,3 +1180,4 @@
description_date_from: 輸入起始日期
description_date_to: 輸入結束日期
text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
text_convert_available: ImageMagick convert available (optional)
......@@ -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)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment