mirror of
https://github.com/oxen-io/session-android.git
synced 2025-12-23 04:06:19 +00:00
Addressed many aspects of PR feedback + misc. strings issues
This commit is contained in:
alansley
@@ -35,7 +35,6 @@ object UpdateMessageBuilder {
|
||||
?.displayName(Contact.ContactContext.REGULAR)
|
||||
?: truncateIdForDisplay(senderId)
|
||||
|
||||
//@RequiresApi(Build.VERSION_CODES.P)
|
||||
fun buildGroupUpdateMessage(context: Context, updateMessageData: UpdateMessageData, senderId: String? = null, isOutgoing: Boolean = false): CharSequence {
|
||||
val updateData = updateMessageData.kind
|
||||
if (updateData == null || !isOutgoing && senderId == null) return ""
|
||||
@@ -71,7 +70,7 @@ object UpdateMessageBuilder {
|
||||
|
||||
val newMemberCount = updateData.updatedMembers.size
|
||||
|
||||
// We previously differentiated between members added by us Vs. members added by someone
|
||||
// Note: We previously differentiated between members added by us Vs. members added by someone
|
||||
// else via checking against `isOutgoing` - but now we use the same strings regardless.
|
||||
when (newMemberCount) {
|
||||
0 -> {
|
||||
@@ -126,7 +125,7 @@ object UpdateMessageBuilder {
|
||||
.put(NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(0)))
|
||||
.put(OTHER_NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(1)))
|
||||
.format()
|
||||
else -> Phrase.from(context, R.string.groupRemovedMore)
|
||||
else -> Phrase.from(context, R.string.groupRemovedMultiple)
|
||||
.put(NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(0)))
|
||||
.put(COUNT_KEY, updateData.updatedMembers.size - 1)
|
||||
.format()
|
||||
@@ -150,7 +149,7 @@ object UpdateMessageBuilder {
|
||||
.put(NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(0)))
|
||||
.put(OTHER_NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(1)))
|
||||
.format()
|
||||
else -> Phrase.from(context, R.string.groupRemovedMore)
|
||||
else -> Phrase.from(context, R.string.groupRemovedMultiple)
|
||||
.put(NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(0)))
|
||||
.put(COUNT_KEY, updateData.updatedMembers.size - 1)
|
||||
.format()
|
||||
@@ -175,7 +174,7 @@ object UpdateMessageBuilder {
|
||||
.put(NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(0)))
|
||||
.put(OTHER_NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(1)))
|
||||
.format()
|
||||
else -> Phrase.from(context, R.string.groupMemberLeftMore)
|
||||
else -> Phrase.from(context, R.string.groupMemberLeftMultiple)
|
||||
.put(NAME_KEY, getSenderName(updateData.updatedMembers.elementAt(0)))
|
||||
.put(COUNT_KEY, updateData.updatedMembers.size - 1)
|
||||
.format()
|
||||
|
||||
@@ -32,8 +32,8 @@ NOTE: Strings with blank lines have manually been replaced with '\n\n' - this wi
|
||||
<string name="adminPromotedToAdmin"><b>{name}</b> was promoted to Admin.</string>
|
||||
<string name="adminPromotionFailed">Admin promotion failed</string>
|
||||
<string name="adminPromotionFailedDescription">Failed to promote {name} in {group_name}</string>
|
||||
<string name="adminPromotionFailedDescriptionMany">Failed to promote {name} and {count} others in {group_name}</string>
|
||||
<string name="adminPromotionFailedDescriptionMore">Failed to promote {name} and {other_name} in {group_name}</string>
|
||||
<string name="adminPromotionFailedDescriptionMultiple">Failed to promote {name} and {count} others in {group_name}</string>
|
||||
<string name="adminPromotionFailedDescriptionTwo">Failed to promote {name} and {other_name} in {group_name}</string>
|
||||
<string name="adminPromotionSent">Admin promotion sent</string>
|
||||
<string name="adminRemove">Remove Admins</string>
|
||||
<string name="adminRemoveAsAdmin">Remove as Admin</string>
|
||||
@@ -198,6 +198,8 @@ NOTE: Strings with blank lines have manually been replaced with '\n\n' - this wi
|
||||
<string name="clearMessagesNoteToSelfDescription">Are you sure you want to clear all Note to Self messages from your device?</string>
|
||||
<string name="close">Close</string>
|
||||
<string name="closeWindow">Close Window</string>
|
||||
<string name="communityBanDescription">This will ban the selected user from this Community. Are you sure you want to continue?</string>
|
||||
<string name="communityBanDeleteDescription">This will ban the selected user from this Community and delete all their messages. Are you sure you want to continue?</string>
|
||||
<string name="communityEnterUrl">Enter Community URL</string>
|
||||
<string name="communityEnterUrlErrorInvalid">Invalid URL</string>
|
||||
<string name="communityEnterUrlErrorInvalidDescription">Please check the Community URL and try again.</string>
|
||||
@@ -363,14 +365,6 @@ NOTE: Strings with blank lines have manually been replaced with '\n\n' - this wi
|
||||
<item quantity="one">And %1$d other has reacted %2$s to this message.</item>
|
||||
<item quantity="other">And %1$d others have reacted %2$s to this message.</item>
|
||||
</plurals>
|
||||
<string name="emojiReactsHoverNameDesktop">{name} reacted with <emoji/></string>
|
||||
<string name="emojiReactsHoverTwoNameDesktop">{name} and {other_name} reacted with <emoji/></string>
|
||||
<string name="emojiReactsHoverTwoNameMultipleDesktop">{name}, {other_name} and <span>{count} others</span> reacted with <emoji/></string>
|
||||
<string name="emojiReactsHoverTwoNameOneDesktop">{name}, {other_name} and <span>1 other</span> reacted with <emoji/></string>
|
||||
<string name="emojiReactsHoverYouDesktop">You reacted with <emoji/></string>
|
||||
<string name="emojiReactsHoverYouNameDesktop">You and {name} reacted with <emoji/></string>
|
||||
<string name="emojiReactsHoverYouNameMultipleDesktop">You, {name} and <span>{count} others</span> reacted with <emoji/></string>
|
||||
<string name="emojiReactsHoverYouNameOneDesktop">You, {name} and <span>1 other</span> reacted with <emoji/></string>
|
||||
<string name="emojiReactsNotification">Reacted to your message {emoji}</string>
|
||||
<string name="enable">Enable</string>
|
||||
<string name="errorConnection">Please check your internet connection and try again.</string>
|
||||
@@ -416,14 +410,14 @@ NOTE: Strings with blank lines have manually been replaced with '\n\n' - this wi
|
||||
<string name="groupLeaveErrorFailed">Failed to leave {group_name}</string>
|
||||
<string name="groupLegacyBanner">Groups have been upgraded, create a new group to upgrade. Old group functionality will be degraded from {date}.</string>
|
||||
<string name="groupMemberLeft"><b>{name}</b> left the group.</string>
|
||||
<string name="groupMemberLeftMore"><b>{name}</b> and <b>{count} others</b> left the group.</string>
|
||||
<string name="groupMemberLeftMultiple"><b>{name}</b> and <b>{count} others</b> left the group.</string>
|
||||
<string name="groupMemberLeftTwo"><b>{name}</b> and <b>{other_name}</b> left the group.</string>
|
||||
<string name="groupMemberMoreNew"><b>{name}</b> and <b>{count} others</b> joined the group.</string>
|
||||
<string name="groupMemberNew"><b>{name}</b> was invited to join the group.</string>
|
||||
<string name="groupMemberNew"><b>{name}</b> joined the group.</string>
|
||||
<string name="groupMemberNewHistory"><b>{name}</b> was invited to join the group. Chat history was shared.</string>
|
||||
<string name="groupMemberNewHistoryMultiple"><b>{name}</b> and <b>{count} others</b> were invited to join the group. Chat history was shared.</string>
|
||||
<string name="groupMemberNewHistoryTwo"><b>{name}</b> and <b>{other_name}</b> were invited to join the group. Chat history was shared.</string>
|
||||
<string name="groupMemberNewMultiple"><b>{name}</b> and <b>{count} others</b> were invited to join the group.</string>
|
||||
<string name="groupMemberNewMultiple"><b>{name}</b> and <b>{count} others</b> joined the group.</string>
|
||||
<string name="groupMemberNewTwo"><b>{name}</b> and <b>{other_name}</b> were invited to join the group.</string>
|
||||
<string name="groupMemberNewYouHistory"><b>{name}</b> was invited to join the group. Chat history was shared.</string>
|
||||
<string name="groupMemberNewYouHistoryMultiple"><b>You</b> and <b>{count} others</b> were invited to join the group. Chat history was shared.</string>
|
||||
@@ -449,14 +443,15 @@ NOTE: Strings with blank lines have manually been replaced with '\n\n' - this wi
|
||||
<string name="groupPromotedYouMultiple"><b>You</b> and <b>{count} others</b> were promoted to Admin.</string>
|
||||
<string name="groupPromotedYouTwo"><b>You</b> and <b>{name}</b> were promoted to Admin.</string>
|
||||
<string name="groupRemoveDescription">Would you like to remove <b>{name}</b> from <b>{group_name}</b>?</string>
|
||||
<string name="groupRemoveDescriptionTwo">Would you like to remove <b>{name}</b> and <b>{other_name}</b> from <b>{group_name}</b>?</string>
|
||||
<string name="groupRemoveMessages">Remove user and their messages</string>
|
||||
<string name="groupRemoveMoreDescription">Would you like to remove <b>{name}</b> and <b>{count} others</b> from <b>{group_name}</b>?</string>
|
||||
<string name="groupRemoveDescriptionMultiple">Would you like to remove <b>{name}</b> and <b>{count} others</b> from <b>{group_name}</b>?</string>
|
||||
<string name="groupRemoveTwoDescription">Would you like to remove <b>{name}</b> and <b>{other_name}</b> from <b>{group_name}</b>?</string>
|
||||
<string name="groupRemoveUserOnly">Remove user </string>
|
||||
<string name="groupRemoveUsersMessages">Remove users and their messages</string>
|
||||
<string name="groupRemoveUsersOnly">Remove users</string>
|
||||
<string name="groupRemoved"><b>{name}</b> was removed from the group.</string>
|
||||
<string name="groupRemovedMore"><b>{name}</b> and <b>{count} others</b> were removed from the group.</string>
|
||||
<string name="groupRemovedMultiple"><b>{name}</b> and <b>{count} others</b> were removed from the group.</string>
|
||||
<string name="groupRemovedTwo"><b>{name}</b> and <b>{other_name}</b> were removed from the group.</string>
|
||||
<string name="groupRemovedYou">You were removed from <b>{group_name}</b>.</string>
|
||||
<string name="groupRemovedYouMultiple"><b>You</b> and <b>{count} others</b> were removed from the group.</string>
|
||||
@@ -501,7 +496,6 @@ NOTE: Strings with blank lines have manually been replaced with '\n\n' - this wi
|
||||
<string name="loading">Loading...</string>
|
||||
<string name="lockApp">Lock App</string>
|
||||
<string name="lockAppDescription">Require fingerprint, PIN, pattern or password to unlock {app_name}.</string>
|
||||
<string name="lockAppDescriptionIos">Require Touch ID, Face ID or your passcode to unlock {app_name}.</string>
|
||||
<string name="lockAppEnablePasscode">You must enable a passcode in your iOS Settings in order to use Screen Lock.</string>
|
||||
<string name="lockAppLocked">{app_name} is locked</string>
|
||||
<string name="lockAppQuickResponse">Quick response unavailable when {app_name} is locked!</string>
|
||||
@@ -526,7 +520,7 @@ NOTE: Strings with blank lines have manually been replaced with '\n\n' - this wi
|
||||
<string name="membersInviteShareMessageHistory">Share message history</string>
|
||||
<string name="membersInviteShareMoreDescription">Would you like to share group message history with <b>{name}</b> and <b>{count} others</b>?</string>
|
||||
<string name="membersInviteShareNewMessagesOnly">Share new messages only</string>
|
||||
<string name="membersInviteShareTwoDescription">Would you like to share group message history with <b>{name}</b> and <b>{other_name}</b>?</string>
|
||||
<string name="membersInviteShareDescriptionTwo">Would you like to share group message history with <b>{name}</b> and <b>{other_name}</b>?</string>
|
||||
<string name="membersInviteTitle">Invite</string>
|
||||
<string name="message">Message</string>
|
||||
<string name="messageEmpty">This message is empty.</string>
|
||||
@@ -592,7 +586,6 @@ NOTE: Strings with blank lines have manually been replaced with '\n\n' - this wi
|
||||
<string name="notificationsContentShowNoNameOrContent">No Name or Content</string>
|
||||
<string name="notificationsFastMode">Fast Mode</string>
|
||||
<string name="notificationsFastModeDescription">You\'ll be notified of new messages reliably and immediately using Google\'s notification Servers.</string>
|
||||
<string name="notificationsFastModeDescriptionIos">You\'ll be notified of new messages reliably and immediately using Apple\'s notification Servers.</string>
|
||||
<string name="notificationsGoToDevice">Go to device notification settings</string>
|
||||
<string name="notificationsIosGroup">{name} to {conversation_name}</string>
|
||||
<string name="notificationsIosRestart">You may have received messages while your {device} was restarting.</string>
|
||||
@@ -759,6 +752,7 @@ NOTE: Strings with blank lines have manually been replaced with '\n\n' - this wi
|
||||
<string name="sessionHelp">Help</string>
|
||||
<string name="sessionInviteAFriend">Invite a Friend</string>
|
||||
<string name="sessionMessageRequests">Message Requests</string>
|
||||
<string name="sessionNetworkSent">{token_name_long} ({<span>{token_name_short}</span>)</string>
|
||||
<string name="sessionNotifications">Notifications</string>
|
||||
<string name="sessionPermissions">Permissions</string>
|
||||
<string name="sessionPrivacy">Privacy</string>
|
||||
|
||||
Reference in New Issue
Block a user