Show More
Commit Description:
Merge branch 'master' into codejom (updated rails version, removed judge)
Commit Description:
Merge branch 'master' into codejom (updated rails version, removed judge)
References:
File last commit:
Show/Diff file:
Action:
app/views/users/confirm.html.haml | 17 lines | 524 B | text/x-haml | HamlLexer |
jittat
Merged online-registration branch changes r297:303 into the trunk...
r158 - if @result == :successful
jittat
MERGED 308:HEAD from http://theory.cpe.ku.ac.th/grader/web/branches/ytopc08-2/, removed some registration info...
r162 %h1
=t 'registration.activation_sucessful_title'
=t 'registration.account_activated'
jittat
Merged online-registration branch changes r297:303 into the trunk...
r158 %br/
jittat
MERGED 308:HEAD from http://theory.cpe.ku.ac.th/grader/web/branches/ytopc08-2/, removed some registration info...
r162 =t 'go_ahead_to'
= link_to((t 'login_page'), {:controller => 'main', :action => 'login'})
jittat
Merged online-registration branch changes r297:303 into the trunk...
r158 - else
jittat
MERGED 308:HEAD from http://theory.cpe.ku.ac.th/grader/web/branches/ytopc08-2/, removed some registration info...
r162 %h1
=t 'registration.activation_failed_title'
jittat
Merged online-registration branch changes r297:303 into the trunk...
r158 - if @result == :email_used
jittat
MERGED 308:HEAD from http://theory.cpe.ku.ac.th/grader/web/branches/ytopc08-2/, removed some registration info...
r162 =t 'registration.errors.activation.email_exists'
jittat
Merged online-registration branch changes r297:303 into the trunk...
r158 - else
jittat
MERGED 308:HEAD from http://theory.cpe.ku.ac.th/grader/web/branches/ytopc08-2/, removed some registration info...
r162 =t 'registration.errors.activation.invalid'
jittat
Merged online-registration branch changes r297:303 into the trunk...
r158 %br/
jittat
MERGED 308:HEAD from http://theory.cpe.ku.ac.th/grader/web/branches/ytopc08-2/, removed some registration info...
r162 =t 'go_back_to'
= link_to((t 'home_page'), {:controller => 'main', :action => 'login'})