diff -u b/core/misc/message.es6.js b/core/misc/message.es6.js --- b/core/misc/message.es6.js +++ b/core/misc/message.es6.js @@ -36,7 +36,7 @@ static defaultWrapper() { const wrapper = document.querySelector('[data-drupal-messages]'); if (!wrapper) { - throw new Error(Drupal.t('There is no @element on the page.', { '@element': '[data-drupal-messages]' })); + throw new Error('There is no [data-drupal-messages] on the page.') } return wrapper.innerHTML === '' ? Drupal.message.messageInternalWrapper(wrapper) : wrapper.firstElementChild; } @@ -47,7 +47,7 @@ * @return {Object} * An object containing message type strings. */ - static getMessageTypes() { + static getMessageTypeLabels() { return { status: Drupal.t('Status message'), error: Drupal.t('Error message'), @@ -99,8 +99,8 @@ `${options.type}-${Math.random().toFixed(15).replace('0.', '')}`; // Throw an error if an unexpected message type is used. - if (!(Drupal.message.getMessageTypes().hasOwnProperty(options.type))) { - throw new Error(Drupal.t(`The message type, ${options.type}, is not present in Drupal.message.getMessageTypes().`)); + if (!(Drupal.message.getMessageTypeLabels().hasOwnProperty(options.type))) { + throw new Error(`The message type, ${options.type}, is not present in Drupal.message.getMessageTypeLabels().`); } this.messageWrapper.appendChild(Drupal.theme('message', { text: message }, options)); @@ -164,7 +164,7 @@ * array of indexes. * * @return {number} - * Number of removed messages. + * Number of removed messages. */ remove(ids) { const messages = this.select(ids); @@ -177,7 +177,7 @@ * @name Drupal.message~messageDefinition.clear * * @return {number} - * Number of removed messages. + * Number of removed messages. */ clear() { const messages = this.messageWrapper.querySelectorAll('[data-drupal-message-id]'); @@ -247,7 +247,7 @@ * A DOM Node. */ Drupal.theme.message = ({ text }, options) => { - const messagesTypes = Drupal.message.getMessageTypes(); + const messagesTypes = Drupal.message.getMessageTypeLabels(); const messageWraper = document.createElement('div'); const messageText = document.createElement('h2'); messageText.setAttribute('class', 'visually-hidden'); diff -u b/core/misc/message.js b/core/misc/message.js --- b/core/misc/message.js +++ b/core/misc/message.js @@ -36,8 +36,8 @@ options.id = options.id ? String(options.id) : options.type + '-' + Math.random().toFixed(15).replace('0.', ''); - if (!Drupal.message.getMessageTypes().hasOwnProperty(options.type)) { - throw new Error(Drupal.t('The message type, ' + options.type + ', is not present in Drupal.message.getMessageTypes().')); + if (!Drupal.message.getMessageTypeLabels().hasOwnProperty(options.type)) { + throw new Error('The message type, ' + options.type + ', is not present in Drupal.message.getMessageTypeLabels().'); } this.messageWrapper.appendChild(Drupal.theme('message', { text: message }, options)); @@ -87,13 +87,13 @@ value: function defaultWrapper() { var wrapper = document.querySelector('[data-drupal-messages]'); if (!wrapper) { - throw new Error(Drupal.t('There is no @element on the page.', { '@element': '[data-drupal-messages]' })); + throw new Error('There is no [data-drupal-messages] on the page.'); } return wrapper.innerHTML === '' ? Drupal.message.messageInternalWrapper(wrapper) : wrapper.firstElementChild; } }, { - key: 'getMessageTypes', - value: function getMessageTypes() { + key: 'getMessageTypeLabels', + value: function getMessageTypeLabels() { return { status: Drupal.t('Status message'), error: Drupal.t('Error message'), @@ -127,7 +127,7 @@ Drupal.theme.message = function (_ref, options) { var text = _ref.text; - var messagesTypes = Drupal.message.getMessageTypes(); + var messagesTypes = Drupal.message.getMessageTypeLabels(); var messageWraper = document.createElement('div'); var messageText = document.createElement('h2'); messageText.setAttribute('class', 'visually-hidden');