Half the user view translated.

diff --git a/app/views/user/login.rhtml b/app/views/user/login.rhtml
index 0422d213258f76539b5a15c24228b3e50a576a58..dc10011172a41a32598bff8a36852667ed3d3065 100644 (file)
--- a/app/views/user/login.rhtml
+++ b/app/views/user/login.rhtml
@@ -1,13 +1,13 @@
-<h1>Login</h1>
+<h1><%= t 'user.login.heading' %></h1>

 
 

-<p>Please login or <%= link_to 'create an account', :controller => 'user', :action => 'new' %>.</p>
+<p><%= t 'user.login.please login', :create_user_link => link_to(t('user.login.create_account'), :controller => 'user', :action => 'new') %></p>

 
 <% form_tag :action => 'login' do %>
 <%= hidden_field_tag('referer', h(params[:referer])) %>
 <table>
 
 <% form_tag :action => 'login' do %>
 <%= hidden_field_tag('referer', h(params[:referer])) %>
 <table>

-  <tr><td class="fieldName">Email Address or Username:</td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>
-  <tr><td class="fieldName">Password:</td><td><%= password_field('user', 'password',{:size => 28, :maxlength => 255, :tabindex => 2}) %> <span class="minorNote">(<%= link_to 'Lost your password?', :controller => 'user', :action => 'lost_password' %>)</span></td></tr>
+  <tr><td class="fieldName"><%= t 'user.login.email or username' %></td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>
+  <tr><td class="fieldName"><%= t 'user.login.password' %></td><td><%= password_field('user', 'password',{:size => 28, :maxlength => 255, :tabindex => 2}) %> <span class="minorNote">(<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)</span></td></tr>

   <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
   <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>

-  <tr><td></td><td align="right"><%= submit_tag 'Login', :tabindex => 3 %></td></tr>
+  <tr><td></td><td align="right"><%= submit_tag t('user.login.login_button'), :tabindex => 3 %></td></tr>

 </table>
 <% end %>
 </table>
 <% end %>

diff --git a/app/views/user/lost_password.rhtml b/app/views/user/lost_password.rhtml
index fa1bc57e2a79fa1ba972cd6ec210aed8e1580c90..cb844c67c23eed85da8092a647b8a02d506ef634 100644 (file)
--- a/app/views/user/lost_password.rhtml
+++ b/app/views/user/lost_password.rhtml
@@ -1,9 +1,9 @@
-<h1>Forgotten Password?</h1><br>
+<h1><%= t 'user.lost_password.heading' %></h1><br>

 
 <% form_tag :action => 'lost_password' do %>
 <table>
 
 <% form_tag :action => 'lost_password' do %>
 <table>

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

 </table>
 <br>
 </table>
 <br>

-<input type="submit" value="Send me a new password">
+<input type="submit" value="<%= t 'user.lost_password.new password button' %>">

 <% end %>
 <% end %>

diff --git a/app/views/user/new.rhtml b/app/views/user/new.rhtml
index 8b40a2920b7a9c098713588ef2de8046cf9505ea..6ac85560d3720b78fef0829d49c1574502b4c6fd 100644 (file)
--- a/app/views/user/new.rhtml
+++ b/app/views/user/new.rhtml
@@ -1,44 +1,36 @@
-<h1>Create a User Account</h1>
+<h1><%= t 'user.new.heading' %></h1>

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

-<p>Unfortunately we are not currently able to create an account for
-   you automatically.
+<p><%= t 'user.new.no_auto_account_create' %>

 </p>
 
 </p>
 

-<p>Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a>
-   to arrange for an account to be created - we will try and deal with
-   the request as quickly as possible. 
+<p><%= t 'user.new.contact_webmaster' %>

 </p>
 
 <% else %>
 
 </p>
 
 <% else %>
 

-<p>Fill in the form and we'll send you a quick email to activate your
-   account.
+<p><%= t 'user.new.fill_form' %>

 </p>
 
 </p>
 

-<p>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
-   <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative
-   Commons license (by-sa)</a>.
+<p><%= t 'user.new.license_agreement' %>

 </p>
 
 <%= error_messages_for 'user' %>
 
 <% form_tag :action => 'save' do %>
 <table id="loginForm">
 </p>
 
 <%= error_messages_for 'user' %>
 
 <% form_tag :action => 'save' do %>
 <table id="loginForm">

-  <tr><td class="fieldName">Email Address : </td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>
-  <tr><td class="fieldName">Confirm Email Address : </td><td><%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255, :tabindex => 2}) %></td></tr>
-  <tr><td></td><td><span class="minorNote">Not displayed publicly (see <a href="http://wiki.openstreetmap.org/index.php/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)</span></td></tr>
+  <tr><td class="fieldName"><%= t 'user.new.email address' %></td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>
+  <tr><td class="fieldName"><%= t 'user.new.confirm email address' %></td><td><%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255, :tabindex => 2}) %></td></tr>
+  <tr><td></td><td><span class="minorNote"><%= t 'user.new.not displayed publicly' %></span></td></tr>

   <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
   <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>

-  <tr><td class="fieldName">Display Name : </td><td><%= text_field('user', 'display_name',{:size => 30, :maxlength => 255, :tabindex => 3}) %></td></tr>
+  <tr><td class="fieldName"><%= t 'user.new.display name' %></td><td><%= text_field('user', 'display_name',{:size => 30, :maxlength => 255, :tabindex => 3}) %></td></tr>

   <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
   <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>

-  <tr><td class="fieldName">Password : </td><td><%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
-  <tr><td class="fieldName">Confirm Password : </td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>
+  <tr><td class="fieldName"><%= t 'user.new.password' %></td><td><%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
+  <tr><td class="fieldName"><%= t 'user.new.confirm password' %></td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>

   
   <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
   
   <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>

-  <tr><td></td><td align=right><input type="submit" value="Signup" tabindex="6"></td></tr>
+  <tr><td></td><td align=right><input type="submit" value="<%= t'user.new.signup' %>" tabindex="6"></td></tr>

 </table>
 <% end %>
 
 </table>
 <% end %>
 

diff --git a/app/views/user/no_such_user.rhtml b/app/views/user/no_such_user.rhtml
index 7820b4847c6d260a232005a0eda5bcda52a2a930..f510daffaada97e64a309074a43421db45b049e3 100644 (file)
--- a/app/views/user/no_such_user.rhtml
+++ b/app/views/user/no_such_user.rhtml
@@ -1,2 +1,2 @@
 <h2><%= h(@not_found_user) %></h2>
 <h2><%= h(@not_found_user) %></h2>

-<p>Sorry, there is no user with the name <%= @not_found_user -%>. Please check your spelling, or maybe the link you clicked is wrong.</p>
+<p><%= t 'user.no_such_user.body', :user => @not_found_user %></p>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 360b62c12666a8d66c2d8076d5db911beecc183e..b9e0cd7ef8e1f0ca7562ba1973a7fab1b7ef36bf 100644 (file)
--- 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' <a href='http://wiki.openstreetmap.org/index.php/Search'>more examples...</a>"
     key:
       map_key: "Map key"
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/index.php/Search'>more examples...</a>"
     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 <a href="mailto:webmaster@openstreetmap.org">webmaster</a> 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 <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      email address: "Email Address: "
+      confirm email address: "Confirm Email Address: "
+      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/index.php/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
+      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."