Fix issue with newsletter form fields not getting translated

[MAILPOET-4908]
mailpoet · Mar 9, 2023 · db2d95e · db2d95e
1 parent 9e55eea
commit db2d95e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/mailpoet/assets/js/src/common/form/textarea/textarea.tsx b/mailpoet/assets/js/src/common/form/textarea/textarea.tsx
@@ -1,4 +1,5 @@
 import { TextareaHTMLAttributes } from 'react';
+import { __ } from '@wordpress/i18n';
 import classnames from 'classnames';
 import { Tooltip } from 'common/tooltip/tooltip';
 
@@ -29,7 +30,9 @@ export function Textarea({
     >
       <textarea className={classnames({ code: isCode })} {...attributes} />
       {customLabel && (
-        <div className="mailpoet-form-input-label">{customLabel}</div>
+        <div className="mailpoet-form-input-label">
+          {__(customLabel, 'mailpoet')}
+        </div>
       )}
       {tooltip && (
         <>
@@ -41,7 +44,7 @@ export function Textarea({
             />
           </span>
           <Tooltip place="right" multiline id={attributes.name}>
-            {tooltip}
+            {__(tooltip, 'mailpoet')}
           </Tooltip>
         </>
       )}

diff --git a/mailpoet/assets/js/src/common/sender_email_address_warning.jsx b/mailpoet/assets/js/src/common/sender_email_address_warning.jsx
@@ -70,6 +70,7 @@ function SenderEmailAddressWarning({
             {ReactStringReplace(
               __(
                 'Email violates Sender Domain’s DMARC policy. Please set up [link]sender authentication[/link].',
+                'mailpoet',
               ),
               /\[link](.*?)\[\/link]/g,
               (match) => (

diff --git a/mailpoet/assets/js/src/form/fields/selection.jsx b/mailpoet/assets/js/src/form/fields/selection.jsx
@@ -1,4 +1,4 @@
-import { createRef, Component } from 'react';
+import { Component, createRef } from 'react';
 import jQuery from 'jquery';
 import _ from 'underscore';
 import 'react-dom';
@@ -125,11 +125,11 @@ class Selection extends Component {
     const templateRendered = (option) => {
       let tpl = '';
       if (option.tag) {
-        tpl += `<span class="mailpoet-form-select2-tag">${option.tag}</span>`;
+        tpl += `<span class='mailpoet-form-select2-tag'>${option.tag}</span>`;
       }
-      tpl += `<span class="mailpoet-form-select2-text"><span>${option.text}</span></span>`;
+      tpl += `<span class='mailpoet-form-select2-text'><span>${option.text}</span></span>`;
       if (option.count) {
-        tpl += `<span class="mailpoet-form-select2-count">${option.count}</span>`;
+        tpl += `<span class='mailpoet-form-select2-count'>${option.count}</span>`;
       }
       return tpl;
     };

diff --git a/mailpoet/assets/js/src/form/form.jsx b/mailpoet/assets/js/src/form/form.jsx
@@ -6,8 +6,9 @@ import PropTypes from 'prop-types';
 
 import { MailPoet } from 'mailpoet';
 import { FormField } from 'form/fields/field.jsx';
-import { Button } from 'common';
+import { Button, registerTranslations } from 'common';
 
+registerTranslations();
 class FormComponent extends Component {
   constructor(props) {
     super(props);

diff --git a/mailpoet/views/layout.html b/mailpoet/views/layout.html
@@ -149,7 +149,6 @@
   'refreshMyEmailVolumeLimit': __('I’ve upgraded my subscription, refresh monthly email limit'),
 
   'manageSenderDomainHeaderSubtitle': __('To help your audience and MailPoet authenticate you as the domain owner, please add the following DNS records to your domain’s DNS and click “Verify the DNS records”. Please note that it may take up to 24 hours for DNS changes to propagate after you make the change. [link]Read the guide[/link].', 'mailpoet'),
-  'authorizeSenderDomain': __('Email violates Sender Domain’s DMARC policy. Please set up [link]sender authentication[/link].'),
 
   'reviewRequestHeading': _x('Thank you! Time to tell the world?', 'After a user gives us positive feedback via the NPS poll, we ask them to review our plugin on WordPress.org.'),
   'reviewRequestDidYouKnow': __('[username], did you know that hundreds of WordPress users read the reviews on the plugin repository? They’re also a source of inspiration for our team.'),

diff --git a/mailpoet/views/settings.html b/mailpoet/views/settings.html
@@ -98,9 +98,7 @@
     'readGuide': __('Read our guide'),
 
     'invalidEmail': __('Invalid email address'),
-    'youNeedToAuthorizeTheEmail': __('Not an authorized sender email address. [link]Authorize it now.[/link]'),
     'authorizeMyEmail': __('Authorize my email address'),
-    'authorizeSenderDomain': __('Email violates Sender Domain’s DMARC policy. Please set up [link]sender authentication[/link].'),
 
     'enableSignupConfTitle': __('Enable sign-up confirmation'),
     'enableSignupConfDescription': __("If you enable this option, your subscribers will first receive a confirmation email after they subscribe. Once they confirm their subscription (via this email), they will be marked as 'confirmed' and will begin to receive your email newsletters."),