From edb1ea204f16e7af0f80ae4775a5b388dc3720d2 Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Sun, 20 Jan 2013 10:16:50 -0500 Subject: [PATCH] Added some localization --- app/models/ability.rb | 2 +- app/models/user.rb | 2 +- app/views/devise/registrations/new.html.erb | 3 +- app/views/devise/sessions/new.html.erb | 3 +- app/views/layouts/application.html.erb | 8 +- config/application.rb | 2 - config/initializers/devise.rb | 2 +- config/locales/en.yml | 213 +++++++++++++++++++- 8 files changed, 220 insertions(+), 15 deletions(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index f46c382..018c5b4 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -10,7 +10,7 @@ class Ability can :read, Forum, :state => true, :category => { :state => true } can :read, Topic, :forum => { :state => true, :category => { :state => true } } can :read, Post, :topic => { :forum => { :state => true, :category => { :state => true } } } - + can :update, Post, :user_id => user.id, :topic => { :locked => false } can :destroy, [Topic,Post], :user_id => user.id, :topic => { :locked => false } diff --git a/app/models/user.rb b/app/models/user.rb index aa2be83..c0c59b4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -16,6 +16,6 @@ class User < ActiveRecord::Base has_many :posts, :dependent => :destroy def admin? - true if self.username == 'admin' + self.is_admin end end diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index c241b63..387fdb4 100755 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,6 +1,7 @@
-

Welcome to Horses

+

<%= t :welcome_header%>

+

<%= t :welcome_msg %>

<%= devise_error_messages! %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index a9e81c7..f3bd48b 100755 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -19,7 +19,8 @@
-

Welcome to Horses

+

<%= t :welcome_header %>

+

<%= t :welcome_msg %>

<%= form_for("user", :url => user_session_path) do |f| %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3f03776..fb7d9b8 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - <%= content_for?(:title) ? yield(:title) : "Horses" %> + <%= content_for?(:title) ? yield(:title) : (t :name) %> <%= stylesheet_link_tag "application", "forum-monster" %> <%= csrf_meta_tag %> <%= yield(:head) %> @@ -9,9 +9,9 @@