fix: more i18n changes

_locales/en/messages.json

@@ -300,8 +300,8 @@
   "disappearingMessagesOnlyAdmins": "Only group admins can change this setting.",
   "disappearingMessagesSent": "Sent",
   "disappearingMessagesSet": "<b>{name}</b> has set messages to disappear {time} after they have been {disappearing_messages_type}.",
-  "disappearingMessagesSetYou": "<b>You</b> set messages to disappear {time} after they have been {disappearing_messages_type}.",
   "disappearingMessagesTimer": "Timer",
+  "disappearingMessagesSetYou": "<b>You</b> set messages to disappear {time} after they have been {disappearing_messages_type}.",
   "disappearingMessagesTurnedOff": "<b>{name}</b> has turned disappearing messages off. Messages they send will no longer disappear.",
   "disappearingMessagesTurnedOffYou": "<b>You</b> turned <b>off</b> disappearing messages. Messages you send will no longer disappear.",
   "disappearingMessagesTypeRead": "read",

ts/components/conversation/SubtleNotification.tsx

@@ -96,7 +96,6 @@ export const NoMessageInConversation = () => {
   const isMe = useSelectedIsNoteToSelf();
   const canWrite = useSelector(getSelectedCanWrite);
   const privateBlindedAndBlockingMsgReqs = useSelectedHasDisabledBlindedMsgRequests();
-  // TODOLATER use this selector across the whole application (left pane excluded)
   const name = useSelectedNicknameOrProfileNameOrShortenedPubkey();
 
   const messageText = useMemo(() => {

ts/components/conversation/composition/CompositionBox.tsx

@@ -390,6 +390,13 @@ class CompositionBoxInner extends Component<Props, State> {
   private renderCompositionView() {
     const { showEmojiPanel } = this.state;
     const { typingEnabled } = this.props;
+
+    // we can only send a message if the conversation allows writing in it
+    // - we've got a message body
+    // - or we've got a staged attachments
+    const showSendButton =
+      typingEnabled && (!isEmpty(this.state.draft) || !isEmpty(this.props.stagedAttachments));
+
     /* eslint-disable @typescript-eslint/no-misused-promises */
 
     return (
@@ -432,7 +439,7 @@ class CompositionBoxInner extends Component<Props, State> {
         {typingEnabled && (
           <ToggleEmojiButton ref={this.emojiPanelButton} onClick={this.toggleEmojiPanel} />
         )}
-        {typingEnabled && <SendMessageButton onClick={this.onSendMessage} />}
+        {showSendButton && <SendMessageButton onClick={this.onSendMessage} />}
         {typingEnabled && showEmojiPanel && (
           <StyledEmojiPanelContainer role="button" dir={this.props.htmlDirection}>
             <SessionEmojiPanel
@@ -815,11 +822,10 @@ class CompositionBoxInner extends Component<Props, State> {
       return;
     }
 
-    if (!selectedConversation.isPrivate && selectedConversation.left) {
+    if (
-      ToastUtils.pushYouLeftTheGroup();
+      !selectedConversation.isPrivate &&
-      return;
+      (selectedConversation.left || selectedConversation.isKickedFromGroup)
-    }
+    ) {
-    if (!selectedConversation.isPrivate && selectedConversation.isKickedFromGroup) {
       ToastUtils.pushYouLeftTheGroup();
       return;
     }

ts/components/conversation/message/message-content/MessageReactBar.tsx

@@ -137,7 +137,7 @@ function formatTimeLeft({ timeLeftMs }: { timeLeftMs: number }) {
     const weeks = Math.floor(days / 7);
     const daysLeft = days % 7;
     const extraUnit = daysLeft ? ` ${daysLeft}d` : '';
-    return window.i18n('disappearingMessagesCountdownBig', { time_large: `${weeks}w${extraUnit}` });
+    return window.i18n('', { time_large: `${weeks}w${extraUnit}` });
   }
 
   return '...';

ts/components/conversation/message/message-item/GroupUpdateMessage.tsx

@@ -4,6 +4,10 @@ import {
   PropsForGroupUpdate,
   PropsForGroupUpdateType,
 } from '../../../../state/ducks/conversations';
+import {
+  useSelectedDisplayNameInProfile,
+  useSelectedNicknameOrProfileNameOrShortenedPubkey,
+} from '../../../../state/selectors/selectedConversation';
 import { assertUnreachable } from '../../../../types/sqlSharedTypes';
 import { ExpirableReadableMessage } from './ExpirableReadableMessage';
 import { NotificationBubble } from './notification-bubble/NotificationBubble';
@@ -25,10 +29,10 @@ const ChangeItemKicked = (kicked: Array<string>): string => {
     throw new Error('Group update kicked is missing contacts');
   }
   const names = useConversationsUsernameWithQuoteOrFullPubkey(kicked);
+  const groupName = useSelectedNicknameOrProfileNameOrShortenedPubkey();
 
   if (arrayContainsUsOnly(kicked)) {
-    // TODO - add group name
+    return window.i18n('groupRemovedYou', { group_name: groupName });
-    return window.i18n('groupRemovedYou', { group_name: '' });
   }
 
   // TODO - support bold

ts/components/conversation/message/message-item/InteractionNotification.tsx

@@ -46,9 +46,13 @@ export const InteractionNotification = (props: PropsForInteractionNotification)
       break;
     case ConversationInteractionType.Leave:
       text = isCommunity
-        ? window.i18n('communityLeaveError', { community_name: displayName })
+        ? window.i18n('communityLeaveError', {
+            community_name: displayName || window.i18n('communityUnknown'),
+          })
         : isGroup
-          ? window.i18n('groupLeaveErrorFailed', { group_name: displayName })
+          ? window.i18n('groupLeaveErrorFailed', {
+              group_name: displayName || window.i18n('groupUnknown'),
+            })
           : ''; // we cannot fail to do other actions, so not printing anything
       break;
     default:

ts/components/conversation/message/message-item/MessageRequestResponse.tsx

@@ -1,27 +1,18 @@
-import { useConversationUsername } from '../../../../hooks/useParamSelector';
+import { useNicknameOrProfileNameOrShortenedPubkey } from '../../../../hooks/useParamSelector';
 import { PropsForMessageRequestResponse } from '../../../../models/messageType';
 import { UserUtils } from '../../../../session/utils';
 import { Flex } from '../../../basic/Flex';
-import { SpacerSM, Text } from '../../../basic/Text';
+import { I18n } from '../../../basic/I18n';
+import { SpacerSM, TextWithChildren } from '../../../basic/Text';
 import { ReadableMessage } from './ReadableMessage';
 
 // Note this should not respond to the disappearing message conversation setting so we use the ReadableMessage
 export const MessageRequestResponse = (props: PropsForMessageRequestResponse) => {
   const { messageId, isUnread, receivedAt, conversationId } = props;
 
-  const profileName = useConversationUsername(conversationId);
+  const profileName = useNicknameOrProfileNameOrShortenedPubkey(conversationId);
   const isFromSync = props.source === UserUtils.getOurPubKeyStrFromCache();
 
-  let msgText = '';
-  if (isFromSync) {
-    msgText = window.i18n('messageRequestYouHaveAccepted', {
-      // TODO - check if we can have a better fallback
-      name: profileName ?? '',
-    });
-  } else {
-    msgText = window.i18n('messageRequestsAccepted');
-  }
-
   return (
     <ReadableMessage
       messageId={messageId}
@@ -39,7 +30,18 @@ export const MessageRequestResponse = (props: PropsForMessageRequestResponse) =>
         id={`msg-${messageId}`}
       >
         <SpacerSM />
-        <Text text={msgText} subtle={true} ellipsisOverflow={false} textAlign="center" />
+        <TextWithChildren subtle={true} ellipsisOverflow={false} textAlign="center">
+          {isFromSync ? (
+            <I18n
+              token="messageRequestYouHaveAccepted"
+              args={{
+                name: profileName || window.i18n('unknown'),
+              }}
+            />
+          ) : (
+            <I18n token="messageRequestsAccepted" />
+          )}
+        </TextWithChildren>
       </Flex>
     </ReadableMessage>
   );

ts/components/conversation/message/message-item/notification-bubble/NotificationBubble.tsx

@@ -1,5 +1,6 @@
 import styled from 'styled-components';
 import { SessionIcon, SessionIconType } from '../../../../icon';
+import { SessionHtmlRenderer } from '../../../../basic/SessionHTMLRenderer';
 
 const NotificationBubbleFlex = styled.div`
   display: flex;
@@ -44,7 +45,9 @@ export const NotificationBubble = (props: {
           />
         </NotificationBubbleIconContainer>
       )}
-      <NotificationBubbleText>{notificationText}</NotificationBubbleText>
+      <NotificationBubbleText>
+        <SessionHtmlRenderer html={notificationText} />
+      </NotificationBubbleText>
       {iconType && <NotificationBubbleIconContainer />}
     </NotificationBubbleFlex>
   );

ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx

@@ -264,8 +264,9 @@ export const OverlayRightPanelSettings = () => {
         lastMessage?.interactionStatus === ConversationInteractionStatus.Error
       ? window.i18n('conversationsDelete')
       : isKickedFromGroup
-        ? // TODO - add group name
+        ? window.i18n('groupRemovedYou', {
-          window.i18n('groupRemovedYou', { group_name: '' })
+            group_name: selectedUsername || window.i18n('groupUnknown'),
+          })
         : left
           ? window.i18n('groupMemberYouLeft')
           : window.i18n('groupLeave');

ts/components/dialog/UpdateGroupMembersDialog.tsx

@@ -158,7 +158,7 @@ export const UpdateGroupMembersDialog = (props: Props) => {
 
   const onAdd = (member: string) => {
     if (!weAreAdmin) {
-      ToastUtils.pushOnlyAdminCanRemove();
+      window?.log?.warn('Only group admin can add members!');
       return;
     }
 
@@ -168,8 +168,6 @@ export const UpdateGroupMembersDialog = (props: Props) => {
   const onRemove = (member: string) => {
     if (!weAreAdmin) {
       window?.log?.warn('Only group admin can remove members!');
-
-      ToastUtils.pushOnlyAdminCanRemove();
       return;
     }
     if (convoProps.groupAdmins?.includes(member)) {

ts/components/dialog/UpdateGroupNameDialog.tsx

@@ -98,10 +98,7 @@ export class UpdateGroupNameDialog extends Component<Props, State> {
   public render() {
     const okText = window.i18n('okay');
     const cancelText = window.i18n('cancel');
-    // TODO: String localization - remove
+    const titleText = window.i18n('groupInformationSet');
-    const titleText = window.i18n('updateGroupDialogTitle', {
-      name: this.convo.getRealSessionUsername() ?? window.i18n('unknown'),
-    });
 
     const errorMsg = this.state.errorMessage;
     const isAdmin = !this.convo.isPublic();

ts/components/leftpane/conversation-list-item/InteractionItem.tsx

@@ -59,9 +59,9 @@ export const InteractionItem = (props: InteractionItemProps) => {
   let text = storedLastMessageText || '';
   let errorText = '';
 
-  const name =
+  const name = getConversationController()
-    getConversationController().get(conversationId)?.getNicknameOrRealUsernameOrPlaceholder() ||
+    .get(conversationId)
-    window.i18n('unknown');
+    ?.getNicknameOrRealUsernameOrPlaceholder();
 
   switch (interactionType) {
     case ConversationInteractionType.Hide:
@@ -69,7 +69,9 @@ export const InteractionItem = (props: InteractionItemProps) => {
       break;
     case ConversationInteractionType.Leave:
       errorText = isCommunity
-        ? window.i18n('communityLeaveError', { community_name: name })
+        ? window.i18n('communityLeaveError', {
+            community_name: name || window.i18n('unknown'),
+          })
         : isGroup
           ? window.i18n('groupLeaveErrorFailed', { group_name: name })
           : ''; // this cannot happen

ts/components/settings/SessionNotificationGroupSettings.tsx

@@ -57,10 +57,7 @@ export const SessionNotificationGroupSettings = () => {
     }
     Notifications.addPreviewNotification({
       conversationId: `preview-notification-${Date.now()}`,
-      message:
+      message: items.find(m => m.value === initialNotificationEnabled)?.label || 'Message body',
-        items.find(m => m.value === initialNotificationEnabled)?.label ||
-        window?.i18n?.('messageBody') ||
-        'Message body',
       title: window.i18n('preview'),
       iconUrl: null,
       isExpiringMessage: false,

ts/interactions/conversationInteractions.ts

@@ -276,7 +276,9 @@ export function showLeavePrivateConversationbyConvoId(conversationId: string) {
       title: isMe ? window.i18n('noteToSelfHide') : window.i18n('conversationsDelete'),
       message: isMe
         ? window.i18n('noteToSelfHideDescription')
-        : window.i18n('deleteMessagesDescriptionEveryone'),
+        : window.i18n('conversationsDeleteDescription', {
+            name: conversation.getNicknameOrRealUsernameOrPlaceholder(),
+          }),
       onClickOk,
       okText: isMe ? window.i18n('hide') : window.i18n('delete'),
       okTheme: SessionButtonColor.Danger,

ts/interactions/messageInteractions.ts

@@ -120,7 +120,7 @@ const acceptOpenGroupInvitationV2 = (completeUrl: string, roomName?: string) =>
     updateConfirmModal({
       title: window.i18n('communityJoin'),
       message: window.i18n('communityJoinDescription', {
-        community_name: roomName ?? window.i18n('unknown'),
+        community_name: roomName || window.i18n('unknown'),
       }),
       onClickOk: async () => {
         await joinOpenGroupV2WithUIEvents(completeUrl, true, false);

ts/models/conversation.ts

@@ -1337,6 +1337,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     if (this.isPrivate()) {
       return window.i18n('anonymous');
     }
+    if (this.isPublic()) {
+      return window.i18n('communityUnknown');
+    }
     return window.i18n('unknown');
   }
 

ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts

@@ -96,7 +96,9 @@ async function joinOpenGroupV2(
     if (!conversation) {
       window?.log?.warn('Failed to join open group v2');
       // TODO - Check that this is the room name
-      throw new Error(window.i18n('groupErrorJoin', { group_name: roomId }));
+      throw new Error(
+        window.i18n('communityJoinError', { community_name: roomId || window.i18n('unknown') })
+      );
     }
 
     // here we managed to connect to the group.
@@ -182,12 +184,18 @@ export async function joinOpenGroupV2WithUIEvents(
     if (showToasts) {
       // TODO - Check that this is the room name
       ToastUtils.pushToastError(
-        'connectToServerFail',
+        'communityJoinError',
-        window.i18n('groupErrorJoin', { group_name: parsedRoom.roomId })
+        window.i18n('communityJoinError', {
+          community_name: parsedRoom.roomId || window.i18n('unknown'),
+        })
       );
     }
     if (errorHandler) {
-      errorHandler(window.i18n('groupErrorJoin', { group_name: parsedRoom.roomId }));
+      errorHandler(
+        window.i18n('communityJoinError', {
+          community_name: parsedRoom.roomId || window.i18n('unknown'),
+        })
+      );
     }
 
     uiCallback?.({ loadingState: 'failed', conversationKey: conversationID });
@@ -196,12 +204,14 @@ export async function joinOpenGroupV2WithUIEvents(
     if (showToasts) {
       // TODO - Check that this is the room name
       ToastUtils.pushToastError(
-        'connectToServerFail',
+        'communityJoinError',
-        window.i18n('groupErrorJoin', { group_name: 'unknown' })
+        window.i18n('communityJoinError', { community_name: window.i18n('unknown') })
       );
     }
     if (errorHandler) {
-      errorHandler(window.i18n('groupErrorJoin', { group_name: completeUrl })); // we don't have a parsed room, so let's show the whole url in this case
+      errorHandler(
+        window.i18n('communityJoinError', { community_name: window.i18n('unknown') })
+      ); // we don't have a parsed room, so let's show the whole url in this case
     }
     uiCallback?.({ loadingState: 'failed', conversationKey: null });
   }

ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts

@@ -224,7 +224,6 @@ export class OpenGroupManagerV2 {
     } catch (e) {
       window?.log?.warn('Failed to join open group v2', e.message);
       await OpenGroupData.removeV2OpenGroupRoom(conversationId);
-      // throw new Error(window.i18n('connectToServerFail'));
       return undefined;
     }
   }

ts/session/conversations/createClosedGroup.ts

@@ -169,7 +169,7 @@ async function sendToGroupMembers(
 
   window.inboxStore?.dispatch(
     updateConfirmModal({
-      title: window.i18n('groupInviteFailed'),
+      title: window.i18n('groupError'),
       message,
       okText: window.i18n('resend'),
       onClickOk: async () => {

ts/session/utils/Toast.tsx

@@ -139,9 +139,6 @@ export function pushedMissedCallCauseOfPermission(conversationName: string) {
   );
 }
 
-export function pushedMissedCallNotApproved(name: string) {
-  pushToastInfo('missedCall', window.i18n('callsMissedCallFrom', { name }));
-}
 
 export function pushVideoCallPermissionNeeded() {
   pushToastInfo(
@@ -193,10 +190,6 @@ export function pushCannotRemoveCreatorFromGroup() {
   pushToastWarning('cannotRemoveCreatorFromGroup', window.i18n('adminCannotBeRemoved'));
 }
 
-export function pushOnlyAdminCanRemove() {
-  pushToastInfo('onlyAdminCanRemoveMembers', window.i18n('onlyAdminCanRemoveMembersDesc'));
-}
-
 export function pushFailedToAddAsModerator() {
   pushToastWarning('failedToAddAsModerator', window.i18n('adminPromotionFailed'));
 }

ts/session/utils/calling/CallManager.ts

@@ -1296,7 +1296,7 @@ export async function handleMissedCall(
       ToastUtils.pushedMissedCall(displayname);
       break;
     case 'not-approved':
-      ToastUtils.pushedMissedCallNotApproved(displayname);
+      // no toast for this case
       break;
     case 'too-old-timestamp':
       // no toast for this case, the missed call notification is enough
@@ -1304,7 +1304,9 @@ export async function handleMissedCall(
     default:
   }
 
-  await addMissedCallMessage(sender, incomingOfferTimestamp, details);
+  if (reason !== 'not-approved') {
+    await addMissedCallMessage(sender, incomingOfferTimestamp, details);
+  }
 }
 
 async function addMissedCallMessage(