t#30277:change valid message for url

diff --git a/app/models/demander.rb b/app/models/demander.rb
index 3bcebb2..0e9b948 100644 (file)
--- a/app/models/demander.rb
+++ b/app/models/demander.rb
@@ -5,9 +5,9 @@ class Demander < ActiveRecord::Base
   validates :demand_user_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :name, :presence => true, :length => {:maximum => 50}, :uniqueness => true
   validates :caption, :presence => true, :length => {:maximum => 30}
-  validates :url, :presence => true, :length => {:maximum => 200}, :url => true
+  validates :url, :presence => true, :length => {:maximum => 200}, :url => {:message => I18n.t('errors.messages.url')}
   validates :description, :presence => true
-  validates :demander_url, :presence => true, :length => {:maximum => 200}, :url => true
+  validates :demander_url, :presence => true, :length => {:maximum => 200}, :url => {:message => I18n.t('errors.messages.url')}
   validates :demander_status_id, :presence => true, :numericality => true, :existence => {:both => false}
   
   def supply_default

diff --git a/app/models/license.rb b/app/models/license.rb
index b34e351..ff138c1 100644 (file)
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -6,7 +6,7 @@ class License < ActiveRecord::Base
   validates :license_group_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :name, :presence => true, :length => {:maximum => 50}
   validates :caption, :presence => true, :length => {:maximum => 30}
-  validates :url, :presence => true, :length => {:maximum => 200}, :uniqueness => true, :url => true #{:allow_blank => true}
+  validates :url, :presence => true, :length => {:maximum => 200}, :uniqueness => true, :url => {:message => I18n.t('errors.messages.url')} #{:allow_blank => true}
   validates :system_picture_id, :presence => true, :numericality => true, :existence => {:both => false}
   
   def supply_default

diff --git a/app/models/license_group.rb b/app/models/license_group.rb
index 188b7a2..19d8dfa 100644 (file)
--- a/app/models/license_group.rb
+++ b/app/models/license_group.rb
@@ -5,7 +5,7 @@ class LicenseGroup < ActiveRecord::Base
   validates :name, :presence => true, :length => {:maximum => 50}, :uniqueness => true
   validates :classname, :presence => true, :length => {:maximum => 50}
   validates :caption, :presence => true, :length => {:maximum => 30}
-  validates :url, :presence => true, :length => {:maximum => 200}, :url => true
+  validates :url, :presence => true, :length => {:maximum => 200}, :url => {:message => I18n.t('errors.messages.url')}
   
   def supply_default
   end

diff --git a/app/models/panel_picture.rb b/app/models/panel_picture.rb
index 3da2654..6c1342a 100644 (file)
--- a/app/models/panel_picture.rb
+++ b/app/models/panel_picture.rb
@@ -4,7 +4,7 @@ class PanelPicture < ActiveRecord::Base
   
   validates :panel_id, :numericality => {:allow_blank => true}
   validates :picture_id, :numericality => true, :existence => {:both => false}
-  validates :link, :length => {:maximum => 200}, :url => {:allow_blank => true}
+  validates :link, :length => {:maximum => 200}, :url => {:allow_blank => true, :message => I18n.t('errors.messages.url')}
   validates :x, :presence => true, :numericality => true
   validates :y, :presence => true, :numericality => true
   validates :width, :presence => true, :numericality => true, :not_zero => true, :reverse => true, :resize => true, :sync_vh => true