Skip to content

Rename "People" to "Members" in organization page and use a better icon #22960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 18, 2023
Merged

Rename "People" to "Members" in organization page and use a better icon #22960

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
300cabc
Rename "People" to "Members" in organization page and use a better icon
yardenshoham Feb 17, 2023
83cd999
Missed one svg
yardenshoham Feb 18, 2023
d603b08
Merge remote-tracking branch 'upstream/main' into people-to-members
yardenshoham Feb 18, 2023
d533ec4
Merge branch 'main' into people-to-members
yardenshoham Feb 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/content/page/index.en-us.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion templates/org/home.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion templates/org/menu.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
2 changes: 1 addition & 1 deletion templates/user/overview/header.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down