mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix pluralization possibilities for group invite string. 

Fixes #12197
fork-5.53.8
Greyson Parrelli 2022-04-29 16:46:31 -04:00
rodzic e710e231ad
commit df48e5ce92
3 zmienionych plików z 16 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
Wyświetl plik

@ -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));

10
app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java
Wyświetl plik

@ -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<GroupDatabase.MemberLevel> selfMemberLevel() {

10
app/src/main/res/values/strings.xml
Wyświetl plik

@ -1334,9 +1334,15 @@
<item quantity="one">%1$d member</item>
<item quantity="other">%1$d members</item>
</plurals>
<!-- Describes the number of members in a group. The string MessageRequestProfileView_invited is nested in the parentheses. -->
<plurals name="MessageRequestProfileView_members_and_invited">
<item quantity="one">%1$d member (+%2$d invited)</item>
<item quantity="other">%1$d members (+%2$d invited)</item>
<item quantity="one">%1$d member (%2$s)</item>
<item quantity="other">%1$d members (%2$s)</item>
</plurals>
<!-- Describes the number of people invited to a group. Nested inside of the string MessageRequestProfileView_members_and_invited -->
<plurals name="MessageRequestProfileView_invited">
<item quantity="one">+%1$d invited</item>
<item quantity="other">+%1$d invited</item>
</plurals>
<plurals name="MessageRequestProfileView_member_of_d_additional_groups">
<item quantity="one">%d additional group</item>