aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/users/show.html.slim6
-rw-r--r--config/locales/users.en.yml7
-rw-r--r--config/locales/users.fr.yml1
3 files changed, 9 insertions, 5 deletions
diff --git a/app/views/users/show.html.slim b/app/views/users/show.html.slim
index f884ae94e..858aa3395 100644
--- a/app/views/users/show.html.slim
+++ b/app/views/users/show.html.slim
@@ -4,7 +4,9 @@
p
label = "#{User.human_attribute_name('name')} : "
= @user.name
-
+ p
+ label = "#{User.human_attribute_name('username')} : "
+ = @user.username
p
label = "#{User.human_attribute_name('email')} : "
= @user.email
@@ -16,4 +18,4 @@
li
= link_to( t('users.actions.edit'), edit_user_registration_path, class: "edit") if @user == current_user
li
- = link_to t('users.actions.destroy'), organisation_user_path(@user), method: :delete, data: {:confirm => t('users.actions.destroy_confirm')}, class: "remove" \ No newline at end of file
+ = link_to t('users.actions.destroy'), organisation_user_path(@user), method: :delete, data: {:confirm => t('users.actions.destroy_confirm')}, class: "remove"
diff --git a/config/locales/users.en.yml b/config/locales/users.en.yml
index 17c43f4b2..19168f560 100644
--- a/config/locales/users.en.yml
+++ b/config/locales/users.en.yml
@@ -13,9 +13,10 @@ en:
title: "User %{user}"
index:
title: "Users"
- activerecord:
- models:
+ activerecord:
+ models:
user: "user"
attributes:
user:
- name: "Full name"
+ name: "Full name"
+ username: "Username"
diff --git a/config/locales/users.fr.yml b/config/locales/users.fr.yml
index 55d6382ef..dcb81b808 100644
--- a/config/locales/users.fr.yml
+++ b/config/locales/users.fr.yml
@@ -19,3 +19,4 @@ fr:
attributes:
user:
name: "Nom complet"
+ username: "Nom d'utilisateur"