From 00dff9d63d425992256bc2b8758c5b56a34f4cf0 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Sun, 15 Mar 2026 09:25:33 +0000
Subject: [PATCH] Align Members CSV headers with UI terminology (#37480).

git-svn-id: https://svn.redmine.org/redmine/trunk@24494 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/members_helper.rb              |  4 ++--
 config/locales/en.yml                      |  1 -
 config/locales/ja.yml                      |  1 -
 test/functional/members_controller_test.rb | 14 +++++++-------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 09cf8c356..195f8c0c0 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -66,15 +66,15 @@ module MembersHelper
   def members_to_csv(members)
     Redmine::Export::CSV.generate(encoding: params[:encoding]) do |csv|
       # csv headers
-      csv << [l(:label_name), l(:label_role), l(:field_principal), l(:label_project)]
+      csv << [l(:field_principal), l(:field_type), l(:label_role), l(:label_project)]
 
       # csv lines
       members.each do |member|
         member.roles.each do |role|
           csv << [
             member.principal.name,
-            role.name,
             member.principal.is_a?(Group) ? l(:label_group) : l(:label_user),
+            role.name,
             member.project.name
           ]
         end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 948b61958..1ea7b4170 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -657,7 +657,6 @@ en:
   label_document_new: New document
   label_document_plural: Documents
   label_document_added: Document added
-  label_name: Name
   label_role: Role
   label_role_plural: Roles
   label_role_new: New role
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 76c22b70f..6749d58e5 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -493,7 +493,6 @@ ja:
   label_document_new: 新しい文書
   label_document_plural: 文書
   label_document_added: 文書の追加
-  label_name: 名前
   label_role: ロール
   label_role_plural: ロール
   label_role_new: 新しいロール
diff --git a/test/functional/members_controller_test.rb b/test/functional/members_controller_test.rb
index c5d04941e..1d9b00f36 100644
--- a/test/functional/members_controller_test.rb
+++ b/test/functional/members_controller_test.rb
@@ -41,15 +41,15 @@ class MembersControllerTest < Redmine::ControllerTest
     # Number of lines
     assert_equal project.memberships.sum{|m| m.roles.count } + 1, lines.size
     # Header
-    assert_equal "Name,Role,User or Group,Project", lines.first
+    assert_equal "User or Group,Type,Role,Project", lines.first
     # Details
     to_test = [
-      'John Smith,Manager,User,Private child of eCookbook',
-      'A Team,Manager,Group,Private child of eCookbook',
-      'A Team,Developer,Group,Private child of eCookbook',
-      'User Misc,Manager,User,Private child of eCookbook',
-      'User Misc,Developer,User,Private child of eCookbook',
-      'Redmine Admin,Manager,User,Private child of eCookbook'
+      'John Smith,User,Manager,Private child of eCookbook',
+      'A Team,Group,Manager,Private child of eCookbook',
+      'A Team,Group,Developer,Private child of eCookbook',
+      'User Misc,User,Manager,Private child of eCookbook',
+      'User Misc,User,Developer,Private child of eCookbook',
+      'Redmine Admin,User,Manager,Private child of eCookbook'
     ]
     to_test.each do |expected|
       assert_includes lines, expected