Refer to yourself as 'you' in reactions and group membership.

signalapp · Feb 26, 2020 · fda8f3e · fda8f3e
1 parent 9e5f64c
commit fda8f3e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java b/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java
@@ -102,7 +102,7 @@ public String[] getRecipientStrings() {
 
       for (Recipient recipient : members) {
         if (recipient.isLocalNumber()) {
-          recipientStrings.add(context.getString(R.string.GroupMembersDialog_me));
+          recipientStrings.add(context.getString(R.string.GroupMembersDialog_you));
         } else {
           String name = getRecipientName(recipient);
           recipientStrings.add(name);

diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
@@ -60,13 +60,14 @@ public ViewHolder(@NonNull View itemView) {
     }
 
     void bind(@NonNull Reaction reaction) {
-      this.recipient.setText(reaction.getSender().getDisplayName(itemView.getContext()));
       this.emoji.setText(reaction.getEmoji());
 
       if (reaction.getSender().isLocalNumber()) {
+        this.recipient.setText(R.string.ReactionsRecipientAdapter_you);
         this.avatar.setAvatar(GlideApp.with(avatar), null, false);
         AvatarUtil.loadIconIntoImageView(reaction.getSender(), avatar);
       } else {
+        this.recipient.setText(reaction.getSender().getDisplayName(itemView.getContext()));
         this.avatar.setAvatar(GlideApp.with(avatar), reaction.getSender(), false);
       }
     }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -448,7 +448,7 @@
     <string name="GroupShareProfileView_make_visible">Make visible</string>
 
     <!-- GroupMembersDialog -->
-    <string name="GroupMembersDialog_me">Me</string>
+    <string name="GroupMembersDialog_you">You</string>
 
     <!-- CropImageActivity -->
     <string name="CropImageActivity_group_avatar">Group avatar</string>
@@ -680,6 +680,9 @@
     <!-- ReactionsConversationView -->
     <string name="ReactionsConversationView_plus">+%1$d</string>
 
+    <!-- ReactionsRecipientAdapter -->
+    <string name="ReactionsRecipientAdapter_you">You</string>
+
     <!-- RecipientPreferencesActivity -->
     <string name="RecipientPreferenceActivity_block_this_contact_question">Block this contact?</string>
     <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact">You will no longer receive messages and calls from this contact.</string>