Skip to content

Commit

Permalink
Clean accounts view
Browse files Browse the repository at this point in the history
  • Loading branch information
Yannick Francois committed Oct 7, 2013
1 parent 4249f1e commit 24a86b5
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
2 changes: 1 addition & 1 deletion app/views/accounts/confirm.html.erb
Expand Up @@ -6,5 +6,5 @@
</div>

<%- content_for :account_links do %>
<%= _("Proceed to %s", link_to(_("admin"), controller: 'admin/dashboard')) %>
<%= t(".proceed_to", link: link_to(t(".admin"), controller: 'admin/dashboard')) %>
<% end %>
8 changes: 4 additions & 4 deletions app/views/accounts/login.html.erb
@@ -1,5 +1,5 @@
<%= form_tag action: "login" do %>
<%= text_field(:user, :login, {class: 'input-block-level', placeholder: t(".login")})%>
<%= text_field(:user, :login, {class: 'input-block-level', placeholder: t(".login"), autofocus: 'autofocus'})%>
<%= password_field(:user, :password, {class: 'input-block-level', placeholder: t(".password")})%>
<div class='clearfix'>
<div class='row'>
Expand All @@ -16,11 +16,11 @@
<% end %>
<%- content_for :account_links do %>
<small><%= link_to(_("I've lost my password"), action: 'recover_password') %></small>
<small><%= link_to(t("accounts.lost_my_password"), action: 'recover_password') %></small>
<br/>
<%- if this_blog.allow_signup? %>
<small><%= link_to(_("Create an account"), action: 'signup') %></small>
<small><%= link_to(t("accounts.create_account"), action: 'signup') %></small>
<br/>
<% end %>
<small><%= link_to(_("&larr; Back to %s", this_blog.blog_name).html_safe, this_blog.base_url) %></small>
<small><%= link_to(t("accounts.back_to", place: this_blog.blog_name).html_safe, this_blog.base_url) %></small>
<% end %>
6 changes: 3 additions & 3 deletions app/views/accounts/recover_password.html.erb
Expand Up @@ -4,11 +4,11 @@
<% end %>
<%- content_for :account_links do %>
<small><%= link_to(_("Back to login"), action: 'login') %></small>
<small><%= link_to(t("accounts.back_to_login"), action: 'login') %></small>
<br/>
<%- if this_blog.allow_signup? %>
<small><%= link_to(_("Create an account"), action: 'signup') %></small>
<small><%= link_to(t("accounts.create_account"), action: 'signup') %></small>
<br/>
<% end %>
<small><%= link_to(_("&larr; Back to %s", this_blog.blog_name).html_safe, this_blog.base_url) %></small>
<small><%= link_to(t("accounts.back_to", place: this_blog.blog_name).html_safe, this_blog.base_url) %></small>
<% end %>
6 changes: 3 additions & 3 deletions app/views/accounts/signup.html.erb
Expand Up @@ -5,9 +5,9 @@
<% end %>
<%- content_for :account_links do %>
<small><%= link_to(_("I've lost my password"), action: 'recover_password') %></small>
<small><%= link_to(t("accounts.lost_my_password"), action: 'recover_password') %></small>
<br/>
<small><%= link_to(_("Back to login"), action: 'login') %></small>
<small><%= link_to(t("accounts.back_to_login"), action: 'login') %></small>
<br/>
<small><%= link_to(_("&larr; Back to %s", this_blog.blog_name).html_safe, this_blog.base_url) %></small>
<small><%= link_to(t("accounts.back_to", place: this_blog.blog_name).html_safe, this_blog.base_url) %></small>
<% end %>
7 changes: 7 additions & 0 deletions config/locales/fr.yml
Expand Up @@ -5,8 +5,15 @@ fr:
explanations: "Afin d'économiser des ressources, Publify génère des fichiers statiques avec votre contenu. Ces fichiers sont supprimés lors d'une nouvelle publication. Vous pouvez cependant les effacer vous même."

accounts:
back_to: "&larr; Revenir à %{place}"
back_to_login: "S'identifier"
create_account: "Créer un compte"
lost_my_password: "J'ai perdu mon mot de passe"
login:
login: "Identifiant"
password: "Mot de passe"
sign_in: "S'identifier"
remember_me: "Rester connecté"
confirm:
proceed_to: "Allez sur %{link}"
admin: "l'administration"
8 changes: 0 additions & 8 deletions lang/fr_FR.rb
Expand Up @@ -96,10 +96,6 @@
# app/controllers/grouping_controller.rb
l.store "page", "page"

# app/helpers/accounts_helper.rb
l.store "Create an account", "Créer un compte"
l.store "I've lost my password", "J'ai perdu mon mot de passe"

# app/helpers/admin/base_helper.rb
l.store "Cancel", "Annuler"
l.store "Store", "Stocker"
Expand Down Expand Up @@ -165,7 +161,6 @@
# app/views/accounts/recover_password.html.erb
l.store "Reset my password", "Me renvoyer un mot de passe"
l.store "Username or email", "Identifiant ou email"
l.store "Back to login", "S'identifier"

# app/views/accounts/signup.html.erb
l.store "Username", "Identifiant"
Expand Down Expand Up @@ -721,8 +716,6 @@
l.store "<strong>Login:</strong> %s", "<strong>Identifiant&nbsp;:</strong> %s"
l.store "<strong>Password:</strong> %s", "<strong>Mot de passe&nbsp;:</strong> %s"
l.store "Don't lose the mail sent at %s or you won't be able to login anymore", "Ne perdez pas l'email que nous venons de vous envoyer à l'adresse %s ou vous ne pourrez plus vous connecter à l'application"
l.store "Proceed to %s", "Allez sur %s"
l.store "admin", "l'administration"

# app/views/shared/_search.html.erb
l.store "Live Search", "Recherche instantanée"
Expand Down Expand Up @@ -841,7 +834,6 @@
l.store "Article Types", "Modèles d'articles"
l.store "Aug", "août"
l.store "August", "août"
l.store "Back to ", "Revenir à "
l.store "Back to overview", "Revenir à la liste"
l.store "Back to tags list", "Revenir à la liste des labels"
l.store "Blacklist Pattern could not be created.", "Cette entrée n'a pas pu être créée"
Expand Down

0 comments on commit 24a86b5

Please sign in to comment.