padrino-admin 0.9.10 → 0.9.11

data/README.rdoc

@@ -49,7 +49,7 @@ For an ecommerce website, usually certain actions require permissions and authen
 by the admin access control features:
 
   class EcommerceSite < Padrino::Application
-    enable :authentication
+    register Padrino::Admin::AccessControl
     enable :store_location
     set    :login_page, "/login"
 

data/Rakefile

@@ -1,54 +1,5 @@
-require 'rubygems'
-require 'rake'
-require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "padrino-admin"
-    gem.summary = "Admin Dashboard for Padrino"
-    gem.description = "Admin View for Padrino applications"
-    gem.email = "padrinorb@gmail.com"
-    gem.homepage = "http://github.com/padrino/padrino-framework/tree/master/padrino-admin"
-    gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-    gem.rubyforge_project = 'padrino-admin'
-    gem.version = Padrino.version
-    gem.add_runtime_dependency     "padrino-core",    "= #{Padrino.version}"
-    gem.add_runtime_dependency     "padrino-gen",     "= #{Padrino.version}"
-    gem.add_runtime_dependency     "padrino-helpers", "= #{Padrino.version}"
-    gem.add_development_dependency "haml",            ">= 2.2.1"
-    gem.add_development_dependency "shoulda",         ">= 0"
-    gem.add_development_dependency "mocha",           ">= 0.9.7"
-    gem.add_development_dependency "rack-test",       ">= 0.5.0"
-    gem.add_development_dependency "webrat",          ">= 0.5.1"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new { |r| r.doc_task = :none }
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'test'
+# coding:utf-8
+RAKE_ROOT = __FILE__
 
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |rcov|
-    rcov.libs << 'test'
-    rcov.pattern = 'test/**/test_*.rb'
-    rcov.verbose = true
-    rcov.rcov_opts << ['--exclude /Gems/1.8/gems/,padrino-core,padrino-cache,padrino-gen,padrino-helpers,padrino-mailer']
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install relevance-rcov"
-  end
-end
-
-task :default => :test
+require 'rubygems'
+require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

data/lib/padrino-admin/access_control.rb

@@ -9,34 +9,24 @@ module Padrino
       ##
       # Method used by Padrino::Application when we register the extension
       #
-      def self.registered(app)
-        app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym
-        app.enable :sessions
-        app.helpers Padrino::Admin::Helpers::AuthenticationHelpers
-        app.helpers Padrino::Admin::Helpers::ViewHelpers
-        app.before { login_required }
-      end
-
-      module ClassMethods #:nodoc:
-        def inherited(base)
-          unless base.respond_to?(:access_control)
-            base.send(:cattr_accessor, :access_control)
-            base.send(:access_control=, Padrino::Admin::AccessControl::Base.new)
-          end
-          super(base)
-          base.class_eval { class << self; alias_method_chain :reload!, :access_control; end }
-        end
-
-        def reload_with_access_control!
-          self.access_control = Padrino::Admin::AccessControl::Base.new
-          reload_without_access_control!
+      class << self
+        def registered(app)
+          app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym
+          app.enable :sessions
+          app.helpers Padrino::Admin::Helpers::AuthenticationHelpers
+          app.helpers Padrino::Admin::Helpers::ViewHelpers
+          app.before { login_required }
+          app.send(:cattr_accessor, :access_control)
+          app.send(:access_control=, Padrino::Admin::AccessControl::Base.new)
         end
+        alias :included :registered
       end
 
       class Base
         def initialize #:nodoc:
           @roles, @authorizations, @project_modules = [], [], []
         end
+
         ##
         # We map project modules for a given role or roles
         #

data/lib/padrino-admin/generators/admin_app.rb

@@ -9,7 +9,7 @@ module Padrino
       # Define the source template root and themes
       def self.source_root; File.expand_path(File.dirname(__FILE__)); end
       def self.banner; "padrino-gen admin"; end
-      def self.themes; Dir[File.dirname(__FILE__) + "/templates/assets/stylesheets/themes/*"].map { |t| File.basename(t) }; end
+      def self.themes; Dir[File.dirname(__FILE__) + "/templates/assets/stylesheets/themes/*"].map { |t| File.basename(t) }.sort; end
 
       # Include related modules
       include Thor::Actions

data/lib/padrino-admin/generators/orm.rb

@@ -33,11 +33,11 @@ module Padrino
         def columns
           @columns ||= case orm
             when :activerecord then @klass.columns
-            when :datamapper   then @klass.properties
+            when :datamapper   then @klass.properties.map { |p| Column.new(p.name, p.primitive || p.type) }
             when :couchrest    then @klass.properties
             when :mongoid      then @klass.fields.values
             when :mongomapper  then @klass.keys.values.reject { |key| key.name == "_id" } # On MongoMapper keys are an hash
-            when :sequel       then @klass.db_schema.map { |k,v| Column.new(k, v[:type]) }
+            when :sequel       then @klass.db_schema.map { |k,v| v[:type] = :text if v[:db_type] =~ /^text/i; Column.new(k, v[:type]) }
             else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
@@ -59,7 +59,7 @@ module Padrino
           case orm
             when :activerecord, :mongomapper, :mongoid then "#{klass_name}.find(#{params})"
             when :datamapper, :couchrest   then "#{klass_name}.get(#{params})"
-            when :sequel then "#{klass_name}.filter(#{params}).first"
+            when :sequel then "#{klass_name}[#{params}]"
             else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
@@ -83,7 +83,7 @@ module Padrino
           case orm
             when :activerecord, :mongomapper, :mongoid, :couchrest then "@#{name_singular}.update_attributes(#{params})"
             when :datamapper then "@#{name_singular}.update(#{params})"
-            when :sequel then "(@#{name_singular}.update(#{params}) rescue false)"
+            when :sequel then "@#{name_singular}.modified! && @#{name_singular}.update(#{params})"
             else raise OrmError, "Adapter #{orm} is not yet supported!"
           end
         end
@@ -94,4 +94,4 @@ module Padrino
       end # Orm
     end # Generators
   end # Admin
-end # Padrino
+end # Padrino

data/lib/padrino-admin/generators/templates/account/activerecord.rb.tt

@@ -1,3 +1,5 @@
+require 'digest/sha1'
+
 class Account < ActiveRecord::Base
   attr_accessor :password
 
@@ -24,7 +26,7 @@ class Account < ActiveRecord::Base
   end
 
   ##
-  # This method is used for retrive the original password.
+  # This method is used to retrieve the original password.
   #
   def password_clean
     crypted_password.decrypt(salt)

data/lib/padrino-admin/generators/templates/account/couchrest.rb.tt

@@ -1,3 +1,5 @@
+require 'digest/sha1'
+
 class Account < CouchRest::ExtendedDocument
   include CouchRest::Validation
   use_database COUCHDB
@@ -40,14 +42,14 @@ class Account < CouchRest::ExtendedDocument
   end
 
   ##
-  # This method is used for retrive the original password.
+  # This method is used to retrieve the original password.
   #
   def password_clean
     crypted_password.decrypt(salt)
   end
 
   ##
-  # This method is used for retrive the first record by id without raise errors if not found.
+  # This method is used to retrieve the first record by id without raise errors if not found.
   #
   def self.find_by_id(id)
     id_array = self.by_id :key => id
@@ -57,7 +59,7 @@ class Account < CouchRest::ExtendedDocument
   private
     def generate_password
       return if password.blank?
-      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new_record?
+      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if self.salt.blank?
       self.crypted_password = password.encrypt(self.salt)
     end
 
@@ -66,8 +68,13 @@ class Account < CouchRest::ExtendedDocument
     end
 
     def email_is_unique
-      Account.by_email(:key => self.email, :limit => 1).empty? ||
-        Account.by_email(:key => self.email, :limit => 1) == [self] ||
-        [false, "Email has already been taken"]
+      account = Account.by_email(:key => self.email, :limit => 1)
+      return true if account.empty? # didn't find email in the database
+      account = account[0]
+      if self.has_key?("_id")
+        # there is an id, make sure updates are being applied to same account
+        return true if self["_id"] == account["_id"]
+      end
+      [false, "Email has already been taken"] 
     end
 end

data/lib/padrino-admin/generators/templates/account/datamapper.rb.tt

@@ -1,3 +1,5 @@
+require 'digest/sha1'
+
 class Account
   include DataMapper::Resource
   include DataMapper::Validate
@@ -13,18 +15,15 @@ class Account
   property :role,             String
 
   # Validations
-  validates_present      :email, :role
-  validates_present      :password,                          :if => :password_required
-  validates_present      :password_confirmation,             :if => :password_required
-  validates_length       :password, :min => 4, :max => 40,   :if => :password_required
-  validates_is_confirmed :password,                          :if => :password_required
-  validates_length       :email,    :min => 3, :max => 100
-  validates_is_unique    :email,    :case_sensitive => false
-  validates_format       :email,    :with => :email_address
-  validates_format       :role,     :with => /[A-Za-z]/
-
-  # Callbacks
-  before :save, :generate_password
+  validates_presence_of      :email, :role
+  validates_presence_of      :password,                          :if => :password_required
+  validates_presence_of      :password_confirmation,             :if => :password_required
+  validates_length_of        :password, :min => 4, :max => 40,   :if => :password_required
+  validates_confirmation_of  :password,                          :if => :password_required
+  validates_length_of        :email,    :min => 3, :max => 100
+  validates_uniqueness_of    :email,    :case_sensitive => false
+  validates_format_of        :email,    :with => :email_address
+  validates_format_of        :role,     :with => /[A-Za-z]/
 
   ##
   # This method is for authentication purpose
@@ -35,25 +34,29 @@ class Account
   end
 
   ##
-  # This method is used from AuthenticationHelper
+  # This method is used by AuthenticationHelper
   #
   def self.find_by_id(id)
     get(id) rescue nil
   end
 
   ##
-  # This method is used for retrive the original password.
+  # This method is used to retrieve the original password.
   #
   def password_clean
     crypted_password.decrypt(salt)
   end
 
+  ###
+  # Password setter generates salt and crypted_password
+  #
+  def password=(val)
+    return if val.blank?
+    attribute_set(:salt, Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--")) if new?
+    attribute_set(:crypted_password, val.encrypt(self.salt))
+  end
+
   private
-    def generate_password
-      return if password.blank?
-      self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new?
-      self.crypted_password = password.encrypt(self.salt)
-    end
 
     def password_required
       crypted_password.blank? || !password.blank?

data/lib/padrino-admin/generators/templates/account/mongoid.rb.tt

@@ -1,3 +1,5 @@
+require 'digest/sha1'
+
 class Account
   include Mongoid::Document
   attr_accessor :password
@@ -33,14 +35,14 @@ class Account
   end
 
   ##
-  # This method is used from AuthenticationHelper
+  # This method is used by AuthenticationHelper
   #
   def self.find_by_id(id)
     find(id) rescue nil
   end
 
   ##
-  # This method is used for retrive the original password.
+  # This method is used to retrieve the original password.
   #
   def password_clean
     crypted_password.decrypt(salt)

data/lib/padrino-admin/generators/templates/account/mongomapper.rb.tt

@@ -1,3 +1,5 @@
+require 'digest/sha1'
+
 class Account
   include MongoMapper::Document
   attr_accessor :password
@@ -33,7 +35,7 @@ class Account
   end
 
   ##
-  # This method is used for retrive the original password.
+  # This method is used to retrieve the original password.
   #
   def password_clean
     crypted_password.decrypt(salt)

data/lib/padrino-admin/generators/templates/account/sequel.rb.tt

@@ -1,3 +1,5 @@
+require 'digest/sha1'
+
 class Account < ::Sequel::Model
 
   plugin :validation_helpers
@@ -31,20 +33,21 @@ class Account < ::Sequel::Model
   end
 
   ##
-  # This method is used for retrive the original password.
+  # Replace AR method
   #
-  def password_clean
-    crypted_password.decrypt(salt)
+  def self.find_by_id(id)
+    self[id] rescue nil
   end
 
   ##
-  # Replace AR method
+  # This method is used to retrieve the original password.
   #
-  def self.find_by_id(id)
-    filter(:id => id).first
+  def password_clean
+    crypted_password.decrypt(salt)
   end
 
   private
+
     def generate_password
       return if password.blank?
       self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{email}--") if new?

data/lib/padrino-admin/generators/templates/app/app.rb

@@ -1,31 +1,29 @@
 class Admin < Padrino::Application
-  configure do
-    ##
-    # Application-specific configuration options
-    #
-    # set :raise_errors, true     # Show exceptions (default for development)
-    # set :public, "foo/bar"      # Location for static assets (default root/public)
-    # set :reload, false          # Reload application files (default in development)
-    # set :default_builder, "foo" # Set a custom form builder (default 'StandardFormBuilder')
-    # set :locale_path, "bar"     # Set path for I18n translations (default your_app/locales)
-    # enable  :sessions           # Disabled by default
-    # disable :flash              # Disables rack-flash (enabled by default if sessions)
-    # disable :padrino_helpers    # Disables padrino markup helpers (enabled by default if present)
-    # disable :padrino_mailer     # Disables padrino mailer (enabled by default if present)
-    # enable  :authentication     # Enable padrino-admin authentication (disabled by default)
-    # layout  :my_layout          # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)
-    #
-    enable  :authentication
-    disable :store_location
-    set :login_page, "/admin/sessions/new"
+  register Padrino::Mailer
+  register Padrino::Helpers
+  register Padrino::Admin::AccessControl
 
-    access_control.roles_for :any do |role|
-      role.protect "/"
-      role.allow "/sessions"
-    end
+  ##
+  # Application configuration options
+  #
+  # set :raise_errors, true     # Show exceptions (default for development)
+  # set :public, "foo/bar"      # Location for static assets (default root/public)
+  # set :reload, false          # Reload application files (default in development)
+  # set :default_builder, "foo" # Set a custom form builder (default 'StandardFormBuilder')
+  # set :locale_path, "bar"     # Set path for I18n translations (default your_app/locales)
+  # enable  :sessions           # Disabled by default
+  # disable :flash              # Disables rack-flash (enabled by default if sessions)
+  # layout  :my_layout          # Layout can be in views/layouts/foo.ext or views/foo.ext (default :application)
+  #
 
-    access_control.roles_for :admin do |role|
-    end
+  set :login_page, "/admin/sessions/new"
+  disable :store_location
 
+  access_control.roles_for :any do |role|
+    role.protect "/"
+    role.allow "/sessions"
+  end
+
+  access_control.roles_for :admin do |role|
   end
 end

data/lib/padrino-admin/generators/templates/app/controllers/base.rb

@@ -1,6 +1,6 @@
 Admin.controllers  :base do
 
-  get :index, :map => "(/)" do
+  get :index, :map => "/" do
     render "base/index"
   end
 end

data/lib/padrino-admin/helpers/authentication_helpers.rb

@@ -94,9 +94,9 @@ module Padrino
           end
 
           def login_from_session
-            Account.find_by_id(session[options.session_id]) if defined?(Account)
+            Account.find_by_id(session[settings.session_id]) if defined?(Account)
           end
       end # AuthenticationHelpers
     end # Helpers
   end # Admin
-end # Padrino
+end # Padrino

data/lib/padrino-admin/locale/admin/cz.yml

@@ -0,0 +1,16 @@
+en:
+  padrino:
+    admin:
+      save: Uložit
+      cancel: Storno
+      list: Výpis
+      edit: Editovat
+      new: Nový
+      show: Ukázat
+      delete: Smazat
+      confirm: Jste si jist/-a?
+      created_at: Vytvořen
+      all: Všichni
+      profile: Profil
+      settings: Nastavení
+      logout: Odhlásit

data/lib/padrino-admin/locale/admin/es.yml

@@ -0,0 +1,16 @@
+es:
+  padrino:
+    admin:
+      save: Guardar
+      cancel: Cancelar
+      list: Listar
+      edit: Editar
+      new: Nuevo
+      show: Mostrar
+      delete: Eliminar
+      confirm: ¿Estás seguro?
+      created_at: Creado el
+      all: Todos
+      profile: Perfil
+      settings: Configuración
+      logout: Cerrar sesión

data/lib/padrino-admin/locale/admin/tr.yml

@@ -0,0 +1,16 @@
+tr:
+  padrino:
+    admin:
+      save: Kaydet
+      cancel: Vazgeç
+      list: Liste
+      edit: Değiştir
+      new: Yeni
+      show: Göster
+      delete: Sil
+      confirm: emin misiniz?
+      created_at: Oluşturuldu
+      all: Hepsi
+      profile: Profil
+      settings: Ayarlar
+      logout: Çıkış

data/lib/padrino-admin/locale/admin/uk.yml

@@ -0,0 +1,16 @@
+uk:
+  padrino:
+    admin:
+      save: Зберегти
+      cancel: Скасувати
+      list: Список
+      edit: Змінити
+      new: Додати
+      show: Показати
+      delete: Видалити
+      confirm: Ви впевнені?
+      created_at: Додано
+      all: Всі
+      profile: Профіль
+      settings: Налаштування
+      logout: Вихід

data/lib/padrino-admin/locale/orm/cz.yml

@@ -0,0 +1,26 @@
+en:
+  activemodel: &activemodel
+    errors:
+      messages:
+        inclusion: "není v seznamu povolených hodnot"
+        exclusion: "je vyhrazeno pro jiný účel"
+        invalid: "není platná hodnota"
+        confirmation: "nebylo potvrzeno"
+        accepted: "musí být potvrzeno"
+        empty: "nesmí být prázdný/é"
+        blank: "je povinná položka"
+        too_long: "je příliš dlouhá/ý (max. {{count}} znaků)"
+        too_short: "je příliš krátký/á (min. {{count}} znaků)"
+        wrong_length: "nemá správnou délku (očekáváno {{count}} znaků)"
+        taken: "již databáze obsahuje"
+        not_a_number: "není číslo"
+        greater_than: "musí být větší než {{count}}"
+        greater_than_or_equal_to: "musí být větší nebo rovno {{count}}"
+        equal_to: "musí být rovno {{count}}"
+        less_than: "musí být méně než {{count}}"
+        less_than_or_equal_to: "musí být méně nebo rovno {{count}}"
+        odd: "musí být liché číslo"
+        even: "musí být sudé číslo"
+        record_invalid: "Následující pole obsahují chybně vyplněné údaje: {{errors}}"
+        content_type: "nepodporovaný formát souboru"
+  activerecord: *activemodel

data/lib/padrino-admin/locale/orm/da.yml

@@ -9,18 +9,18 @@ da:
         accepted: "skal accepteres"
         empty: "må ikke være tom"
         blank: "må ikke være blank"
-        too_long: "er for lang (maksimum er {{count}} tegn)"
-        too_short: "er for kort (minimum er {{count}} tegn)"
-        wrong_length: "har ikke den rigtige længde (skal være på {{count}} tegn)"
+        too_long: "er for lang (maksimum er %{count} tegn)"
+        too_short: "er for kort (minimum er %{count} tegn)"
+        wrong_length: "har ikke den rigtige længde (skal være på %{count} tegn)"
         taken: "er allerede i brug"
         not_a_number: "er ikke et tal"
-        greater_than: "skal være større end {{count}}"
-        greater_than_or_equal_to: "skal være større end eller lig {{count}}"
-        equal_to: "skal være lig {{count}}"
-        less_than: "skal være mindre end {{count}}"
-        less_than_or_equal_to: "skal være mindre end eller lig {{count}}"
+        greater_than: "skal være større end %{count}"
+        greater_than_or_equal_to: "skal være større end eller lig %{count}"
+        equal_to: "skal være lig %{count}"
+        less_than: "skal være mindre end %{count}"
+        less_than_or_equal_to: "skal være mindre end eller lig %{count}"
         odd: "skal være ulige"
         even: "skal være lige"
-        record_invalid: "Valideringsfejl: {{errors}}"
+        record_invalid: "Valideringsfejl: %{errors}"
         content_type: "fileformatet er ikke understøttet"
   activerecord: *activemodel

data/lib/padrino-admin/locale/orm/de.yml

@@ -4,23 +4,23 @@ de:
       messages:
         inclusion: "ist nicht in der Liste enthalten"
         exclusion: "ist reserviert"
-        invalid: "ist ung¸ltig"
-        confirmation: "entspricht nicht der Best‰tigung"
+        invalid: "ist ungültig"
+        confirmation: "entspricht nicht der Bestätigung"
         accepted: "muss akzeptiert werden"
         empty: "Darf nicht leer sein"
-        blank: "Darf nicht nur Leerzeichen sein"
-        too_long: "ist zu lang (Maximum ist {{count}} Zeichen)"
-        too_short: "ist zu kurz (Minimum ist {{count}} Zeichen)"
-        wrong_length: "ist ung¸ltiger L‰nge (soll {{count}} Zeichen sein)"
-        taken: "has already been taken"
-        not_a_number: "ist nicht eine Nummer"
-        greater_than: "muss grˆfler sein als {{count}}"
-        greater_than_or_equal_to: "muss grˆfler gleich sein als {{count}}"
-        equal_to: "muss gleich sein als {{count}}"
-        less_than: "muss weniger sein als {{count}}"
-        less_than_or_equal_to: "muss weniger oder gleich sein als {{count}}"
+        blank: "Darf nicht nur Leerzeichen enthalten"
+        too_long: "ist zu lang (Maximum ist %{count} Zeichen)"
+        too_short: "ist zu kurz (Minimum ist %{count} Zeichen)"
+        wrong_length: "hat eine ungültige Länge (soll %{count} Zeichen sein)"
+        taken: "ist schon vergeben"
+        not_a_number: "ist keine Nummer"
+        greater_than: "muss größer als %{count} sein"
+        greater_than_or_equal_to: "muss größer oder gleich %{count} sein"
+        equal_to: "muss gleich %{count} sein"
+        less_than: "muss weniger als %{count} sein"
+        less_than_or_equal_to: "muss weniger oder gleich %{count} sein"
         odd: "muss ungerade sein"
         even: "muss gerade sein"
-        record_invalid: "Validierung schlug fehl: {{errors}}"
-        content_type: "Datei-Format wird nicht unterst¸tzt"
+        record_invalid: "Validierung schlug fehl: %{errors}"
+        content_type: "Datei-Format wird nicht unterstützt"
   activerecord: *activemodel

data/lib/padrino-admin/locale/orm/en.yml

@@ -9,18 +9,18 @@ en:
         accepted: "must be accepted"
         empty: "can't be empty"
         blank: "can't be blank"
-        too_long: "is too long (maximum is {{count}} characters)"
-        too_short: "is too short (minimum is {{count}} characters)"
-        wrong_length: "is the wrong length (should be {{count}} characters)"
+        too_long: "is too long (maximum is %{count} characters)"
+        too_short: "is too short (minimum is %{count} characters)"
+        wrong_length: "is the wrong length (should be %{count} characters)"
         taken: "has already been taken"
         not_a_number: "is not a number"
-        greater_than: "must be greater than {{count}}"
-        greater_than_or_equal_to: "must be greater than or equal to {{count}}"
-        equal_to: "must be equal to {{count}}"
-        less_than: "must be less than {{count}}"
-        less_than_or_equal_to: "must be less than or equal to {{count}}"
+        greater_than: "must be greater than %{count}"
+        greater_than_or_equal_to: "must be greater than or equal to %{count}"
+        equal_to: "must be equal to %{count}"
+        less_than: "must be less than %{count}"
+        less_than_or_equal_to: "must be less than or equal to %{count}"
         odd: "must be odd"
         even: "must be even"
-        record_invalid: "Validation failed: {{errors}}"
+        record_invalid: "Validation failed: %{errors}"
         content_type: "file format not supported"
   activerecord: *activemodel