Permalink
Browse files

Before rebasing

  • Loading branch information...
1 parent 71419bb commit f99999a14e5ab515b5da5388b3c059e17528df7c @kyungbae kyungbae committed Aug 6, 2013
@@ -1,6 +1,8 @@
class ApplicationController < ActionController::Base
protect_from_forgery
+ before_filter :set_locale
+
def after_sign_in_path_for(resource)
session["user_return_to"] || my_profile_path
end
@@ -16,4 +18,8 @@ def authenticate_admin
def current_admin_user
current_user && current_user.is_admin ? current_user : nil
end
+
+ def set_locale
+ I18n.locale = params[:locale] || I18n.default_locale
+ end
end
@@ -24,6 +24,7 @@
= f.check_box :terms
= f.label :terms do
I accept
+ =t 'terms'
%span
- if resource.errors[:terms].any?
%span.error= resource.errors[:terms].to_sentence
@@ -39,6 +39,13 @@ en:
private: 'Who do you want to ask?'
item:
search: 'Enter the item name or id'
+ user:
+ first_name: 'First name'
+ last_name: 'Last name'
+ email: 'E-mail'
+ password: 'Password'
+ password_confirmation: 'Confirm password again'
+ terms: 'I accept'
hints:
post:
tag_list: 'Use tags to describe the people, places, or subjects related to this thread.'

0 comments on commit f99999a

Please sign in to comment.