@@ -15,13 +15,14 @@ class Episode < ActiveRecord::Base :url => "/system/:class/:attachment/:id/:style_:basename.:extension", }.merge(Tog::Plugins.storage_options) - validates_attachment_presence :file, :message => I18n.t('TODO.presence') + validates_attachment_presence :file, :message => I18n.t('tog_podcasts.model.validations.presence') - validates_attachment_size :file, :message => I18n.t('TODO.size'), + validates_attachment_size :file, :message => I18n.t('tog_podcasts.model.validations.file_size'), :less_than => Tog::Plugins.settings(:tog_podcasts, "episodes.max_file_size_kb").to_i.kilobytes - validates_attachment_content_type :file, :message => I18n.t('TODO.type'), - :content_type => ['audio/mpeg', 'audio/mpg', 'audio/mp3', 'audio/mp4', 'audio/mpeg3', 'audio/x-mp3', 'audio/x-mpeg3'] + validates_attachment_content_type :file, + :message => I18n.t('tog_podcasts.model.validations.allowed_types', :allowed_types => Tog::Plugins.settings(:tog_podcasts, "allowed_mime_types")), + :content_type => Tog::Plugins.settings(:tog_podcasts, "allowed_mime_types").split(',').collect{|x| x.strip } app/models/episode.rb @@ -4,6 +4,7 @@ require_plugin 'flashplayrhelpr' require_plugin 'paperclip' + require "i18n" unless defined?(I18n) Dir[File.dirname(__FILE__) + '/locale/**/*.yml'].each do |file| I18n.load_path << file @@ -15,7 +16,8 @@ Tog::Plugins.settings :tog_podcasts, "channel.cover.max_file_size_kb"=> 1000, #k "channel.cover.small" => "50x50#", "channel.cover.tiny" => "25x25#", "channel.cover.default_image" => '/tog_podcasts/images/default_cover.jpg', - "episodes.max_file_size_kb" => 30000 #kb + "episodes.max_file_size_kb" => 30000, #kb + "allowed_mime_types" => %w( audio/mpeg audio/mpg audio/mp3 audio/mp4 audio/mpeg3 audio/x-mp3 audio/x-mpeg3 ).join(', ') Tog::Plugins.helpers Podcasts::ChannelsHelper init.rb @@ -14,7 +14,7 @@ en: description: description cover_image: cover image validations: - allowed_types: is not one of the allowed file types. + allowed_types: is not one of the allowed file types ({{allowed_types}}). presence: must be set. file_size: file size must be between :min and :max bytes. site: locale/tog_podcasts.yml @@ -14,7 +14,7 @@ es: description: Descripción cover_image: Imagen de portada validations: - allowed_types: no es uno de los tipos de ficheros permitidos. + allowed_types: no tiene uno de los tipos de ficheros permitidos ({{allowed_types}}). presence: se debe rellenar file_size: el tamaño del fichero debe estar entre :min y :max bytes. site: locale/tog_podcasts_es.yml ce235fd182f23aaa6cb766f0e430f3e120db4cd2 Alberto Molpeceres alberto.molpeceres@gmail.com http://github.com/molpe/tog_podcasts/commit/6d59e60dc9fe0c5000f6b4573b8215ab08996343 6d59e60dc9fe0c5000f6b4573b8215ab08996343 2009-02-18T04:24:56-08:00 2009-02-18T04:24:56-08:00 mime types configurable and i18n messages for validations b3fbef9b5109e9c911cedcd03da44e5370974a9a Alberto Molpeceres alberto.molpeceres@gmail.com