From: Shaun McDonald Date: Fri, 29 May 2009 15:10:36 +0000 (+0000) Subject: Half the user view translated. X-Git-Tag: live~7335^2~59 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f2f9d797d5925524f5d04cf5f1f4e90b181f0440 Half the user view translated. --- diff --git a/app/views/user/login.rhtml b/app/views/user/login.rhtml index 0422d2132..dc1001117 100644 --- a/app/views/user/login.rhtml +++ b/app/views/user/login.rhtml @@ -1,13 +1,13 @@ -

Login

+

<%= t 'user.login.heading' %>

-

Please login or <%= link_to 'create an account', :controller => 'user', :action => 'new' %>.

+

<%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new') %>

<% form_tag :action => 'login' do %> <%= hidden_field_tag('referer', h(params[:referer])) %> - - + + - +
Email Address or Username:<%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %>
Password:<%= password_field('user', 'password',{:size => 28, :maxlength => 255, :tabindex => 2}) %> (<%= link_to 'Lost your password?', :controller => 'user', :action => 'lost_password' %>)
<%= t 'user.login.email or username' %><%= text_field('user', 'email',{:size => 50, :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' %>)
 
<%= submit_tag 'Login', :tabindex => 3 %>
<%= submit_tag t('user.login.login_button'), :tabindex => 3 %>
<% end %> diff --git a/app/views/user/lost_password.rhtml b/app/views/user/lost_password.rhtml index fa1bc57e2..cb844c67c 100644 --- a/app/views/user/lost_password.rhtml +++ b/app/views/user/lost_password.rhtml @@ -1,9 +1,9 @@ -

Forgotten Password?


+

<%= t 'user.lost_password.heading' %>


<% form_tag :action => 'lost_password' do %> - +
Email Address:<%= text_field('user', 'email', {:size => 50, :maxlength => 255} ) %>
<%= t 'user.lost_password.email address' %><%= text_field('user', 'email', {:size => 50, :maxlength => 255} ) %>

- + <% end %> diff --git a/app/views/user/new.rhtml b/app/views/user/new.rhtml index 8b40a2920..6ac85560d 100644 --- a/app/views/user/new.rhtml +++ b/app/views/user/new.rhtml @@ -1,44 +1,36 @@ -

Create a User Account

+

<%= t 'user.new.heading' %>

<% if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) %> -

Unfortunately we are not currently able to create an account for - you automatically. +

<%= t 'user.new.no_auto_account_create' %>

-

Please contact the webmaster - to arrange for an account to be created - we will try and deal with - the request as quickly as possible. +

<%= t 'user.new.contact_webmaster' %>

<% else %> -

Fill in the form and we'll send you a quick email to activate your - account. +

<%= t 'user.new.fill_form' %>

-

By creating an account, you agree that all work uploaded to - openstreetmap.org and all data created by use of any tools which - connect to openstreetmap.org is to be (non-exclusively) licensed under - this Creative - Commons license (by-sa). +

<%= t 'user.new.license_agreement' %>

<%= error_messages_for 'user' %> <% form_tag :action => 'save' do %> - - - + + + - + - - + + - +
Email Address : <%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %>
Confirm Email Address : <%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255, :tabindex => 2}) %>
Not displayed publicly (see privacy policy)
<%= t 'user.new.email address' %><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %>
<%= t 'user.new.confirm email address' %><%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255, :tabindex => 2}) %>
<%= t 'user.new.not displayed publicly' %>
 
Display Name : <%= text_field('user', 'display_name',{:size => 30, :maxlength => 255, :tabindex => 3}) %>
<%= t 'user.new.display name' %><%= text_field('user', 'display_name',{:size => 30, :maxlength => 255, :tabindex => 3}) %>
 
Password : <%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255, :tabindex => 4}) %>
Confirm Password : <%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255, :tabindex => 5}) %>
<%= t 'user.new.password' %><%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255, :tabindex => 4}) %>
<%= t 'user.new.confirm password' %><%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255, :tabindex => 5}) %>
 
<% end %> diff --git a/app/views/user/no_such_user.rhtml b/app/views/user/no_such_user.rhtml index 7820b4847..f510daffa 100644 --- a/app/views/user/no_such_user.rhtml +++ b/app/views/user/no_such_user.rhtml @@ -1,2 +1,2 @@

<%= h(@not_found_user) %>

-

Sorry, there is no user with the name <%= @not_found_user -%>. Please check your spelling, or maybe the link you clicked is wrong.

+

<%= t 'user.no_such_user.body', :user => @not_found_user %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 360b62c12..b9e0cd7ef 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -86,3 +86,31 @@ en: search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..." key: map_key: "Map key" + user: + login: + heading: Login + please login: "Please login or {{create_user_link}}." + create_account: create an account + email or username: "Email Address or Username: " + password: "Password: " + lost password link: "Lost your password?" + login_button: Login + lost_password: + heading: "Forgotten Password?" + email address: "Email Address:" + new password button: "Send me a new password" + new: + heading: Create a User Account + no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." + contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible. ' + fill_form: "Fill in the form and we'll send you a quick email to activate your account." + license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under this Creative Commons license (by-sa).' + email address: "Email Address: " + confirm email address: "Confirm Email Address: " + not displayed publicly: 'Not displayed publicly (see privacy policy)' + display name: "Display Name: " + password: "Password: " + confirm password: "Confirm Password: " + signup: Signup + no_such_user: + body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."