From 074f7b588974ced7368f2783adc1d7437d54ba77 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Sat, 24 May 2008 03:34:04 +0000
Subject: Bug 435250: In the "View User Account Log" page, the information in
 the "What" column are displayed in English on localized installation - Patch
 by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 editusers.cgi                                          | 2 +-
 template/en/default/account/profile-activity.html.tmpl | 1 +
 template/en/default/global/field-descs.none.tmpl       | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/editusers.cgi b/editusers.cgi
index 11bd62bde..4e75d6df4 100755
--- a/editusers.cgi
+++ b/editusers.cgi
@@ -642,7 +642,7 @@ if ($action eq 'search') {
     $vars->{'profile_changes'} = $dbh->selectall_arrayref(
         "SELECT profiles.login_name AS who, " .
                 $dbh->sql_date_format('profiles_activity.profiles_when') . " AS activity_when,
-                fielddefs.description AS what,
+                fielddefs.name AS what,
                 profiles_activity.oldvalue AS removed,
                 profiles_activity.newvalue AS added
          FROM profiles_activity
diff --git a/template/en/default/account/profile-activity.html.tmpl b/template/en/default/account/profile-activity.html.tmpl
index 3ef904de7..bcb81f849 100644
--- a/template/en/default/account/profile-activity.html.tmpl
+++ b/template/en/default/account/profile-activity.html.tmpl
@@ -56,6 +56,7 @@
    }
    {name               => 'what'
     heading            => 'What'
+    content_use_field  => 1
    }
    {name               => 'removed'
     heading            => 'Removed'
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index 178a68444..7b3014aa2 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -28,6 +28,7 @@
                    "assigned_to"          => "Assignee",
                    "blocked"              => "Blocks",
                    "bug_file_loc"         => "URL",
+                   "bug_group"            => "Group",
                    "bug_id"               => "$terms.Bug ID",
                    "bug_severity"         => "Severity",
                    "bug_status"           => "Status",
@@ -37,7 +38,7 @@
                    "cclist_accessible"    => "CC list accessible",
                    "component_id"         => "Component ID",
                    "component"            => "Component",
-                   "creation_ts"          => "$terms.Bug Creation time",
+                   "creation_ts"          => "Creation date",
                    "deadline"             => "Deadline",
                    "delta_ts"             => "Changed",
                    "dependson"            => "Depends on",
-- 
cgit v1.2.3-24-g4f1b