[refs #105] Add internationalization support to project
This commit is contained in:
parent
ee58a8e789
commit
726eddc40e
|
@ -1,8 +1,10 @@
|
||||||
# coding: UTF-8
|
# coding: UTF-8
|
||||||
class ApplicationController < ActionController::Base
|
class ApplicationController < ActionController::Base
|
||||||
protect_from_forgery
|
protect_from_forgery
|
||||||
|
|
||||||
layout :layout_by_resource
|
layout :layout_by_resource
|
||||||
|
|
||||||
|
before_filter :set_locale
|
||||||
before_filter lambda { EventLog.current_controller = self },
|
before_filter lambda { EventLog.current_controller = self },
|
||||||
:only => [:create, :destroy, :open_id, :auto_build, :cancel, :publish, :change_visibility] # :update
|
:only => [:create, :destroy, :open_id, :auto_build, :cancel, :publish, :change_visibility] # :update
|
||||||
after_filter lambda { EventLog.current_controller = nil }
|
after_filter lambda { EventLog.current_controller = nil }
|
||||||
|
@ -14,6 +16,19 @@ class ApplicationController < ActionController::Base
|
||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
|
def set_locale
|
||||||
|
I18n.locale = extract_locale_from_request
|
||||||
|
end
|
||||||
|
|
||||||
|
def extract_locale_from_request
|
||||||
|
get_user_locale || request.env['HTTP_ACCEPT_LANGUAGE'].to_sym || :en
|
||||||
|
end
|
||||||
|
|
||||||
|
def get_user_locale
|
||||||
|
user_signed_in? ? current_user.language : nil
|
||||||
|
end
|
||||||
|
|
||||||
def get_owner
|
def get_owner
|
||||||
# params['user_id'] && User.find_by_id(params['user_id']) ||
|
# params['user_id'] && User.find_by_id(params['user_id']) ||
|
||||||
# params['group_id'] && Group.find_by_id(params['group_id']) || current_user
|
# params['group_id'] && Group.find_by_id(params['group_id']) || current_user
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
class User < ActiveRecord::Base
|
class User < ActiveRecord::Base
|
||||||
ROLES = ['admin']
|
ROLES = ['admin']
|
||||||
|
LANGUAGES = [['Russian', 'ru'], ['English', 'en']]
|
||||||
|
|
||||||
devise :database_authenticatable, :registerable, :omniauthable, # :token_authenticatable, :encryptable, :timeoutable
|
devise :database_authenticatable, :registerable, :omniauthable, # :token_authenticatable, :encryptable, :timeoutable
|
||||||
:recoverable, :rememberable, :validatable #, :trackable, :confirmable, :lockable
|
:recoverable, :rememberable, :validatable #, :trackable, :confirmable, :lockable
|
||||||
|
@ -29,7 +30,7 @@ class User < ActiveRecord::Base
|
||||||
validates :ssh_key, :uniqueness => true, :allow_blank => true
|
validates :ssh_key, :uniqueness => true, :allow_blank => true
|
||||||
validates :role, :inclusion => {:in => ROLES}, :allow_blank => true
|
validates :role, :inclusion => {:in => ROLES}, :allow_blank => true
|
||||||
|
|
||||||
attr_accessible :email, :password, :password_confirmation, :remember_me, :login, :name, :ssh_key, :uname
|
attr_accessible :email, :password, :password_confirmation, :remember_me, :login, :name, :ssh_key, :uname, :language
|
||||||
attr_readonly :uname
|
attr_readonly :uname
|
||||||
attr_accessor :login
|
attr_accessor :login
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,12 @@
|
||||||
- else
|
- else
|
||||||
= resource.role
|
= resource.role
|
||||||
|
|
||||||
|
.group.wat-cf
|
||||||
|
.left
|
||||||
|
= f.label :language, :class => "label"
|
||||||
|
.right
|
||||||
|
= f.select :language, User::LANGUAGES
|
||||||
|
|
||||||
/ .group.wat-cf
|
/ .group.wat-cf
|
||||||
/ .left
|
/ .left
|
||||||
/ = f.label :current_password, :class => "label"
|
/ = f.label :current_password, :class => "label"
|
||||||
|
|
|
@ -37,6 +37,12 @@
|
||||||
.right
|
.right
|
||||||
= f.password_field :password_confirmation, :class => "text_field"
|
= f.password_field :password_confirmation, :class => "text_field"
|
||||||
|
|
||||||
|
.group.wat-cf
|
||||||
|
.left
|
||||||
|
= f.label :language, :class => "label"
|
||||||
|
.right
|
||||||
|
= f.select :language, User::LANGUAGES
|
||||||
|
|
||||||
.group.navform.wat-cf
|
.group.navform.wat-cf
|
||||||
%button.button{ :type => "submit" }
|
%button.button{ :type => "submit" }
|
||||||
#{image_tag("web-app-theme/icons/tick.png", :alt => t("devise.registrations.sign_up_header"))} #{t("devise.registrations.sign_up_header")}
|
#{image_tag("web-app-theme/icons/tick.png", :alt => t("devise.registrations.sign_up_header"))} #{t("devise.registrations.sign_up_header")}
|
||||||
|
|
|
@ -648,6 +648,7 @@ ru:
|
||||||
created_at: Создан
|
created_at: Создан
|
||||||
updated_at: Обновлен
|
updated_at: Обновлен
|
||||||
role: Роль в системе
|
role: Роль в системе
|
||||||
|
language: Язык
|
||||||
|
|
||||||
product_build_list:
|
product_build_list:
|
||||||
id: Id
|
id: Id
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
class AddLanguageToUsers < ActiveRecord::Migration
|
||||||
|
def self.up
|
||||||
|
add_column :users, :language, :string, :default => 'en'
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.down
|
||||||
|
remove_column :users, :language
|
||||||
|
end
|
||||||
|
end
|
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended to check this file into your version control system.
|
# It's strongly recommended to check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(:version => 20120113151305) do
|
ActiveRecord::Schema.define(:version => 20120117110723) do
|
||||||
|
|
||||||
create_table "arches", :force => true do |t|
|
create_table "arches", :force => true do |t|
|
||||||
t.string "name", :null => false
|
t.string "name", :null => false
|
||||||
|
@ -305,6 +305,7 @@ ActiveRecord::Schema.define(:version => 20120113151305) do
|
||||||
t.text "ssh_key"
|
t.text "ssh_key"
|
||||||
t.string "uname"
|
t.string "uname"
|
||||||
t.string "role"
|
t.string "role"
|
||||||
|
t.string "language", :default => "en"
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index "users", ["email"], :name => "index_users_on_email", :unique => true
|
add_index "users", ["email"], :name => "index_users_on_email", :unique => true
|
||||||
|
|
Loading…
Reference in New Issue