Fix translations from GDocs based on FxB's feedback [MAILPOET-819]

assets/js/src/newsletter_editor/components/save.js

@@ -169,7 +169,7 @@ define([
     },
     beforeSave: function() {
       // TODO: Add a loading animation instead
-      this.$('.mailpoet_autosaved_at').text('Saving...');
+      this.$('.mailpoet_autosaved_at').text(MailPoet.I18n.t('saving'));
     },
     afterSave: function(json, response) {
       this.validateNewsletter(json);

lib/Config/Menu.php

@@ -75,7 +75,8 @@ class Menu {
       add_screen_option('per_page', array(
         'label' => _x(
           'Number of newsletters per page',
-          'newsletters per page (screen options)'
+          'newsletters per page (screen options)',
+          'mailpoet'
         ),
         'option' => 'mailpoet_newsletters_per_page'
       ));
@@ -97,7 +98,8 @@ class Menu {
       add_screen_option('per_page', array(
         'label' => _x(
           'Number of forms per page',
-          'forms per page (screen options)'
+          'forms per page (screen options)',
+          'mailpoet'
         ),
         'option' => 'mailpoet_forms_per_page'
       ));
@@ -119,7 +121,8 @@ class Menu {
       add_screen_option('per_page', array(
         'label' => _x(
           'Number of subscribers per page',
-          'subscribers per page (screen options)'
+          'subscribers per page (screen options)',
+          'mailpoet'
         ),
         'option' => 'mailpoet_subscribers_per_page'
       ));
@@ -142,7 +145,8 @@ class Menu {
       add_screen_option('per_page', array(
         'label' => _x(
           'Number of segments per page',
-          'segments per page (screen options)'
+          'segments per page (screen options)',
+          'mailpoet'
         ),
         'option' => 'mailpoet_segments_per_page'
       ));
@@ -542,4 +546,4 @@ class Menu {
       $notice->displayWPNotice();
     }
   }
-}
+}

views/newsletter/editor.html

@@ -334,6 +334,7 @@
     'previewShouldOpenInNewTab': __('Your preview should open in a new tab. Please ensure your browser is not blocking popups from this page.'),
     'newsletterPreview': __('Newsletter Preview'),
     'newsletterBodyIsCorrupted': __('Contents of this newsletter are corrupted and may be lost, you may need to add new content to this newsletter, or create a new one. If possible, please contact us and report this issue.'),
+    'saving': __('Saving...'),
   }) %>
 <% endblock %>
 

views/newsletters.html

@@ -27,13 +27,13 @@
     'tabNotificationTitle': __('Post Notifications'),
 
     'searchLabel': __('Search'),
-    'loadingItems': __('Loading newsletters...'),
+    'loadingItems': __('Loading emails...'),
     'noItemsFound': __("Nothing here yet! But, don't fret - there's no reason to get upset. Pretty soon, you’ll be sending emails faster than a turbo-jet."),
-    'selectAllLabel': __('All newsletters on this page are selected.'),
+    'selectAllLabel': __('All emails on this page are selected.'),
-    'selectedAllLabel': __('All %d newsletters are selected.'),
+    'selectedAllLabel': __('All %d emails are selected.'),
-    'selectAllLink': __('Select all newsletters on all pages'),
+    'selectAllLink': __('Select all emails on all pages'),
     'clearSelection': __('Clear selection'),
-    'permanentlyDeleted': __('%d newsletters were permanently deleted.'),
+    'permanentlyDeleted': __('%d emails were permanently deleted.'),
     'selectBulkAction': __('Select bulk action'),
     'bulkActions': __('Bulk Actions'),
     'apply': __('Apply'),
@@ -66,12 +66,12 @@
     'viewHistory': __('View history'),
     'createdOn': __('Created on'),
     'lastModifiedOn': __('Last modified on'),
-    'oneNewsletterTrashed': __('1 newsletter was moved to the trash.'),
+    'oneNewsletterTrashed': __('1 email was moved to the trash.'),
-    'multipleNewslettersTrashed': __('%$1d newsletters were moved to the trash.'),
+    'multipleNewslettersTrashed': __('%$1d emails were moved to the trash.'),
-    'oneNewsletterDeleted': __('1 newsletter was permanently deleted.'),
+    'oneNewsletterDeleted': __('1 email was permanently deleted.'),
-    'multipleNewslettersDeleted': __('%$1d newsletters were permanently deleted.'),
+    'multipleNewslettersDeleted': __('%$1d emails were permanently deleted.'),
-    'oneNewsletterRestored': __('1 newsletter has been recovered from the trash.'),
+    'oneNewsletterRestored': __('1 email has been recovered from the trash.'),
-    'multipleNewslettersRestored': __('%$1d newsletters have been recovered from the trash.'),
+    'multipleNewslettersRestored': __('%$1d emails have been recovered from the trash.'),
     'trash': __('Trash'),
     'moveToTrash': __('Move to trash'),
     'edit': __('Edit'),

views/settings.html

@@ -46,7 +46,7 @@
           type="submit"
           class="button button-primary"
           name="submit"
-          value="<%= ('Save settings') %>"
+          value="<%= __('Save settings') %>"
         />
       </p>
     </form>

views/subscribers/importExport/export.html

@@ -45,7 +45,7 @@
     <tr>
       <th scope="row">
         <label for="export_lists">
-          <%= __('Pick a list') %>
+          <%= __('Pick one or multiple lists') %>
         </label>
       </th>
       <td>

views/subscribers/importExport/import.html

@@ -34,7 +34,7 @@
 <%= localize({
 'noMailChimpLists': __('No active lists found'),
 'serverError': __('Server error:'),
-'select': __('Selecto', 'Form input type'),
+'select': __('Select', 'Form input type'),
 'csvKBLink':  csvKBLink,
 'wrongFileFormat': __('Only comma-separated (CSV) file formats are supported.'),
 'maxPostSizeNotice': __('Your CSV is over %s and is too big to process. Please split the file into two or more sections.')|replace({'%s': maxPostSize}),

views/subscribers/importExport/import/step1.html

@@ -108,9 +108,9 @@
         <tbody>
         <tr>
           <th scope="row">
-            <%= ('Did these subscribers ask to be in your list?') %>
+            <%= __('Did these subscribers ask to be in your list?') %>
             <p class="description">
-              <%= ('If the answer is "no", consider yourself a spammer.') %>
+              <%= __('If the answer is "no", consider yourself a spammer.') %>
               <br/>
               <%=
               __('[link]Read more at our Knowledge Base[/link]')
@@ -126,7 +126,7 @@
         <tr>
           <th scope="row">
             <a href="javascript:;"
-             class="button-primary button-disabled wysija mailpoet_process"><%= ('Next step') %> </a>
+             class="button-primary button-disabled wysija mailpoet_process"><%= __('Next step') %> </a>
           </th>
         </tr>
         </tbody>

views/welcome.html

@@ -65,7 +65,7 @@
     <p><%= __("About once a month, we send out a pretty cool newsletter ourselves.") %></p>
     <p><%= __("Sign up to get: Tips and tricks, special offers and important plugin updates!") %></p>
     <p>
-    <iframe width="380" scrolling="no" frameborder="0" src="http://www.mailpoet.com/?wysija-page=1&controller=subscribers&action=wysija_outter&wysija_form=5&external_site=1&wysijap=subscriptions-3" class="iframe-wysija" vspace="0" tabindex="0" style="border-style: none; display:block; visibility: visible; background-color: #f1f1f1!important;" marginwidth="0" marginheight="0" hspace="0" allowtransparency="true" title="Subscribe To Our Newsletter"></iframe>
+    <iframe width="380" scrolling="no" frameborder="0" src="http://www.mailpoet.com/?wysija-page=1&controller=subscribers&action=wysija_outter&wysija_form=5&external_site=1&wysijap=subscriptions-3" class="iframe-wysija" vspace="0" tabindex="0" style="border-style: none; display:block; visibility: visible; background-color: #f1f1f1!important;" marginwidth="0" marginheight="0" hspace="0" allowtransparency="true" title="<%= __("Subscribe To Our Newsletter") %>"></iframe>
     </p>
   </div>