diff --git a/app/views/login/index.html.erb b/app/views/login/index.html.erb index b9e0f1e..445a5a7 100644 --- a/app/views/login/index.html.erb +++ b/app/views/login/index.html.erb @@ -1,36 +1,33 @@
- Login + <%= t('.login') %>Login
<%= form_tag login_path do %>

- <%= label_tag :email, "E-mail or Username:" %> + <%= label_tag :email, t('.email') %> <%= text_field_tag :email, "", :size => 30, :autofocus => "autofocus" %>
- <%= label_tag :password, "Password:" %> + <%= label_tag :password, t('.password') %> <%= password_field_tag :password, "", :size => 30 %>

- <%= submit_tag "Login" %> + <%= submit_tag t('.login') %>

- Forgot your password or deleted your account? - <%= link_to "Reset your password", forgot_password_path %>. + <%= t('.forgotdeleted') %><%= link_to t('.resetpassword'), forgot_password_path %>.

- Not a user yet? Signup is by invitation only to combat spam and increase - accountability. If you know a current user of the site, - ask them for an invitation or + <%= raw(t('.notuseryet', :acurrentuser => "#{t('.acurrentuser')}")) %> <% if Rails.application.allow_invitation_requests? %> - request one publicly. + <%= t('.request') %>. <% else %> - request one in chat. + <%= raw(t('.requestinchat')) %> <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 2a0fcc8..d42cd53 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -69,6 +69,18 @@ en: home: index: homerecentsdesc: "The newest stories with a random sampling of recently submitted stories that have not yet reached the front page." + login: + index: + login: "Login" + email: "E-mail or Username:" + password: "Password:" + login: "Login" + forgotdeleted: "Forgot your password or deleted your account? " + resetpassword: "Reset your password" + notuseryet: "Not a user yet? Signup is by invitation only to combat spam and increase accountability. If you know %{acurrentuser} of the site, ask them for an invitation or" + acurrentuser: "a current user" + request: "request one publicly" + requestinchat: "request one in chat." moderations: index: moderationlogtitle: "Moderation Log" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 8a96038..aa9c685 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -71,6 +71,18 @@ fr: home: index: homerecentsdesc: "Les plus récentes infos avec un panaché aléatoire des infos récentes soumises qui n'ont pas encore atteint la page principale." + login: + index: + login: "Se connecter" + email: "E-mail ou utilisateur :" + password: "Mot de passe :" + login: "Connexion" + forgotdeleted: "Oubli du mot de passe ou suppression du compte ? " + resetpassword: "Changer de mot de passe" + notuseryet: "Pas encore utilisateur ? L'inscription est seulement par invitation pour lutter contre le spam et améliorer la traçabilité. Si vous connaissez %{acurrentuser} du site, demandez-lui une invitation ou" + acurrentuser: "un utilisateur" + request: "demandez-en une publiquement" + requestinchat: "dans le chat." filters: index: filteredtags: "Marques filtrées"