diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index 8e13d24d15..e8f7c0055a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -582,9 +582,8 @@ public class ConversationFragment extends LoggingFragment implements Multiselect if (recipient.isGroup()) { if (pendingMemberCount > 0) { - conversationBanner.setSubtitle(context.getResources() - .getQuantityString(R.plurals.MessageRequestProfileView_members_and_invited, memberCount, - memberCount, pendingMemberCount)); + String invited = context.getResources().getQuantityString(R.plurals.MessageRequestProfileView_invited, pendingMemberCount, pendingMemberCount); + conversationBanner.setSubtitle(context.getResources().getQuantityString(R.plurals.MessageRequestProfileView_members_and_invited, memberCount, memberCount, invited)); } else if (memberCount > 0) { conversationBanner.setSubtitle(context.getResources().getQuantityString(R.plurals.MessageRequestProfileView_members, memberCount, memberCount)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java b/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java index b8dd5fe60e..ce495e383a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java @@ -226,10 +226,12 @@ public final class LiveGroup { } private static String getMembershipDescription(@NonNull Resources resources, int invitedCount, int fullMemberCount) { - return invitedCount > 0 ? resources.getQuantityString(R.plurals.MessageRequestProfileView_members_and_invited, fullMemberCount, - fullMemberCount, invitedCount) - : resources.getQuantityString(R.plurals.MessageRequestProfileView_members, fullMemberCount, - fullMemberCount); + if (invitedCount > 0) { + String invited = resources.getQuantityString(R.plurals.MessageRequestProfileView_invited, invitedCount, invitedCount); + return resources.getQuantityString(R.plurals.MessageRequestProfileView_members_and_invited, fullMemberCount, fullMemberCount, invited); + } else { + return resources.getQuantityString(R.plurals.MessageRequestProfileView_members, fullMemberCount, fullMemberCount); + } } private LiveData selfMemberLevel() { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 69e0d3deb2..73638d318e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1334,9 +1334,15 @@ %1$d member %1$d members + - %1$d member (+%2$d invited) - %1$d members (+%2$d invited) + %1$d member (%2$s) + %1$d members (%2$s) + + + + +%1$d invited + +%1$d invited %d additional group