SONAR-2994 Add missing localization for 'Sign Up' and 'Log In' pages

4 files changed, 15 insertions, 11 deletions

diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
index 0952e5a769b..a31c90ac4f3 100644
--- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -338,6 +338,10 @@ org.sonar.plugins.design.ui.dependencies.DependenciesTab.page=Dependencies
 
 sessions.remember_me=Remember me on this computer
 sessions.log_in=Log in
+sessions.new_account=Not a member? <a href="{0}" tabindex="-1">Sign up</a> for an account.
+sessions.confirm_password=Confirm password
+sessions.sign_up=Sign up
+sessions.old_account=<a href="{0}" tabindex="-1">Log in</a> if you already have an account.
 session.flash_notice.logged_in=Logged in.
 session.flash_notice.authentication_failed=Authentication failed.
 session.flash_notice.logged_out=You have been logged out.
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb
index 61db4ea22a6..86add65fe92 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/login.html.erb
@@ -8,7 +8,7 @@
 							<%= text_field_tag 'login', '', {:maxlength => 40, :size => 30, :disabled => false} %>
 
 							<% if Property.value('sonar.allowUsersToSignUp')=='true' %>
-							  <br/><span class="desc">Not a member? <%= link_to 'Sign up', {:controller => 'users', :action => 'new'}, :tabindex => '-1' -%> for an account.</span>
+							  <br/><span class="desc"><%= message('sessions.new_account', :params => [url_for(:controller => 'users', :action => 'new')]) -%></span>
 							<% end %>
 						</p>
 						<h3><%= label_tag message('password') %></h3>
@@ -33,4 +33,4 @@
 //<![CDATA[
     $('login').activate();
 //]]>
-</script>
\ No newline at end of file
+</script>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/new.html.erb
index 211f64a660f..f5082f89894 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/new.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/sessions/new.html.erb
@@ -11,7 +11,7 @@
           <p>
             <%= text_field_tag 'login', '', {:maxlength => 40, :size => 30, :disabled => false} %>
             <% if Property.value('sonar.allowUsersToSignUp')=='true' %>
-              <br/><span class="desc">Not a member? <%= link_to 'Sign up', {:controller => 'users', :action => 'new'}, :tabindex => '-1' -%> for an account.</span>
+              <br/><span class="desc"><%= message('sessions.new_account', :params => [url_for(:controller => 'users', :action => 'new')]) -%></span>
             <% end %>
           </p>
           <h3><%= label_tag message('password') %></h3>
@@ -36,4 +36,4 @@
 //<![CDATA[
     $('login').activate();
 //]]>
-</script>
\ No newline at end of file
+</script>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/users/new.html.erb
index 30ae315832e..8c775b96406 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/users/new.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/users/new.html.erb
@@ -3,25 +3,25 @@
     <td align="center">
       <div id="login_form">
         <form action="<%= url_for :controller => 'users', :action => 'signup' -%>" method="post">
-          <h3><%= label_tag 'user_login', 'Login' %></h3>
+          <h3><%= label_tag 'user_login', message('login') %></h3>
           <p>
             <input id="user_login" name="user[login]" size="30" type="text" ></input>
-            <br/><span class="desc"><%= link_to 'Log in', :controller => 'sessions', :action => 'new' -%> if you already have an account.</span>
+            <br/><span class="desc"><%= message('sessions.old_account', :params => [url_for(:controller => 'sessions', :action => 'new')]) -%></span>
           </p>
 
-          <h3><%= label_tag 'user_name', 'Name' %></h3>
+          <h3><%= label_tag 'user_name', message('name') %></h3>
           <p>
             <input id="user_name" name="user[name]" size="30" type="text" ></input>
           </p>
-          <h3><%= label_tag 'user_password', 'Password' %></h3>
+          <h3><%= label_tag 'user_password', message('password') %></h3>
           <p><input id="user_password" maxLength="50" name="user[password]" size="30" type="password"></input></p>
 
-          <h3><%= label_tag 'user_password_confirmation', 'Confirm password' %></h3>
+          <h3><%= label_tag 'user_password_confirmation', message('sessions.confirm_password') %></h3>
           <p>
             <input id="user_password_confirmation" maxLength="50" name="user[password_confirmation]" size="30" type="password"></input>
           </p>
           <p>
-            <%= submit_tag 'Sign up' %> <a href="<%= home_path -%>" class="action">cancel</a>
+            <%= submit_tag message('sessions.sign_up') %> <a href="<%= home_path -%>" class="action"><%= message('cancel') -%></a>
           </p>
         </form>
         <%= error_messages_for :user, :class => 'error', :header_message => nil, :message => nil %>
@@ -33,4 +33,4 @@
 //<![CDATA[
     $('login').activate();
 //]]>
-</script>
\ No newline at end of file
+</script>