diff options
| author | Maxwell Salzberg <mbs348@gmail.com> | 2012-05-15 02:18:52 +0400 |
|---|---|---|
| committer | Maxwell Salzberg <mbs348@gmail.com> | 2012-05-15 02:18:52 +0400 |
| commit | 9d20f66d2f30899cf0e2afb34c270be09af2a693 (patch) | |
| tree | 4103d5fdc4efe3a7a29caee47469c27641e557d9 | |
| parent | 641ead632b142829606a3ff67ffcb5cd1bb85fa2 (diff) | |
| parent | 7538f89a95521a201d0dd75a30b59b39c0464a3d (diff) | |
Merge pull request #3252 from movilla/regis_tra
Translation registrations/new [ci skip]
| -rw-r--r-- | app/views/registrations/new.html.erb | 20 | ||||
| -rw-r--r-- | config/locales/diaspora/en.yml | 7 |
2 files changed, 15 insertions, 12 deletions
diff --git a/app/views/registrations/new.html.erb b/app/views/registrations/new.html.erb index b9421b0e4..a0911372d 100644 --- a/app/views/registrations/new.html.erb +++ b/app/views/registrations/new.html.erb @@ -8,26 +8,22 @@ <div class="span8"> <h1 id="create-something-text"> - HEY, - <br/> - MAKE - <br/> - SOMETHING. + <%= t('.hey_make').html_safe %> </h1> <h3 id="diaspora-hearts"> - <3 Diaspora* + <%= t('.diaspora') %> </h3> <h4 id="sign-up-text"> - SIGN UP + <%= t('.sign_up') %> </h4> <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:class => "form-horizontal block-form", :autocomplete => "off"}, :validate => true) do |f| %> <fieldset> <div class="control-group"> <label class="control-label" for="user_email"> - EMAIL + <%= t('.email') %> </label> <div class="controls"> @@ -37,7 +33,7 @@ <div class="control-group"> <label class="control-label" for="user_username"> - USERNAME + <%= t('.username') %> </label> <div class="controls"> @@ -47,7 +43,7 @@ <div class="control-group"> <label class="control-label" for="user_password"> - PASSWORD + <%= t('.password') %> </label> <div class="controls"> @@ -57,9 +53,9 @@ <%= invite_hidden_tag(invite) %> </fieldset> - <%= f.submit "Continue", :class => "new-btn" %> + <%= f.submit t('.continue'), :class => "new-btn" %> <% end %> </div> </div> </div> -</div>
\ No newline at end of file +</div> diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index a8e309206..d0da4adf4 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -707,6 +707,13 @@ en: enter_username: "Pick a username (only letters, numbers, and underscores)" enter_password: "Enter a password (six character minimum)" enter_password_again: "Enter the same password as before" + hey_make: "HEY,<br/>MAKE<br/>SOMETHING." + diaspora: "<3 Diaspora*" + sign_up: "SIGN UP" + email: "EMAIL" + username: "USERNAME" + password: "PASSWORD" + continue: "Continue" create: success: "You've joined Diaspora!" edit: |