Skip to content

Commit c071554

Browse files
authored
Renamed People to Users (#21901)
* Renamed People to Users * Removed unused string resource
1 parent 78396be commit c071554

File tree

7 files changed

+9
-10
lines changed

7 files changed

+9
-10
lines changed

WordPress/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@
732732
<!--People Management-->
733733
<activity
734734
android:name=".ui.people.PeopleManagementActivity"
735-
android:label="@string/people"
735+
android:label="@string/users"
736736
android:launchMode="singleTop"
737737
android:theme="@style/WordPress.NoActionBar"/>
738738
<activity

WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/SiteListItemBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class SiteListItemBuilder @Inject constructor(
137137
return if (site.hasCapabilityListUsers) {
138138
ListItem(
139139
R.drawable.ic_user_white_24dp,
140-
UiStringRes(R.string.people),
140+
UiStringRes(R.string.users),
141141
onClick = ListItemInteraction.create(PEOPLE, onClick),
142142
listItemAction = PEOPLE
143143
)

WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public View onCreateView(final LayoutInflater inflater, ViewGroup container, Bun
189189
if (actionBar != null) {
190190
actionBar.setHomeButtonEnabled(true);
191191
actionBar.setDisplayHomeAsUpEnabled(true);
192-
actionBar.setTitle(R.string.invite_people);
192+
actionBar.setTitle(R.string.invite_users);
193193
}
194194

195195
mInviteLinkContainer = rootView.findViewById(R.id.invite_links_container);
@@ -389,7 +389,7 @@ public void afterTextChanged(Editable s) {
389389
});
390390

391391
// important for accessibility - talkback
392-
getActivity().setTitle(R.string.invite_people);
392+
getActivity().setTitle(R.string.invite_users);
393393
}
394394

395395
private void resetEditTextContent(EditText editText) {

WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
117117
if (actionBar != null) {
118118
actionBar.setHomeButtonEnabled(true);
119119
actionBar.setDisplayHomeAsUpEnabled(true);
120-
actionBar.setTitle(R.string.people);
120+
actionBar.setTitle(R.string.users);
121121
}
122122

123123
mSite = (SiteModel) getArguments().getSerializable(WordPress.SITE);
@@ -264,7 +264,7 @@ private void showJetpackBannerIfNeeded(final View rootView) {
264264
@Override public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
265265
super.onViewCreated(view, savedInstanceState);
266266
// important for accessibility - talkback
267-
getActivity().setTitle(R.string.people);
267+
getActivity().setTitle(R.string.users);
268268
}
269269

270270
@Override

WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ private boolean navigateBackToPeopleListFragment() {
609609

610610
ActionBar actionBar = getSupportActionBar();
611611
if (actionBar != null) {
612-
actionBar.setTitle(R.string.people);
612+
actionBar.setTitle(R.string.users);
613613
}
614614
return true;
615615
}

WordPress/src/main/res/values/strings.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2721,7 +2721,6 @@
27212721
<string name="themes_empty_list">No themes matching your search</string>
27222722

27232723
<!--People Management-->
2724-
<string name="people">People</string>
27252724
<string name="users">Users</string>
27262725
<string name="user">User</string>
27272726
<string name="no_users">No users</string>
@@ -2732,7 +2731,7 @@
27322731
<string name="subscriber_remove_confirmation_message">If removed, this subscriber will stop receiving notifications about this site, unless they re-subscribe.\n\nWould you still like to remove this subscriber?</string>
27332732
<string name="viewer_remove_confirmation_message">If you remove this viewer, he or she will not be able to visit this site.\n\nWould you still like to remove this viewer?</string>
27342733
<string name="person_removed">Successfully removed %1$s</string>
2735-
<string name="invite_people">Invite People</string>
2734+
<string name="invite_users">Invite users</string>
27362735
<string name="invite_names_title">Usernames or emails</string>
27372736
<string name="invite">Invite</string>
27382737
<string name="button_invite" translatable="false">@string/invite</string>

WordPress/src/test/java/org/wordpress/android/ui/mysite/items/SiteItemFixtures.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ val ADMIN_ITEM = ListItem(
8181
)
8282
val PEOPLE_ITEM = ListItem(
8383
R.drawable.ic_user_white_24dp,
84-
UiStringRes(R.string.people),
84+
UiStringRes(R.string.users),
8585
onClick = ListItemInteraction.create(ListItemAction.PEOPLE, SITE_ITEM_ACTION),
8686
listItemAction = ListItemAction.PEOPLE
8787
)

0 commit comments

Comments
 (0)