summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2008-05-24 05:34:04 +0200
committerlpsolit%gmail.com <>2008-05-24 05:34:04 +0200
commit074f7b588974ced7368f2783adc1d7437d54ba77 (patch)
tree79febe1a4015e6cf5327be0243aa0e48c15e9ee0
parentd636ffc11dcfb6106aafc08481f0db548874e5bc (diff)
downloadbugzilla-074f7b588974ced7368f2783adc1d7437d54ba77.tar.gz
bugzilla-074f7b588974ced7368f2783adc1d7437d54ba77.tar.xz
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
-rwxr-xr-xeditusers.cgi2
-rw-r--r--template/en/default/account/profile-activity.html.tmpl1
-rw-r--r--template/en/default/global/field-descs.none.tmpl3
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",