TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-08 22:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change additional groups copy to match iOS.

Browse Source
This commit is contained in:
Alex Hart 2020-08-04 16:56:32 -03:00 committed by Greyson Parrelli
parent f014dadf06
commit 7bb0199e83
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/lint.xml
View File

@ -11,6 +11,7 @@
<!-- L10N warnings --> <!-- L10N warnings -->
<issue id="MissingTranslation" severity="ignore" /> <issue id="MissingTranslation" severity="ignore" />
<issue id="MissingQuantity" severity="warning" /> <issue id="MissingQuantity" severity="warning" />
<issue id="MissingDefaultResource" severity="warning" />
<issue id="ExtraTranslation" severity="warning" /> <issue id="ExtraTranslation" severity="warning" />
<issue id="ImpliedQuantity" severity="warning" /> <issue id="ImpliedQuantity" severity="warning" />
<issue id="TypographyDashes" severity="error" > <issue id="TypographyDashes" severity="error" >

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@ -405,7 +405,7 @@ public class ConversationFragment extends LoggingFragment {
description = context.getString(R.string.MessageRequestProfileView_member_of_many_groups, description = context.getString(R.string.MessageRequestProfileView_member_of_many_groups,
HtmlUtil.bold(groups.get(0)), HtmlUtil.bold(groups.get(0)),
HtmlUtil.bold(groups.get(1)), HtmlUtil.bold(groups.get(1)),
context.getResources().getQuantityString(R.plurals.MessageRequestProfileView_member_of_others, others, others)); context.getResources().getQuantityString(R.plurals.MessageRequestProfileView_member_of_d_additional_groups, others, others));
} }
conversationBanner.setDescription(HtmlCompat.fromHtml(description, 0)); conversationBanner.setDescription(HtmlCompat.fromHtml(description, 0));

6
app/src/main/res/values/strings.xml
View File

@ -906,9 +906,9 @@
<item quantity="one">%1$d member (+%2$d invited)</item> <item quantity="one">%1$d member (+%2$d invited)</item>
<item quantity="other">%1$d members (+%2$d invited)</item> <item quantity="other">%1$d members (+%2$d invited)</item>
</plurals> </plurals>
<plurals name="MessageRequestProfileView_member_of_others"> <plurals name="MessageRequestProfileView_member_of_d_additional_groups">
<item quantity="one">%d other</item> <item quantity="one">%d additional group</item>
<item quantity="other">%d others</item> <item quantity="other">%d additional groups</item>
</plurals> </plurals>
<!-- PassphraseChangeActivity --> <!-- PassphraseChangeActivity -->