From 0608b039712c064d4af14a9fb916644a61497787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michae=CC=88l=20De=20Boey?= <info@michaeldeboey.be>
Date: Fri, 25 Oct 2024 14:50:47 +0200
Subject: [PATCH 1/2] [Refactor] use `messageId` instead of `message`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michaël De Boey <info@michaeldeboey.be>
Co-authored-by: Jordan Harband <ljharb@gmail.com>
---
 __tests__/src/rules/alt-text-test.js          | 23 +++++------
 .../src/rules/anchor-has-content-test.js      |  2 +-
 ...aria-activedescendant-has-tabindex-test.js |  2 +-
 __tests__/src/rules/aria-props-test.js        | 10 +++--
 __tests__/src/rules/aria-proptypes-test.js    | 25 ++----------
 __tests__/src/rules/aria-role-test.js         |  2 +-
 .../rules/aria-unsupported-elements-test.js   |  4 +-
 .../src/rules/autocomplete-valid-test.js      |  6 ++-
 .../click-events-have-key-events-test.js      |  4 +-
 .../src/rules/heading-has-content-test.js     |  2 +-
 __tests__/src/rules/html-has-lang-test.js     |  2 +-
 __tests__/src/rules/iframe-has-title-test.js  |  2 +-
 __tests__/src/rules/img-redundant-alt-test.js |  2 +-
 __tests__/src/rules/lang-test.js              |  2 +-
 __tests__/src/rules/no-access-key-test.js     |  2 +-
 .../rules/no-aria-hidden-on-focusable-test.js |  2 +-
 __tests__/src/rules/no-autofocus-test.js      |  2 +-
 .../src/rules/no-distracting-elements-test.js |  3 +-
 .../src/rules/prefer-tag-over-role-test.js    |  3 +-
 .../role-has-required-aria-props-test.js      |  3 +-
 .../rules/role-supports-aria-props-test.js    | 11 +-----
 __tests__/src/rules/scope-test.js             |  2 +-
 .../src/rules/tabindex-no-positive-test.js    |  2 +-
 src/rules/alt-text.js                         | 36 ++++++++++++-----
 src/rules/anchor-has-content.js               |  7 ++--
 .../aria-activedescendant-has-tabindex.js     |  7 ++--
 src/rules/aria-props.js                       | 25 ++++++------
 src/rules/aria-proptypes.js                   | 39 ++++++++-----------
 src/rules/aria-role.js                        |  7 ++--
 src/rules/aria-unsupported-elements.js        | 13 ++++---
 src/rules/autocomplete-valid.js               |  8 +++-
 src/rules/click-events-have-key-events.js     |  7 ++--
 src/rules/heading-has-content.js              |  7 ++--
 src/rules/html-has-lang.js                    |  7 ++--
 src/rules/iframe-has-title.js                 |  7 ++--
 src/rules/img-redundant-alt.js                |  7 ++--
 src/rules/lang.js                             |  9 +++--
 src/rules/no-access-key.js                    |  7 ++--
 src/rules/no-aria-hidden-on-focusable.js      |  5 ++-
 src/rules/no-autofocus.js                     |  7 ++--
 src/rules/no-distracting-elements.js          | 12 +++---
 src/rules/prefer-tag-over-role.js             |  7 ++--
 src/rules/role-has-required-aria-props.js     | 13 ++++---
 src/rules/role-supports-aria-props.js         | 19 ++++-----
 src/rules/scope.js                            |  7 ++--
 src/rules/tabindex-no-positive.js             |  7 ++--
 46 files changed, 205 insertions(+), 183 deletions(-)

diff --git a/__tests__/src/rules/alt-text-test.js b/__tests__/src/rules/alt-text-test.js
index 24e36e23d..31b15b71c 100644
--- a/__tests__/src/rules/alt-text-test.js
+++ b/__tests__/src/rules/alt-text-test.js
@@ -18,39 +18,40 @@ import rule from '../../../src/rules/alt-text';
 
 const ruleTester = new RuleTester();
 
-const missingPropError = (type) => ({
-  message: `${type} elements must have an alt prop, either with meaningful text, or an empty string for decorative images.`,
+const missingPropError = (nodeType) => ({
+  messageId: 'img-no-alt',
+  data: { nodeType },
   type: 'JSXOpeningElement',
 });
 
-const altValueError = (type) => ({
-  message: `Invalid alt value for ${type}. \
-Use alt="" for presentational images.`,
+const altValueError = (nodeType) => ({
+  messageId: 'img-invalid-alt',
+  data: { nodeType },
   type: 'JSXOpeningElement',
 });
 
 const ariaLabelValueError = {
-  message: 'The aria-label attribute must have a value. The alt attribute is preferred over aria-label for images.',
+  messageId: 'img-no-aria-label-value',
 };
 const ariaLabelledbyValueError = {
-  message: 'The aria-labelledby attribute must have a value. The alt attribute is preferred over aria-labelledby for images.',
+  messageId: 'img-no-aria-labelledby-value',
 };
 
 const preferAltError = () => ({
-  message: 'Prefer alt="" over a presentational role. First rule of aria is to not use aria if it can be achieved via native HTML.',
+  messageId: 'img-presentation-role',
   type: 'JSXOpeningElement',
 });
 
 const objectError = {
-  message: 'Embedded <object> elements must have alternative text by providing inner text, aria-label or aria-labelledby props.',
+  messageId: 'object',
 };
 
 const areaError = {
-  message: 'Each area of an image map must have a text alternative through the `alt`, `aria-label`, or `aria-labelledby` prop.',
+  messageId: 'area',
 };
 
 const inputImageError = {
-  message: '<input> elements with type="image" must have a text alternative through the `alt`, `aria-label`, or `aria-labelledby` prop.',
+  messageId: 'input-image',
 };
 
 const componentsSettings = {
diff --git a/__tests__/src/rules/anchor-has-content-test.js b/__tests__/src/rules/anchor-has-content-test.js
index c55dbb9fb..b5680b76b 100644
--- a/__tests__/src/rules/anchor-has-content-test.js
+++ b/__tests__/src/rules/anchor-has-content-test.js
@@ -19,7 +19,7 @@ import rule from '../../../src/rules/anchor-has-content';
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: 'Anchors must have content and the content must be accessible by a screen reader.',
+  messageId: 'error',
   type: 'JSXOpeningElement',
 };
 
diff --git a/__tests__/src/rules/aria-activedescendant-has-tabindex-test.js b/__tests__/src/rules/aria-activedescendant-has-tabindex-test.js
index 5310ac9ac..2368b6d63 100644
--- a/__tests__/src/rules/aria-activedescendant-has-tabindex-test.js
+++ b/__tests__/src/rules/aria-activedescendant-has-tabindex-test.js
@@ -19,7 +19,7 @@ import rule from '../../../src/rules/aria-activedescendant-has-tabindex';
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: 'An element that manages focus with `aria-activedescendant` must have a tabindex',
+  messageId: 'error',
   type: 'JSXOpeningElement',
 };
 
diff --git a/__tests__/src/rules/aria-props-test.js b/__tests__/src/rules/aria-props-test.js
index 1236fa7c7..71c26d363 100644
--- a/__tests__/src/rules/aria-props-test.js
+++ b/__tests__/src/rules/aria-props-test.js
@@ -23,18 +23,22 @@ const ariaAttributes = [...aria.keys()];
 
 const errorMessage = (name) => {
   const suggestions = getSuggestion(name, ariaAttributes);
-  const message = `${name}: This attribute is an invalid ARIA attribute.`;
 
   if (suggestions.length > 0) {
     return {
       type: 'JSXAttribute',
-      message: `${message} Did you mean to use ${suggestions}?`,
+      messageId: 'error-with-suggestions',
+      data: {
+        name,
+        suggestions,
+      },
     };
   }
 
   return {
     type: 'JSXAttribute',
-    message,
+    messageId: 'error',
+    data: { name },
   };
 };
 
diff --git a/__tests__/src/rules/aria-proptypes-test.js b/__tests__/src/rules/aria-proptypes-test.js
index 851cd7b30..b6dfc7d75 100644
--- a/__tests__/src/rules/aria-proptypes-test.js
+++ b/__tests__/src/rules/aria-proptypes-test.js
@@ -29,27 +29,10 @@ const errorMessage = (name) => {
     values: permittedValues,
   } = aria.get(name.toLowerCase());
 
-  switch (type) {
-    case 'tristate':
-      return { message: `The value for ${name} must be a boolean or the string "mixed".` };
-    case 'token':
-      return { message: `The value for ${name} must be a single token from the following: ${permittedValues}.` };
-    case 'tokenlist':
-      return {
-        message: `The value for ${name} must be a list of one or more \
-tokens from the following: ${permittedValues}.`,
-      };
-    case 'idlist':
-      return { message: `The value for ${name} must be a list of strings that represent DOM element IDs (idlist)` };
-    case 'id':
-      return { message: `The value for ${name} must be a string that represents a DOM element ID` };
-    case 'boolean':
-    case 'string':
-    case 'integer':
-    case 'number':
-    default:
-      return { message: `The value for ${name} must be a ${type}.` };
-  }
+  return {
+    messageId: type,
+    data: { name, permittedValues, type },
+  };
 };
 
 test('validityCheck', (t) => {
diff --git a/__tests__/src/rules/aria-role-test.js b/__tests__/src/rules/aria-role-test.js
index 9a8ec3a89..21a51fe07 100644
--- a/__tests__/src/rules/aria-role-test.js
+++ b/__tests__/src/rules/aria-role-test.js
@@ -20,7 +20,7 @@ import rule from '../../../src/rules/aria-role';
 const ruleTester = new RuleTester();
 
 const errorMessage = {
-  message: 'Elements with ARIA roles must use a valid, non-abstract ARIA role.',
+  messageId: 'error',
   type: 'JSXAttribute',
 };
 
diff --git a/__tests__/src/rules/aria-unsupported-elements-test.js b/__tests__/src/rules/aria-unsupported-elements-test.js
index 0b7533325..4ec6e4caf 100644
--- a/__tests__/src/rules/aria-unsupported-elements-test.js
+++ b/__tests__/src/rules/aria-unsupported-elements-test.js
@@ -21,8 +21,8 @@ import rule from '../../../src/rules/aria-unsupported-elements';
 const ruleTester = new RuleTester();
 
 const errorMessage = (invalidProp) => ({
-  message: `This element does not support ARIA roles, states and properties. \
-Try removing the prop '${invalidProp}'.`,
+  messageId: 'error',
+  data: { invalidProp },
   type: 'JSXOpeningElement',
 });
 
diff --git a/__tests__/src/rules/autocomplete-valid-test.js b/__tests__/src/rules/autocomplete-valid-test.js
index 57b1257c0..c0fda8652 100644
--- a/__tests__/src/rules/autocomplete-valid-test.js
+++ b/__tests__/src/rules/autocomplete-valid-test.js
@@ -20,12 +20,14 @@ import rule from '../../../src/rules/autocomplete-valid';
 const ruleTester = new RuleTester();
 
 const invalidAutocomplete = [{
-  message: axeFailMessage('autocomplete-valid'),
+  messageId: 'error',
+  data: { message: axeFailMessage('autocomplete-valid') },
   type: 'JSXOpeningElement',
 }];
 
 const inappropriateAutocomplete = [{
-  message: axeFailMessage('autocomplete-appropriate'),
+  messageId: 'error',
+  data: { message: axeFailMessage('autocomplete-appropriate') },
   type: 'JSXOpeningElement',
 }];
 
diff --git a/__tests__/src/rules/click-events-have-key-events-test.js b/__tests__/src/rules/click-events-have-key-events-test.js
index 683a71b7b..a5870c383 100644
--- a/__tests__/src/rules/click-events-have-key-events-test.js
+++ b/__tests__/src/rules/click-events-have-key-events-test.js
@@ -18,10 +18,8 @@ import rule from '../../../src/rules/click-events-have-key-events';
 
 const ruleTester = new RuleTester();
 
-const errorMessage = 'Visible, non-interactive elements with click handlers must have at least one keyboard listener.';
-
 const expectedError = {
-  message: errorMessage,
+  messageId: 'error',
   type: 'JSXOpeningElement',
 };
 
diff --git a/__tests__/src/rules/heading-has-content-test.js b/__tests__/src/rules/heading-has-content-test.js
index f9955440e..d59a82ed6 100644
--- a/__tests__/src/rules/heading-has-content-test.js
+++ b/__tests__/src/rules/heading-has-content-test.js
@@ -19,7 +19,7 @@ import rule from '../../../src/rules/heading-has-content';
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: 'Headings must have content and the content must be accessible by a screen reader.',
+  messageId: 'error',
   type: 'JSXOpeningElement',
 };
 
diff --git a/__tests__/src/rules/html-has-lang-test.js b/__tests__/src/rules/html-has-lang-test.js
index 4af612b9c..5d0d6911d 100644
--- a/__tests__/src/rules/html-has-lang-test.js
+++ b/__tests__/src/rules/html-has-lang-test.js
@@ -19,7 +19,7 @@ import rule from '../../../src/rules/html-has-lang';
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: '<html> elements must have the lang prop.',
+  messageId: 'error',
   type: 'JSXOpeningElement',
 };
 
diff --git a/__tests__/src/rules/iframe-has-title-test.js b/__tests__/src/rules/iframe-has-title-test.js
index 0bf60311f..5ced742f5 100644
--- a/__tests__/src/rules/iframe-has-title-test.js
+++ b/__tests__/src/rules/iframe-has-title-test.js
@@ -19,7 +19,7 @@ import rule from '../../../src/rules/iframe-has-title';
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: '<iframe> elements must have a unique title property.',
+  messageId: 'error',
   type: 'JSXOpeningElement',
 };
 
diff --git a/__tests__/src/rules/img-redundant-alt-test.js b/__tests__/src/rules/img-redundant-alt-test.js
index c7c528d42..852dc1f45 100644
--- a/__tests__/src/rules/img-redundant-alt-test.js
+++ b/__tests__/src/rules/img-redundant-alt-test.js
@@ -32,7 +32,7 @@ const componentsSettings = {
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: 'Redundant alt attribute. Screen-readers already announce `img` tags as an image. You don’t need to use the words `image`, `photo,` or `picture` (or any specified custom words) in the alt prop.',
+  messageId: 'error',
   type: 'JSXOpeningElement',
 };
 
diff --git a/__tests__/src/rules/lang-test.js b/__tests__/src/rules/lang-test.js
index 3eb406b1b..3deac07c5 100644
--- a/__tests__/src/rules/lang-test.js
+++ b/__tests__/src/rules/lang-test.js
@@ -19,7 +19,7 @@ import rule from '../../../src/rules/lang';
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: 'lang attribute must have a valid value.',
+  messageId: 'error',
   type: 'JSXAttribute',
 };
 
diff --git a/__tests__/src/rules/no-access-key-test.js b/__tests__/src/rules/no-access-key-test.js
index 0485e2b07..57bd210ce 100644
--- a/__tests__/src/rules/no-access-key-test.js
+++ b/__tests__/src/rules/no-access-key-test.js
@@ -19,7 +19,7 @@ import rule from '../../../src/rules/no-access-key';
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: 'No access key attribute allowed. Inconsistencies between keyboard shortcuts and keyboard commands used by screen readers and keyboard-only users create a11y complications.',
+  messageId: 'error',
   type: 'JSXOpeningElement',
 };
 
diff --git a/__tests__/src/rules/no-aria-hidden-on-focusable-test.js b/__tests__/src/rules/no-aria-hidden-on-focusable-test.js
index b341a2cbb..3656bbc86 100644
--- a/__tests__/src/rules/no-aria-hidden-on-focusable-test.js
+++ b/__tests__/src/rules/no-aria-hidden-on-focusable-test.js
@@ -19,7 +19,7 @@ import rule from '../../../src/rules/no-aria-hidden-on-focusable';
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: 'aria-hidden="true" must not be set on focusable elements.',
+  messageId: 'error',
   type: 'JSXOpeningElement',
 };
 
diff --git a/__tests__/src/rules/no-autofocus-test.js b/__tests__/src/rules/no-autofocus-test.js
index 13bddc724..4ed321863 100644
--- a/__tests__/src/rules/no-autofocus-test.js
+++ b/__tests__/src/rules/no-autofocus-test.js
@@ -19,7 +19,7 @@ import rule from '../../../src/rules/no-autofocus';
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: 'The autoFocus prop should not be used, as it can reduce usability and accessibility for users.',
+  messageId: 'error',
   type: 'JSXAttribute',
 };
 
diff --git a/__tests__/src/rules/no-distracting-elements-test.js b/__tests__/src/rules/no-distracting-elements-test.js
index 16a7b1b31..1e0631a4e 100644
--- a/__tests__/src/rules/no-distracting-elements-test.js
+++ b/__tests__/src/rules/no-distracting-elements-test.js
@@ -19,7 +19,8 @@ import rule from '../../../src/rules/no-distracting-elements';
 const ruleTester = new RuleTester();
 
 const expectedError = (element) => ({
-  message: `Do not use <${element}> elements as they can create visual accessibility issues and are deprecated.`,
+  messageId: 'error',
+  data: { element },
   type: 'JSXOpeningElement',
 });
 
diff --git a/__tests__/src/rules/prefer-tag-over-role-test.js b/__tests__/src/rules/prefer-tag-over-role-test.js
index 9a1a74631..c25f5a255 100644
--- a/__tests__/src/rules/prefer-tag-over-role-test.js
+++ b/__tests__/src/rules/prefer-tag-over-role-test.js
@@ -6,7 +6,8 @@ import rule from '../../../src/rules/prefer-tag-over-role';
 const ruleTester = new RuleTester();
 
 const expectedError = (role, tag) => ({
-  message: `Use ${tag} instead of the "${role}" role to ensure accessibility across all devices.`,
+  messageId: 'error',
+  data: { tag, role },
   type: 'JSXOpeningElement',
 });
 
diff --git a/__tests__/src/rules/role-has-required-aria-props-test.js b/__tests__/src/rules/role-has-required-aria-props-test.js
index 0ca4e23f3..292a8ae87 100644
--- a/__tests__/src/rules/role-has-required-aria-props-test.js
+++ b/__tests__/src/rules/role-has-required-aria-props-test.js
@@ -25,7 +25,8 @@ const errorMessage = (role) => {
   const requiredProps = Object.keys(roles.get(role).requiredProps);
 
   return {
-    message: `Elements with the ARIA role "${role}" must have the following attributes defined: ${requiredProps}`,
+    messageId: 'error',
+    data: { role, requiredProps },
     type: 'JSXAttribute',
   };
 };
diff --git a/__tests__/src/rules/role-supports-aria-props-test.js b/__tests__/src/rules/role-supports-aria-props-test.js
index 2b6559b1d..3547b4e90 100644
--- a/__tests__/src/rules/role-supports-aria-props-test.js
+++ b/__tests__/src/rules/role-supports-aria-props-test.js
@@ -23,16 +23,9 @@ import rule from '../../../src/rules/role-supports-aria-props';
 
 const ruleTester = new RuleTester();
 
-const generateErrorMessage = (attr, role, tag, isImplicit) => {
-  if (isImplicit) {
-    return `The attribute ${attr} is not supported by the role ${role}. This role is implicit on the element ${tag}.`;
-  }
-
-  return `The attribute ${attr} is not supported by the role ${role}.`;
-};
-
 const errorMessage = (attr, role, tag, isImplicit) => ({
-  message: generateErrorMessage(attr, role, tag, isImplicit),
+  messageId: isImplicit ? 'implicit' : 'explicit',
+  data: { attr, role, tag },
   type: 'JSXOpeningElement',
 });
 
diff --git a/__tests__/src/rules/scope-test.js b/__tests__/src/rules/scope-test.js
index 33930fd99..0d0c1d884 100644
--- a/__tests__/src/rules/scope-test.js
+++ b/__tests__/src/rules/scope-test.js
@@ -19,7 +19,7 @@ import rule from '../../../src/rules/scope';
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: 'The scope prop can only be used on <th> elements.',
+  messageId: 'error',
   type: 'JSXAttribute',
 };
 
diff --git a/__tests__/src/rules/tabindex-no-positive-test.js b/__tests__/src/rules/tabindex-no-positive-test.js
index e654ca013..adf2f56f7 100644
--- a/__tests__/src/rules/tabindex-no-positive-test.js
+++ b/__tests__/src/rules/tabindex-no-positive-test.js
@@ -19,7 +19,7 @@ import rule from '../../../src/rules/tabindex-no-positive';
 const ruleTester = new RuleTester();
 
 const expectedError = {
-  message: 'Avoid positive integer values for tabIndex.',
+  messageId: 'error',
   type: 'JSXAttribute',
 };
 
diff --git a/src/rules/alt-text.js b/src/rules/alt-text.js
index 495774563..49e436528 100644
--- a/src/rules/alt-text.js
+++ b/src/rules/alt-text.js
@@ -53,8 +53,8 @@ const ruleByElement = {
     if (altProp === undefined) {
       if (isPresentationRole(nodeType, node.attributes)) {
         context.report({
+          messageId: 'img-presentation-role',
           node,
-          message: 'Prefer alt="" over a presentational role. First rule of aria is to not use aria if it can be achieved via native HTML.',
         });
         return;
       }
@@ -65,8 +65,8 @@ const ruleByElement = {
       if (ariaLabelProp !== undefined) {
         if (!ariaLabelHasValue(ariaLabelProp)) {
           context.report({
+            messageId: 'img-no-aria-label-value',
             node,
-            message: 'The aria-label attribute must have a value. The alt attribute is preferred over aria-label for images.',
           });
         }
         return;
@@ -78,16 +78,19 @@ const ruleByElement = {
       if (ariaLabelledbyProp !== undefined) {
         if (!ariaLabelHasValue(ariaLabelledbyProp)) {
           context.report({
+            messageId: 'img-no-aria-labelledby-value',
             node,
-            message: 'The aria-labelledby attribute must have a value. The alt attribute is preferred over aria-labelledby for images.',
           });
         }
         return;
       }
 
       context.report({
+        data: {
+          nodeType,
+        },
+        messageId: 'img-no-alt',
         node,
-        message: `${nodeType} elements must have an alt prop, either with meaningful text, or an empty string for decorative images.`,
       });
       return;
     }
@@ -102,8 +105,11 @@ const ruleByElement = {
 
     // Undefined alt prop error.
     context.report({
+      data: {
+        nodeType,
+      },
+      messageId: 'img-invalid-alt',
       node,
-      message: `Invalid alt value for ${nodeType}. Use alt="" for presentational images.`,
     });
   },
 
@@ -119,8 +125,8 @@ const ruleByElement = {
     }
 
     context.report({
+      messageId: 'object',
       node,
-      message: 'Embedded <object> elements must have alternative text by providing inner text, aria-label or aria-labelledby props.',
     });
   },
 
@@ -136,8 +142,8 @@ const ruleByElement = {
     const altProp = getProp(node.attributes, 'alt');
     if (altProp === undefined) {
       context.report({
+        messageId: 'area',
         node,
-        message: 'Each area of an image map must have a text alternative through the `alt`, `aria-label`, or `aria-labelledby` prop.',
       });
       return;
     }
@@ -150,8 +156,8 @@ const ruleByElement = {
     }
 
     context.report({
+      messageId: 'area',
       node,
-      message: 'Each area of an image map must have a text alternative through the `alt`, `aria-label`, or `aria-labelledby` prop.',
     });
   },
 
@@ -172,8 +178,8 @@ const ruleByElement = {
     const altProp = getProp(node.attributes, 'alt');
     if (altProp === undefined) {
       context.report({
+        messageId: 'input-image',
         node,
-        message: '<input> elements with type="image" must have a text alternative through the `alt`, `aria-label`, or `aria-labelledby` prop.',
       });
       return;
     }
@@ -186,8 +192,8 @@ const ruleByElement = {
     }
 
     context.report({
+      messageId: 'input-image',
       node,
-      message: '<input> elements with type="image" must have a text alternative through the `alt`, `aria-label`, or `aria-labelledby` prop.',
     });
   },
 };
@@ -198,6 +204,16 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/alt-text.md',
       description: 'Enforce all elements that require alternative text have meaningful information to relay back to end user.',
     },
+    messages: {
+      area: 'Each area of an image map must have a text alternative through the `alt`, `aria-label`, or `aria-labelledby` prop.',
+      'img-invalid-alt': 'Invalid alt value for {{nodeType}}. Use alt="" for presentational images.',
+      'img-presentation-role': 'Prefer alt="" over a presentational role. First rule of aria is to not use aria if it can be achieved via native HTML.',
+      'img-no-alt': '{{nodeType}} elements must have an alt prop, either with meaningful text, or an empty string for decorative images.',
+      'img-no-aria-label-value': 'The aria-label attribute must have a value. The alt attribute is preferred over aria-label for images.',
+      'img-no-aria-labelledby-value': 'The aria-labelledby attribute must have a value. The alt attribute is preferred over aria-labelledby for images.',
+      'input-image': '<input> elements with type="image" must have a text alternative through the `alt`, `aria-label`, or `aria-labelledby` prop.',
+      object: 'Embedded <object> elements must have alternative text by providing inner text, aria-label or aria-labelledby props.',
+    },
     schema: [schema],
   },
 
diff --git a/src/rules/anchor-has-content.js b/src/rules/anchor-has-content.js
index 3381b4f6b..cb763d47d 100644
--- a/src/rules/anchor-has-content.js
+++ b/src/rules/anchor-has-content.js
@@ -13,8 +13,6 @@ import getElementType from '../util/getElementType';
 import { arraySchema, generateObjSchema } from '../util/schemas';
 import hasAccessibleChild from '../util/hasAccessibleChild';
 
-const errorMessage = 'Anchors must have content and the content must be accessible by a screen reader.';
-
 const schema = generateObjSchema({ components: arraySchema });
 
 export default {
@@ -23,6 +21,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/anchor-has-content.md',
       description: 'Enforce all anchors to contain accessible content.',
     },
+    messages: {
+      error: 'Anchors must have content and the content must be accessible by a screen reader.',
+    },
     schema: [schema],
   },
 
@@ -47,8 +48,8 @@ export default {
         }
 
         context.report({
+          messageId: 'error',
           node,
-          message: errorMessage,
         });
       },
     };
diff --git a/src/rules/aria-activedescendant-has-tabindex.js b/src/rules/aria-activedescendant-has-tabindex.js
index e240ec0bb..bd4234a3b 100644
--- a/src/rules/aria-activedescendant-has-tabindex.js
+++ b/src/rules/aria-activedescendant-has-tabindex.js
@@ -14,8 +14,6 @@ import isInteractiveElement from '../util/isInteractiveElement';
 // Rule Definition
 // ----------------------------------------------------------------------------
 
-const errorMessage = 'An element that manages focus with `aria-activedescendant` must have a tabindex';
-
 const schema = generateObjSchema();
 
 export default {
@@ -24,6 +22,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/aria-activedescendant-has-tabindex.md',
       description: 'Enforce elements with aria-activedescendant are tabbable.',
     },
+    messages: {
+      error: 'An element that manages focus with `aria-activedescendant` must have a tabindex',
+    },
     schema: [schema],
   },
 
@@ -60,8 +61,8 @@ export default {
         }
 
         context.report({
+          messageId: 'error',
           node,
-          message: errorMessage,
         });
       },
     };
diff --git a/src/rules/aria-props.js b/src/rules/aria-props.js
index d63aa499b..296ab7e8e 100644
--- a/src/rules/aria-props.js
+++ b/src/rules/aria-props.js
@@ -12,18 +12,7 @@ import { propName } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
 import getSuggestion from '../util/getSuggestion';
 
-const ariaAttributes = [...aria.keys()];
-
-const errorMessage = (name) => {
-  const suggestions = getSuggestion(name, ariaAttributes);
-  const message = `${name}: This attribute is an invalid ARIA attribute.`;
-
-  if (suggestions.length > 0) {
-    return `${message} Did you mean to use ${suggestions}?`;
-  }
-
-  return message;
-};
+const ariaAttributes = aria.keys();
 
 const schema = generateObjSchema();
 
@@ -33,6 +22,10 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/aria-props.md',
       description: 'Enforce all `aria-*` props are valid.',
     },
+    messages: {
+      error: '{{name}}: This attribute is an invalid ARIA attribute.',
+      'error-with-suggestions': '{{name}}: This attribute is an invalid ARIA attribute. Did you mean to use {{suggestions}}?',
+    },
     schema: [schema],
   },
 
@@ -48,9 +41,15 @@ export default {
       const isValid = aria.has(name);
 
       if (isValid === false) {
+        const suggestions = getSuggestion(name, ariaAttributes);
+
         context.report({
+          data: {
+            name,
+            suggestions,
+          },
+          messageId: suggestions.length === 0 ? 'error' : 'error-with-suggestions',
           node: attribute,
-          message: errorMessage(name),
         });
       }
     },
diff --git a/src/rules/aria-proptypes.js b/src/rules/aria-proptypes.js
index 23640f567..1edd4eb62 100644
--- a/src/rules/aria-proptypes.js
+++ b/src/rules/aria-proptypes.js
@@ -11,28 +11,6 @@ import { aria } from 'aria-query';
 import { getLiteralPropValue, getPropValue, propName } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
 
-const errorMessage = (name, type, permittedValues) => {
-  switch (type) {
-    case 'tristate':
-      return `The value for ${name} must be a boolean or the string "mixed".`;
-    case 'token':
-      return `The value for ${name} must be a single token from the following: ${permittedValues}.`;
-    case 'tokenlist':
-      return `The value for ${name} must be a list of one or more \
-tokens from the following: ${permittedValues}.`;
-    case 'idlist':
-      return `The value for ${name} must be a list of strings that represent DOM element IDs (idlist)`;
-    case 'id':
-      return `The value for ${name} must be a string that represents a DOM element ID`;
-    case 'boolean':
-    case 'string':
-    case 'integer':
-    case 'number':
-    default:
-      return `The value for ${name} must be a ${type}.`;
-  }
-};
-
 const validityCheck = (value, expectedType, permittedValues) => {
   switch (expectedType) {
     case 'boolean':
@@ -69,6 +47,17 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/aria-proptypes.md',
       description: 'Enforce ARIA state and property values are valid.',
     },
+    messages: {
+      boolean: 'The value for {{name}} must be a boolean.',
+      id: 'The value for {{name}} must be a string that represents a DOM element ID',
+      idlist: 'The value for {{name}} must be a list of strings that represent DOM element IDs (idlist)',
+      integer: 'The value for {{name}} must be a integer.',
+      number: 'The value for {{name}} must be a number.',
+      string: 'The value for {{name}} must be a string.',
+      token: 'The value for {{name}} must be a single token from the following: {{permittedValues}}.',
+      tokenlist: 'The value for {{name}} must be a list of one or more tokens from the following: {{permittedValues}}.',
+      tristate: 'The value for {{name}} must be a boolean or the string "mixed".',
+    },
     schema: [schema],
   },
 
@@ -105,8 +94,12 @@ export default {
       }
 
       context.report({
+        data: {
+          name,
+          permittedValues,
+        },
+        messageId: permittedType,
         node: attribute,
-        message: errorMessage(name, permittedType, permittedValues),
       });
     },
   }),
diff --git a/src/rules/aria-role.js b/src/rules/aria-role.js
index 4e2dfd338..4b38e8cca 100644
--- a/src/rules/aria-role.js
+++ b/src/rules/aria-role.js
@@ -13,8 +13,6 @@ import { getLiteralPropValue, propName } from 'jsx-ast-utils';
 import getElementType from '../util/getElementType';
 import { generateObjSchema } from '../util/schemas';
 
-const errorMessage = 'Elements with ARIA roles must use a valid, non-abstract ARIA role.';
-
 const schema = generateObjSchema({
   allowedInvalidRoles: {
     items: {
@@ -37,6 +35,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/aria-role.md',
       description: 'Enforce that elements with ARIA roles must use a valid, non-abstract ARIA role.',
     },
+    messages: {
+      error: 'Elements with ARIA roles must use a valid, non-abstract ARIA role.',
+    },
     schema: [schema],
   },
 
@@ -74,8 +75,8 @@ export default {
         if (isValid === true) { return; }
 
         context.report({
+          messageId: 'error',
           node: attribute,
-          message: errorMessage,
         });
       },
     });
diff --git a/src/rules/aria-unsupported-elements.js b/src/rules/aria-unsupported-elements.js
index b58e1b3f4..4633b930f 100644
--- a/src/rules/aria-unsupported-elements.js
+++ b/src/rules/aria-unsupported-elements.js
@@ -16,11 +16,6 @@ import { propName } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
 import getElementType from '../util/getElementType';
 
-const errorMessage = (invalidProp) => (
-  `This element does not support ARIA roles, states and properties. \
-Try removing the prop '${invalidProp}'.`
-);
-
 const schema = generateObjSchema();
 
 export default {
@@ -29,6 +24,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/aria-unsupported-elements.md',
       description: 'Enforce that elements that do not support ARIA roles, states, and properties do not have those attributes.',
     },
+    messages: {
+      error: "This element does not support ARIA roles, states and properties. Try removing the prop '{{invalidProp}}'.",
+    },
     schema: [schema],
   },
 
@@ -58,8 +56,11 @@ export default {
 
           if (invalidAttributes.has(name)) {
             context.report({
+              data: {
+                invalidProp: name,
+              },
+              messageId: 'error',
               node,
-              message: errorMessage(name),
             });
           }
         });
diff --git a/src/rules/autocomplete-valid.js b/src/rules/autocomplete-valid.js
index df7b6b840..9c2a275f0 100644
--- a/src/rules/autocomplete-valid.js
+++ b/src/rules/autocomplete-valid.js
@@ -21,6 +21,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/autocomplete-valid.md',
       description: 'Enforce that autocomplete attributes are used correctly.',
     },
+    messages: {
+      error: '{{message}}',
+    },
     schema: [schema],
   },
 
@@ -54,8 +57,11 @@ export default {
         }
         // Since we only test one rule, with one node, return the message from first (and only) instance of each
         context.report({
+          data: {
+            message: violations[0].nodes[0].all[0].message,
+          },
+          messageId: 'error',
           node,
-          message: violations[0].nodes[0].all[0].message,
         });
       },
     };
diff --git a/src/rules/click-events-have-key-events.js b/src/rules/click-events-have-key-events.js
index 6c9cf90fe..47eb9f3cc 100644
--- a/src/rules/click-events-have-key-events.js
+++ b/src/rules/click-events-have-key-events.js
@@ -15,8 +15,6 @@ import isHiddenFromScreenReader from '../util/isHiddenFromScreenReader';
 import isInteractiveElement from '../util/isInteractiveElement';
 import isPresentationRole from '../util/isPresentationRole';
 
-const errorMessage = 'Visible, non-interactive elements with click handlers must have at least one keyboard listener.';
-
 const schema = generateObjSchema();
 
 export default {
@@ -25,6 +23,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/click-events-have-key-events.md',
       description: 'Enforce a clickable non-interactive element has at least one keyboard event listener.',
     },
+    messages: {
+      error: 'Visible, non-interactive elements with click handlers must have at least one keyboard listener.',
+    },
     schema: [schema],
   },
 
@@ -60,8 +61,8 @@ export default {
 
         // Visible, non-interactive elements with click handlers require one keyboard event listener.
         context.report({
+          messageId: 'error',
           node,
-          message: errorMessage,
         });
       },
     };
diff --git a/src/rules/heading-has-content.js b/src/rules/heading-has-content.js
index e9ede4e70..9f9a33aae 100644
--- a/src/rules/heading-has-content.js
+++ b/src/rules/heading-has-content.js
@@ -12,8 +12,6 @@ import getElementType from '../util/getElementType';
 import hasAccessibleChild from '../util/hasAccessibleChild';
 import isHiddenFromScreenReader from '../util/isHiddenFromScreenReader';
 
-const errorMessage = 'Headings must have content and the content must be accessible by a screen reader.';
-
 const headings = [
   'h1',
   'h2',
@@ -31,6 +29,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/heading-has-content.md',
       description: 'Enforce heading (`h1`, `h2`, etc) elements contain accessible content.',
     },
+    messages: {
+      error: 'Headings must have content and the content must be accessible by a screen reader.',
+    },
     schema: [schema],
   },
 
@@ -55,8 +56,8 @@ export default {
         }
 
         context.report({
+          messageId: 'error',
           node,
-          message: errorMessage,
         });
       },
     };
diff --git a/src/rules/html-has-lang.js b/src/rules/html-has-lang.js
index 7cf768823..a1c57d344 100644
--- a/src/rules/html-has-lang.js
+++ b/src/rules/html-has-lang.js
@@ -11,8 +11,6 @@ import { getProp, getPropValue } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
 import getElementType from '../util/getElementType';
 
-const errorMessage = '<html> elements must have the lang prop.';
-
 const schema = generateObjSchema();
 
 export default {
@@ -21,6 +19,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/html-has-lang.md',
       description: 'Enforce `<html>` element has `lang` prop.',
     },
+    messages: {
+      error: '<html> elements must have the lang prop.',
+    },
     schema: [schema],
   },
 
@@ -41,8 +42,8 @@ export default {
         }
 
         context.report({
+          messageId: 'error',
           node,
-          message: errorMessage,
         });
       },
     };
diff --git a/src/rules/iframe-has-title.js b/src/rules/iframe-has-title.js
index 272f89ed9..776e6f4c2 100644
--- a/src/rules/iframe-has-title.js
+++ b/src/rules/iframe-has-title.js
@@ -11,8 +11,6 @@ import { getProp, getPropValue } from 'jsx-ast-utils';
 import getElementType from '../util/getElementType';
 import { generateObjSchema } from '../util/schemas';
 
-const errorMessage = '<iframe> elements must have a unique title property.';
-
 const schema = generateObjSchema();
 
 export default {
@@ -21,6 +19,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/iframe-has-title.md',
       description: 'Enforce iframe elements have a title attribute.',
     },
+    messages: {
+      error: '<iframe> elements must have a unique title property.',
+    },
     schema: [schema],
   },
 
@@ -41,8 +42,8 @@ export default {
         }
 
         context.report({
+          messageId: 'error',
           node,
-          message: errorMessage,
         });
       },
     };
diff --git a/src/rules/img-redundant-alt.js b/src/rules/img-redundant-alt.js
index a7014c770..eac19ddcc 100644
--- a/src/rules/img-redundant-alt.js
+++ b/src/rules/img-redundant-alt.js
@@ -19,8 +19,6 @@ const REDUNDANT_WORDS = [
   'picture',
 ];
 
-const errorMessage = 'Redundant alt attribute. Screen-readers already announce `img` tags as an image. You don’t need to use the words `image`, `photo,` or `picture` (or any specified custom words) in the alt prop.';
-
 const schema = generateObjSchema({
   components: arraySchema,
   words: arraySchema,
@@ -43,6 +41,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/img-redundant-alt.md',
       description: 'Enforce `<img>` alt prop does not contain the word "image", "picture", or "photo".',
     },
+    messages: {
+      error: 'Redundant alt attribute. Screen-readers already announce `img` tags as an image. You don’t need to use the words `image`, `photo,` or `picture` (or any specified custom words) in the alt prop.',
+    },
     schema: [schema],
   },
 
@@ -79,8 +80,8 @@ export default {
 
           if (hasRedundancy === true) {
             context.report({
+              messageId: 'error',
               node,
-              message: errorMessage,
             });
           }
         }
diff --git a/src/rules/lang.js b/src/rules/lang.js
index 545d8a290..ad84c2f4f 100644
--- a/src/rules/lang.js
+++ b/src/rules/lang.js
@@ -12,8 +12,6 @@ import tags from 'language-tags';
 import { generateObjSchema } from '../util/schemas';
 import getElementType from '../util/getElementType';
 
-const errorMessage = 'lang attribute must have a valid value.';
-
 const schema = generateObjSchema();
 
 export default {
@@ -22,6 +20,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/lang.md',
       description: 'Enforce lang attribute has a valid value.',
     },
+    messages: {
+      error: 'lang attribute must have a valid value.',
+    },
     schema: [schema],
   },
 
@@ -48,8 +49,8 @@ export default {
         }
         if (value === undefined) {
           context.report({
+            messageId: 'error',
             node,
-            message: errorMessage,
           });
 
           return;
@@ -60,8 +61,8 @@ export default {
         }
 
         context.report({
+          messageId: 'error',
           node,
-          message: errorMessage,
         });
       },
     };
diff --git a/src/rules/no-access-key.js b/src/rules/no-access-key.js
index 7f71e8b84..597d7e97f 100644
--- a/src/rules/no-access-key.js
+++ b/src/rules/no-access-key.js
@@ -10,8 +10,6 @@
 import { getProp, getPropValue } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
 
-const errorMessage = 'No access key attribute allowed. Inconsistencies between keyboard shortcuts and keyboard commands used by screen readers and keyboard-only users create a11y complications.';
-
 const schema = generateObjSchema();
 
 export default {
@@ -20,6 +18,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/no-access-key.md',
       description: 'Enforce that the `accessKey` prop is not used on any element to avoid complications with keyboard commands used by a screen reader.',
     },
+    messages: {
+      error: 'No access key attribute allowed. Inconsistencies between keyboard shortcuts and keyboard commands used by screen readers and keyboard-only users create a11y complications.',
+    },
     schema: [schema],
   },
 
@@ -30,8 +31,8 @@ export default {
 
       if (accessKey && accessKeyValue) {
         context.report({
+          messageId: 'error',
           node,
-          message: errorMessage,
         });
       }
     },
diff --git a/src/rules/no-aria-hidden-on-focusable.js b/src/rules/no-aria-hidden-on-focusable.js
index 4f40c81b8..f9bd98587 100644
--- a/src/rules/no-aria-hidden-on-focusable.js
+++ b/src/rules/no-aria-hidden-on-focusable.js
@@ -20,6 +20,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/no-aria-hidden-on-focusable.md',
       description: 'Disallow `aria-hidden="true"` from being set on focusable elements.',
     },
+    messages: {
+      error: 'aria-hidden="true" must not be set on focusable elements.',
+    },
     schema: [schema],
   },
 
@@ -33,8 +36,8 @@ export default {
 
         if (isAriaHidden && isFocusable(type, attributes)) {
           context.report({
+            messageId: 'error',
             node,
-            message: 'aria-hidden="true" must not be set on focusable elements.',
           });
         }
       },
diff --git a/src/rules/no-autofocus.js b/src/rules/no-autofocus.js
index 43c3fe599..78013a193 100644
--- a/src/rules/no-autofocus.js
+++ b/src/rules/no-autofocus.js
@@ -12,8 +12,6 @@ import { dom } from 'aria-query';
 import { generateObjSchema } from '../util/schemas';
 import getElementType from '../util/getElementType';
 
-const errorMessage = 'The autoFocus prop should not be used, as it can reduce usability and accessibility for users.';
-
 const schema = generateObjSchema({
   ignoreNonDOM: {
     type: 'boolean',
@@ -27,6 +25,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/no-autofocus.md',
       description: 'Enforce autoFocus prop is not used.',
     },
+    messages: {
+      error: 'The autoFocus prop should not be used, as it can reduce usability and accessibility for users.',
+    },
     schema: [schema],
   },
 
@@ -49,8 +50,8 @@ export default {
         // Don't normalize, since React only recognizes autoFocus on low-level DOM elements.
         if (propName(attribute) === 'autoFocus') {
           context.report({
+            messageId: 'error',
             node: attribute,
-            message: errorMessage,
           });
         }
       },
diff --git a/src/rules/no-distracting-elements.js b/src/rules/no-distracting-elements.js
index 618921a43..9e1c0c70b 100644
--- a/src/rules/no-distracting-elements.js
+++ b/src/rules/no-distracting-elements.js
@@ -10,10 +10,6 @@
 import { generateObjSchema, enumArraySchema } from '../util/schemas';
 import getElementType from '../util/getElementType';
 
-const errorMessage = (element) => (
-  `Do not use <${element}> elements as they can create visual accessibility issues and are deprecated.`
-);
-
 const DEFAULT_ELEMENTS = [
   'marquee',
   'blink',
@@ -29,6 +25,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/no-distracting-elements.md',
       description: 'Enforce distracting elements are not used.',
     },
+    messages: {
+      error: 'Do not use <{{element}}> elements as they can create visual accessibility issues and are deprecated.',
+    },
     schema: [schema],
   },
 
@@ -43,8 +42,11 @@ export default {
 
         if (distractingElement) {
           context.report({
+            data: {
+              element: distractingElement,
+            },
+            messageId: 'error',
             node,
-            message: errorMessage(distractingElement),
           });
         }
       },
diff --git a/src/rules/prefer-tag-over-role.js b/src/rules/prefer-tag-over-role.js
index fbb9bea04..1f8beaac2 100644
--- a/src/rules/prefer-tag-over-role.js
+++ b/src/rules/prefer-tag-over-role.js
@@ -4,8 +4,6 @@ import { getProp, getPropValue } from 'jsx-ast-utils';
 import getElementType from '../util/getElementType';
 import { generateObjSchema } from '../util/schemas';
 
-const errorMessage = 'Use {{tag}} instead of the "{{role}}" role to ensure accessibility across all devices.';
-
 const schema = generateObjSchema();
 
 const formatTag = (tag) => {
@@ -38,6 +36,9 @@ export default {
       description: 'Enforces using semantic DOM elements over the ARIA `role` property.',
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/prefer-tag-over-role.md',
     },
+    messages: {
+      error: 'Use {{tag}} instead of the "{{role}}" role to ensure accessibility across all devices.',
+    },
     schema: [schema],
   },
 
@@ -79,8 +80,8 @@ export default {
                 ].join(', or '),
             role,
           },
+          messageId: 'error',
           node,
-          message: errorMessage,
         });
       },
     };
diff --git a/src/rules/role-has-required-aria-props.js b/src/rules/role-has-required-aria-props.js
index f20eb6467..a39d066a2 100644
--- a/src/rules/role-has-required-aria-props.js
+++ b/src/rules/role-has-required-aria-props.js
@@ -18,10 +18,6 @@ import { generateObjSchema } from '../util/schemas';
 import getElementType from '../util/getElementType';
 import isSemanticRoleElement from '../util/isSemanticRoleElement';
 
-const errorMessage = (role, requiredProps) => (
-  `Elements with the ARIA role "${role}" must have the following attributes defined: ${String(requiredProps).toLowerCase()}`
-);
-
 const schema = generateObjSchema();
 
 export default {
@@ -30,6 +26,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/role-has-required-aria-props.md',
       description: 'Enforce that elements with ARIA roles must have all required attributes for that role.',
     },
+    messages: {
+      error: 'Elements with the ARIA role "{{role}}" must have the following attributes defined: {{requiredProps}}',
+    },
     schema: [schema],
   },
 
@@ -79,8 +78,12 @@ export default {
               .every((prop) => getProp(attributes, prop));
             if (hasRequiredProps === false) {
               context.report({
+                data: {
+                  role: role.toLowerCase(),
+                  requiredProps: String(requiredProps).toLowerCase(),
+                },
+                messageId: 'error',
                 node: attribute,
-                message: errorMessage(role.toLowerCase(), requiredProps),
               });
             }
           }
diff --git a/src/rules/role-supports-aria-props.js b/src/rules/role-supports-aria-props.js
index 93f529b4f..899b56143 100644
--- a/src/rules/role-supports-aria-props.js
+++ b/src/rules/role-supports-aria-props.js
@@ -23,14 +23,6 @@ import { generateObjSchema } from '../util/schemas';
 import getElementType from '../util/getElementType';
 import getImplicitRole from '../util/getImplicitRole';
 
-const errorMessage = (attr, role, tag, isImplicit) => {
-  if (isImplicit) {
-    return `The attribute ${attr} is not supported by the role ${role}. This role is implicit on the element ${tag}.`;
-  }
-
-  return `The attribute ${attr} is not supported by the role ${role}.`;
-};
-
 const schema = generateObjSchema();
 
 export default {
@@ -39,6 +31,10 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/role-supports-aria-props.md',
       description: 'Enforce that elements with explicit or implicit roles defined contain only `aria-*` properties supported by that `role`.',
     },
+    messages: {
+      explicit: 'The attribute {{attr}} is not supported by the role {{role}}.',
+      implicit: 'The attribute {{attr}} is not supported by the role {{role}}. This role is implicit on the element {{tag}}.',
+    },
     schema: [schema],
   },
 
@@ -75,8 +71,13 @@ export default {
           const name = propName(prop);
           if (invalidAriaPropsForRole.has(name)) {
             context.report({
+              data: {
+                attr: name,
+                role: roleValue,
+                tag: type,
+              },
+              messageId: isImplicit ? 'implicit' : 'explicit',
               node,
-              message: errorMessage(name, roleValue, type, isImplicit),
             });
           }
         });
diff --git a/src/rules/scope.js b/src/rules/scope.js
index ffef2fe0d..ed81ca12a 100644
--- a/src/rules/scope.js
+++ b/src/rules/scope.js
@@ -12,8 +12,6 @@ import { propName } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
 import getElementType from '../util/getElementType';
 
-const errorMessage = 'The scope prop can only be used on <th> elements.';
-
 const schema = generateObjSchema();
 
 export default {
@@ -22,6 +20,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/scope.md',
       description: 'Enforce `scope` prop is only used on `<th>` elements.',
     },
+    messages: {
+      error: 'The scope prop can only be used on <th> elements.',
+    },
     schema: [schema],
   },
 
@@ -47,8 +48,8 @@ export default {
         }
 
         context.report({
+          messageId: 'error',
           node,
-          message: errorMessage,
         });
       },
     };
diff --git a/src/rules/tabindex-no-positive.js b/src/rules/tabindex-no-positive.js
index aba110728..e6875d375 100644
--- a/src/rules/tabindex-no-positive.js
+++ b/src/rules/tabindex-no-positive.js
@@ -10,8 +10,6 @@
 import { getLiteralPropValue, propName } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
 
-const errorMessage = 'Avoid positive integer values for tabIndex.';
-
 const schema = generateObjSchema();
 
 export default {
@@ -20,6 +18,9 @@ export default {
       url: 'https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/tree/HEAD/docs/rules/tabindex-no-positive.md',
       description: 'Enforce `tabIndex` value is not greater than zero.',
     },
+    messages: {
+      error: 'Avoid positive integer values for tabIndex.',
+    },
     schema: [schema],
   },
 
@@ -41,8 +42,8 @@ export default {
       }
 
       context.report({
+        messageId: 'error',
         node: attribute,
-        message: errorMessage,
       });
     },
   }),

From 8111b686b594642240fd8dcca6a5af15ed783682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= <info@michaeldeboey.be>
Date: Fri, 25 Oct 2024 14:50:47 +0200
Subject: [PATCH 2/2] [Dev Deps] update `eslint-plugin-eslint-plugin`

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c866ee8b7..4fb4b4aca 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "eslint": "^8.57.0 || ^9.13.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-doc-generator": "^1.7.1",
-    "eslint-plugin-eslint-plugin": "^4.3.0",
+    "eslint-plugin-eslint-plugin": "^6.3.1",
     "eslint-plugin-flowtype": "^5.8.0 || ^8.0.3",
     "eslint-plugin-import": "^2.31.0",
     "estraverse": "^5.3.0",