From: Ævar Arnfjörð Bjarmason Date: Sun, 28 Feb 2010 05:13:00 +0000 (+0000) Subject: use i18n kthx X-Git-Tag: live~5104^2~239 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/92339552d19d5d291f5401c28c9d4dd1f1a5533e use i18n kthx --- diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 9ff100079..72b7e3026 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -7,7 +7,7 @@ - +
<%= t 'user.login.email or username' %><%= text_field('user', 'email',{:size => 28, :maxlength => 255, :tabindex => 1}) %>
<%= t 'user.login.password' %><%= password_field('user', 'password',{:size => 28, :maxlength => 255, :tabindex => 2}) %> (<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)
<%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
<%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
 
<%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 1e6e49dba..af506627c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1351,6 +1351,7 @@ en: create_account: "create an account" email or username: "Email Address or Username:" password: "Password:" + remember: "Remember me:" lost password link: "Lost your password?" login_button: "Login" account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account."