refactor: remove translation function generics after merge

Author: MartinCupela

src/components/Message/MessageThreadReplyInChannelButtonIndicator.tsx

@@ -29,7 +29,7 @@ export const MessageThreadReplyInChannelButtonIndicator = () => {
       })
       .catch((error: Error) => {
         client.notifications.addError({
-          message: t<string>('Thread has not been found'),
+          message: t('Thread has not been found'),
           options: {
             originalError: error,
             type: 'api:message:search:not-found',
@@ -79,7 +79,7 @@ export const MessageThreadReplyInChannelButtonIndicator = () => {
         }}
         type='button'
       >
-        {t<string>('Thread reply')}
+        {t('Thread reply')}
       </button>
     </div>
   );

src/components/Message/ReminderNotification.tsx

@@ -26,19 +26,19 @@ export const ReminderNotification = ({ reminder }: ReminderNotificationProps) =>
 
   return (
     <p className='str-chat__message-reminder'>
-      <span>{t<string>('Saved for later')}</span>
+      <span>{t('Saved for later')}</span>
       {reminder?.remindAt && timeLeftMs !== null && (
         <>
           <span> | </span>
           <span>
             {isBehindRefreshBoundary
-              ? t<string>('Due since {{ dueSince }}', {
-                  dueSince: t<string>(`timestamp/ReminderNotification`, {
+              ? t('Due since {{ dueSince }}', {
+                  dueSince: t(`timestamp/ReminderNotification`, {
                     timestamp: reminder.remindAt,
                   }),
                 })
-              : t<string>(`Due {{ timeLeft }}`, {
-                  timeLeft: t<string>('duration/Message reminder', {
+              : t(`Due {{ timeLeft }}`, {
+                  timeLeft: t('duration/Message reminder', {
                     milliseconds: timeLeftMs,
                   }),
                 })}

src/components/MessageActions/MessageActionsBox.tsx

@@ -176,7 +176,7 @@ const UnMemoizedMessageActionsBox = (props: MessageActionsBoxProps) => {
             }
             role='option'
           >
-            {reminder ? t<string>('Remove reminder') : t<string>('Save for later')}
+            {reminder ? t('Remove reminder') : t('Save for later')}
           </button>
         )}
       </div>

src/components/MessageActions/RemindMeSubmenu.tsx

@@ -16,7 +16,7 @@ export const RemindMeActionButton = ({
       placement={isMine ? 'left-start' : 'right-start'}
       Submenu={RemindMeSubmenu}
     >
-      {t<string>('Remind Me')}
+      {t('Remind Me')}
     </ButtonWithSubmenu>
   );
 };
@@ -42,7 +42,7 @@ export const RemindMeSubmenu = () => {
             });
           }}
         >
-          {t<string>('duration/Remind Me', { milliseconds: offsetMs })}
+          {t('duration/Remind Me', { milliseconds: offsetMs })}
         </button>
       ))}
       {/* todo: potential improvement to add a custom option that would trigger rendering modal with custom date picker - we need date picker */}

src/components/MessageInput/SendToChannelCheckbox.tsx

@@ -26,8 +26,8 @@ export const SendToChannelCheckbox = () => {
         />
         <label htmlFor='send-to-channel-checkbox'>
           {Object.keys(messageComposer.channel.state.members).length === 2
-            ? t<string>('Also send as a direct message')
-            : t<string>('Also send in channel')}
+            ? t('Also send as a direct message')
+            : t('Also send in channel')}
         </label>
       </div>
     </div>

src/experimental/MessageActions/defaults.tsx

@@ -137,7 +137,7 @@ const DefaultMessageActionComponents = {
               : client.reminders.createReminder({ messageId: message.id })
           }
         >
-          {reminder ? t<string>('Remove reminder') : t<string>('Save for later')}
+          {reminder ? t('Remove reminder') : t('Save for later')}
         </DefaultDropdownActionButton>
       );
     },

src/i18n/TranslationBuilder/notifications/NotificationTranslationTopic.ts

@@ -30,7 +30,7 @@ export class NotificationTranslationTopic extends TranslationTopic<NotificationT
   translate = (value: string, key: string, options: { notification?: Notification }) => {
     const { notification } = options;
     if (!notification) return value;
-    const translator = notification.code && this.translators.get(notification.code);
+    const translator = notification.type && this.translators.get(notification.type);
     if (!translator) return value;
     return translator({ key, options, t: this.i18next.t, value }) || value;
   };

src/i18n/__tests__/NotificationTranslationBuilder.test.js

@@ -45,10 +45,10 @@ describe('NotificationTranslationTopic', () => {
       translatedString,
     );
 
-    notification = { code: 'validation:attachment:upload:blocked' };
+    notification = { type: 'validation:attachment:upload:blocked' };
     expect(builder.translate(translatedString, key, { notification })).toBe('blocked');
 
-    notification = { code: 'api:attachment:upload:failed' };
+    notification = { type: 'api:attachment:upload:failed' };
     expect(builder.translate(translatedString, key, { notification })).toBe('failed');
   });
 });

src/i18n/de.json

@@ -181,7 +181,8 @@
   "aria/Stop AI Generation": "KI-Generierung stoppen",
   "ban-command-args": "[@Benutzername] [Text]",
   "ban-command-description": "Einen Benutzer verbannen",
-  "duration/Remind Me": "duration/Remind Me",
+  "duration/Message reminder": "{{ milliseconds | durationFormatter(withSuffix: true) }}",
+  "duration/Remind Me": "{{ milliseconds | durationFormatter(withSuffix: true) }}",
   "giphy-command-args": "[Text]",
   "giphy-command-description": "Poste ein zufälliges Gif in den Kanal",
   "live": "live",

src/i18n/es.json

@@ -184,7 +184,8 @@
   "aria/Stop AI Generation": "Detener generación de IA",
   "ban-command-args": "[@usuario] [texto]",
   "ban-command-description": "Prohibir a un usuario",
-  "duration/Remind Me": "duration/Remind Me",
+  "duration/Message reminder": "{{ milliseconds | durationFormatter(withSuffix: true) }}",
+  "duration/Remind Me": "{{ milliseconds | durationFormatter(withSuffix: true) }}",
   "giphy-command-args": "[texto]",
   "giphy-command-description": "Publicar un gif aleatorio en el canal",
   "live": "En vivo",