Changeset 466

Show
Ignore:
Timestamp:
07/21/07 13:37:59 (1 year ago)
Author:
jlong
Message:

jargon: a few additional corrections for Gibberish support; closes ticket #518 [Keith Bingman]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/jargon/radiant/app/models/page.rb

    r424 r466  
    1616   
    1717  # Validations 
    18   validates_presence_of :title, :slug, :breadcrumb, :status_id, :message => 'required' 
    19    
    20   validates_length_of :title, :maximum => 255, :message => '%d-character limit' 
    21   validates_length_of :slug, :maximum => 100, :message => '%d-character limit' 
    22   validates_length_of :breadcrumb, :maximum => 160, :message => '%d-character limit' 
    23    
    24   validates_format_of :slug, :with => %r{^([-_.A-Za-z0-9]*|/)$}, :message => 'invalid format'   
    25   validates_uniqueness_of :slug, :scope => :parent_id, :message => 'slug already in use for child of parent' 
    26   validates_numericality_of :id, :status_id, :parent_id, :allow_nil => true, :only_integer => true, :message => 'must be a number' 
     18  validates_presence_of :title, :slug, :breadcrumb, :status_id, :message => 'required'[:required] 
     19   
     20  validates_length_of :title, :maximum => 255, :message => '%d-character limit'[:character_limit] 
     21  validates_length_of :slug, :maximum => 100, :message => '%d-character limit'[:character_limit] 
     22  validates_length_of :breadcrumb, :maximum => 160, :message => '%d-character limit'[:character_limit] 
     23   
     24  validates_format_of :slug, :with => %r{^([-_.A-Za-z0-9]*|/)$}, :message => 'invalid format'[:invalid_format] 
     25  validates_uniqueness_of :slug, :scope => :parent_id, :message => 'slug already in use for child of parent'[:slug_in_use] 
     26  validates_numericality_of :id, :status_id, :parent_id, :allow_nil => true, :only_integer => true, :message => 'must be a number'[:must_be_number] 
    2727   
    2828  validate :valid_class_name 

  • branches/jargon/radiant/app/models/page_part.rb

    r405 r466  
    88   
    99  # Validations 
    10   validates_presence_of :name, :message => 'required' 
    11   validates_length_of :name, :maximum => 100, :message => '%d-character limit' 
    12   validates_length_of :filter_id, :maximum => 25, :allow_nil => true, :message => '%d-character limit' 
    13   validates_numericality_of :id, :page_id, :allow_nil => true, :only_integer => true, :message => 'must be a number' 
     10  validates_presence_of :name, :message => 'required'[:required] 
     11  validates_length_of :name, :maximum => 100, :message => '%d-character limit'[:character_limit] 
     12  validates_length_of :filter_id, :maximum => 25, :allow_nil => true, :message => '%d-character limit'[:character_limit] 
     13  validates_numericality_of :id, :page_id, :allow_nil => true, :only_integer => true, :message => 'must be a number'[:must_be_number] 
    1414   
    1515  object_id_attr :filter, TextFilter 

  • branches/jargon/radiant/lang/en.yaml

    r465 r466  
    3838by: 'by' 
    3939at: 'at' 
     40 
     41 
     42# --- MODELS --- 
     43 
     44# General Error Messages 
     45required: 'required' 
     46character_limit: '%d-character limit' 
     47character_minimum: '%d-character minimum' 
     48must_be_number: 'must be a number' 
     49name_in_use: 'name already in use' 
     50 
     51# Page Error Messages 
     52invalid_format: 'invalid format'  
     53   
     54# Snippet Error Messages 
     55cannot_contain_spaces_tabs: 'cannot contain spaces or tabs' 
     56slug_in_use: 'slug already in use for child of parent' 
     57 
     58# User Error Messages 
     59login_in_use: 'login already in use' 
     60must_match_confirmation: 'must match confirmation' 
     61 
    4062 
    4163