From 45c227c81c15d77ed43ac233a1c97bc2b5572261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Sat, 6 Jul 2013 21:51:58 +0200
Subject: [PATCH] fix column name in admin email logs

---
 app/assets/javascripts/admin/templates/email_logs.js.handlebars | 2 +-
 config/locales/client.en.yml                                    | 2 +-
 config/locales/client.fr.yml                                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/email_logs.js.handlebars b/app/assets/javascripts/admin/templates/email_logs.js.handlebars
index 016211f9fd9..ea918cfb962 100644
--- a/app/assets/javascripts/admin/templates/email_logs.js.handlebars
+++ b/app/assets/javascripts/admin/templates/email_logs.js.handlebars
@@ -1,7 +1,7 @@
 <table class='table'>
   <tr>
     <th>{{i18n admin.email.sent_at}}</th>
-    <th>{{i18n user.title}}</th>
+    <th>{{i18n admin.email.user}}</th>
     <th>{{i18n admin.email.to_address}}</th>
     <th>{{i18n admin.email.email_type}}</th>
     <th>{{i18n admin.email.reply_key}}</th>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 54d17537a14..3f572270161 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -157,7 +157,6 @@ en:
 
     user:
       profile: Profile
-      title: "User"
       mute: Mute
       edit: Edit Preferences
       download_archive: "download archive of my posts"
@@ -1104,6 +1103,7 @@ en:
         settings: "Settings"
         logs: "Logs"
         sent_at: "Sent At"
+        user: "User"
         email_type: "Email Type"
         to_address: "To Address"
         test_email_address: "email address to test"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 64a7bb9fc35..f9d19a6467f 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -165,7 +165,6 @@ fr:
 
     user:
       profile: "profil"
-      title: "Utilisateur"
       mute: "couper"
       edit: "Éditer les préférences"
       download_archive: "télécharger l'archive de mes messages"
@@ -1060,6 +1059,7 @@ fr:
         logs: "Logs"
         title: "Historique des mails"
         sent_at: "Envoyer à"
+        user: "Utilisateur"
         email_type: "Type d'email"
         to_address: "À l'adresse"
         test_email_address: "Adresse mail à tester"