Ignore long string

matrix-org · Dec 15, 2021 · a4c3601 · a4c3601
1 parent de661a6
commit a4c3601
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
@@ -302,6 +302,7 @@ export const Commands = [
                             // otherwise the rageshake error messages will be
                             // translated too
                             _t(
+                                // eslint-disable-next-line max-len
                                 'We were unable to understand the given date (%(inputDate)s). Try using the format YYYY-MM-DD.',
                                 { inputDate: args },
                             ),

diff --git a/src/components/views/rooms/SendMessageComposer.tsx b/src/components/views/rooms/SendMessageComposer.tsx
@@ -40,7 +40,7 @@ import { findEditableEvent } from '../../../utils/EventUtils';
 import SendHistoryManager from "../../../SendHistoryManager";
 import { Command, CommandCategories, getCommand } from '../../../SlashCommands';
 import Modal from '../../../Modal';
-import { _t, _td } from '../../../languageHandler';
+import { _t, _td, newTranslatableError } from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
 import { withMatrixClientHOC, MatrixClientProps } from "../../../contexts/MatrixClientContext";
 import { Action } from "../../../dispatcher/actions";
@@ -378,6 +378,10 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
             let errText;
             if (typeof error === 'string') {
                 errText = error;
+            }
+            // Check for translatable errors
+            else if(error.translatedMessage) {
+                errText = error.translatedMessage
             } else if (error.message) {
                 errText = error.message;
             } else {

diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
@@ -51,9 +51,9 @@ interface ITranslatableError extends Error {
  * @param {string} message Message to translate.
  * @returns {Error} The constructed error.
  */
-export function newTranslatableError(message: string) {
+export function newTranslatableError(message: string, variables?: IVariables): ITranslatableError {
     const error = new Error(message) as ITranslatableError;
-    error.translatedMessage = _t(message);
+    error.translatedMessage = _t(message, variables);
     return error;
 }