Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix localization issue with group call start strings.

Browse Source
This commit is contained in:
Cody Henthorne
2023-06-09 12:30:30 -04:00
parent 81149e5aa8
commit b55181ffe6
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/database/model/GroupCallUpdateMessageFactory.java
View File

@@ -61,8 +61,13 @@ public class GroupCallUpdateMessageFactory implements UpdateDescription.Spannabl
: context.getString(R.string.MessageRecord_group_call); : context.getString(R.string.MessageRecord_group_call);
case 1: case 1:
if (joinedMembers.get(0).toString().equals(groupCallUpdateDetails.getStartedCallUuid())) { if (joinedMembers.get(0).toString().equals(groupCallUpdateDetails.getStartedCallUuid())) {
if (Objects.equals(joinedMembers.get(0), selfAci)) {
return withTime ? context.getString(R.string.MessageRecord_you_started_a_group_call_s, time)
: context.getString(R.string.MessageRecord_you_started_a_group_call);
} else {
return withTime ? context.getString(R.string.MessageRecord_s_started_a_group_call_s, describe(joinedMembers.get(0)), time) return withTime ? context.getString(R.string.MessageRecord_s_started_a_group_call_s, describe(joinedMembers.get(0)), time)
: context.getString(R.string.MessageRecord_s_started_a_group_call, describe(joinedMembers.get(0))); : context.getString(R.string.MessageRecord_s_started_a_group_call, describe(joinedMembers.get(0)));
}
} else if (Objects.equals(joinedMembers.get(0), selfAci)) { } else if (Objects.equals(joinedMembers.get(0), selfAci)) {
return withTime ? context.getString(R.string.MessageRecord_you_are_in_the_group_call_s1, time) return withTime ? context.getString(R.string.MessageRecord_you_are_in_the_group_call_s1, time)
: context.getString(R.string.MessageRecord_you_are_in_the_group_call); : context.getString(R.string.MessageRecord_you_are_in_the_group_call);

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

@@ -1484,12 +1484,14 @@
<!-- Group Calling update messages --> <!-- Group Calling update messages -->
<string name="MessageRecord_s_started_a_group_call_s">%1$s started a group call · %2$s</string> <string name="MessageRecord_s_started_a_group_call_s">%1$s started a group call · %2$s</string>
<string name="MessageRecord_you_started_a_group_call_s">You started a group call · %1$s</string>
<string name="MessageRecord_s_is_in_the_group_call_s">%1$s is in the group call · %2$s</string> <string name="MessageRecord_s_is_in_the_group_call_s">%1$s is in the group call · %2$s</string>
<string name="MessageRecord_you_are_in_the_group_call_s1">You are in the group call · %1$s</string> <string name="MessageRecord_you_are_in_the_group_call_s1">You are in the group call · %1$s</string>
<string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s and %2$s are in the group call · %3$s</string> <string name="MessageRecord_s_and_s_are_in_the_group_call_s1">%1$s and %2$s are in the group call · %3$s</string>
<string name="MessageRecord_group_call_s">Group call · %1$s</string> <string name="MessageRecord_group_call_s">Group call · %1$s</string>
<string name="MessageRecord_s_started_a_group_call">%1$s started a group call</string> <string name="MessageRecord_s_started_a_group_call">%1$s started a group call</string>
<string name="MessageRecord_you_started_a_group_call">You started a group call</string>
<string name="MessageRecord_s_is_in_the_group_call">%1$s is in the group call</string> <string name="MessageRecord_s_is_in_the_group_call">%1$s is in the group call</string>
<string name="MessageRecord_you_are_in_the_group_call">You are in the group call</string> <string name="MessageRecord_you_are_in_the_group_call">You are in the group call</string>
<string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s and %2$s are in the group call</string> <string name="MessageRecord_s_and_s_are_in_the_group_call">%1$s and %2$s are in the group call</string>