From feed1ff38f88115f27ea2357a97c21e5277aac88 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Sat, 18 Feb 2023 15:41:31 +0200
Subject: [PATCH] Rename "People" to "Members" in organization page and use a
 better icon (#22960)

`member` is how it's named in the code

Closes #22931

Before | After
--- | ---

![image](https://user-images.githubusercontent.com/20454870/219781155-69a8476e-0f04-4b70-bda5-ea6fa8ce676c.png)
|
![image](https://user-images.githubusercontent.com/20454870/219780887-61644c27-36a2-4e1f-8f98-be3911883b49.png)

---------

Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: delvh <leon@kske.dev>
---
 docs/content/page/index.en-us.md    | 2 +-
 options/locale/locale_en-US.ini     | 2 +-
 templates/org/home.tmpl             | 2 +-
 templates/org/menu.tmpl             | 2 +-
 templates/user/overview/header.tmpl | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/content/page/index.en-us.md b/docs/content/page/index.en-us.md
index a0923db72a..60e50efad3 100644
--- a/docs/content/page/index.en-us.md
+++ b/docs/content/page/index.en-us.md
@@ -106,7 +106,7 @@ You can try it out using [the online demo](https://try.gitea.io/).
       - Permission to create organizations
       - Permission to import repositories
     - Organization management
-      - People
+      - Members
       - Teams
       - Avatar
       - Hooks
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 8410fef81e..51ae8c7a02 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2364,7 +2364,7 @@ org_full_name_holder = Organization Full Name
 org_name_helper = Organization names should be short and memorable.
 create_org = Create Organization
 repo_updated = Updated
-people = People
+members = Members
 teams = Teams
 code = Code
 lower_members = members
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 1b3cabbde7..e1adaf1c1b 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -42,7 +42,7 @@
 					<div class="ui divider"></div>
 				{{end}}
 				<h4 class="ui top attached header gt-df">
-					<strong class="gt-f1">{{.locale.Tr "org.people"}}</strong>
+					<strong class="gt-f1">{{.locale.Tr "org.members"}}</strong>
 					<div class="ui">
 						<a class="text grey gt-dif gt-ac" href="{{.OrgLink}}/members"><span>{{.MembersTotal}}</span> {{svg "octicon-chevron-right"}}</a>
 					</div>
diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl
index 5f543424fc..7ca47cd32c 100644
--- a/templates/org/menu.tmpl
+++ b/templates/org/menu.tmpl
@@ -18,7 +18,7 @@
 		{{end}}
 		{{if .IsOrganizationMember}}
 			<a class="{{if $.PageIsOrgMembers}}active {{end}}item" href="{{$.OrgLink}}/members">
-				{{svg "octicon-organization"}}&nbsp;{{$.locale.Tr "org.people"}}
+				{{svg "octicon-person"}}&nbsp;{{$.locale.Tr "org.members"}}
 				{{if .NumMembers}}
 					<div class="ui primary label">{{.NumMembers}}</div>
 				{{end}}
diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl
index eac23fe53f..2449f5fc32 100644
--- a/templates/user/overview/header.tmpl
+++ b/templates/user/overview/header.tmpl
@@ -39,7 +39,7 @@
 			{{if .ContextUser.IsOrganization}}
 				{{if .IsOrganizationMember}}
 					<a class="item" href="{{$.OrgLink}}/members">
-						{{svg "octicon-organization"}}&nbsp;{{$.locale.Tr "org.people"}}
+						{{svg "octicon-person"}}&nbsp;{{$.locale.Tr "org.members"}}
 						{{if .NumMembers}}
 							<div class="ui primary label">{{.NumMembers}}</div>
 						{{end}}