Backport lost tinymce translations (#930)

* Restore translations of 'Remove link' * Add missing translationa in tinymce pattern by... copying generateModalHtml function from master branch, also some backported xml changes from 71ddf6f * Add 2 further missing translations in tinymce pattern
plone · Apr 29, 2020 · 5107fd7 · 5107fd7
1 parent 3331cd3
commit 5107fd7
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 19 deletions.
diff --git a/mockup/patterns/tinymce/js/links.js b/mockup/patterns/tinymce/js/links.js
@@ -347,7 +347,7 @@ define([
 
     editor.addButton('unlink', {
       icon: 'unlink',
-      tooltip: 'Remove link(s)',
+      tooltip: 'Remove link',
       cmd: 'unlink',
       stateSelector: 'a[href]'
     });
@@ -466,13 +466,23 @@ define([
         upload: this.options.upload,
         text: this.options.text,
         insertHeading: this.options.text.insertHeading,
+        insertImageHelp: this.options.text.insertImageHelp,
+        uploadText: this.options.text.upload,
+        insertLinkHelp: this.options.text.insertLinkHelp,
+        internal: this.options.text.internal,
+        external: this.options.text.external,
+        anchor: this.options.text.anchor,
+        anchorLabel: this.options.text.anchorLabel,
+        target: this.options.text.target,
         linkTypes: this.options.linkTypes,
         externalText: this.options.text.external,
         emailText: this.options.text.email,
         subjectText: this.options.text.subject,
         targetList: this.options.targetList,
         titleText: this.options.text.title,
-        externalImageText: this.options.text.externalImage,
+        internalImageText: this.options.text.internalImage,
+        externalImage: this.options.text.externalImage,
+        externalImageText: this.options.text.externalImageText,
         altText: this.options.text.alt,
         imageAlignText: this.options.text.imageAlign,
         scaleText: this.options.text.scale,

diff --git a/mockup/patterns/tinymce/pattern.js b/mockup/patterns/tinymce/pattern.js
@@ -136,15 +136,23 @@ define([
         insertHeading: _t('Insert link'),
         title: _t('Title'),
         internal: _t('Internal'),
-        external: _t('External URL (can be relative within this site or absolute if it starts with http:// or https://)'),
+        external: _t('External'),
+        externalText: _t('External URL (can be relative within this site or absolute if it starts with http:// or https://)'),
         email: _t('Email Address'),
         anchor: _t('Anchor'),
+        anchorLabel: _t('Select an anchor'),
+        target: _t('Target'),
         subject: _t('Email Subject (optional)'),
         image: _t('Image'),
         imageAlign: _t('Align'),
         scale: _t('Size'),
         alt: _t('Alternative Text'),
-        externalImage: _t('External Image URL (can be relative within this site or absolute if it starts with http:// or https://)')
+        insertImageHelp: _t('Specify an image. It can be on this site already (Internal Image), an image you upload (Upload), or from an external site (External Image).'),
+        internalImage: _t('Internal Image'),
+        externalImage: _t('External Image'),
+        externalImageText: _t('External Image URL (can be relative within this site or absolute if it starts with http:// or https://)'),
+        upload: _t('Upload'),
+        insertLinkHelp: _t('Specify the object to link to. It can be on this site already (Internal), an object you upload (Upload), from an external site (External), an email address (Email), or an anchor on this page (Anchor).'),
       },
       // URL generation options
       loadingBaseUrl: '../../../bower_components/tinymce-builded/js/tinymce/',
@@ -165,9 +173,10 @@ define([
         {title: 'Large', value: 'large'}
       ],
       imageClasses: {
-        'image-inline': 'Inline',
-        'image-right': 'Right',
-        'image-left': 'Left'
+        'image-inline': _t('Inline'),
+        'image-right': _t('Right'),
+        'image-left': _t('Left'),
+        'image-responsive': _t('Responsive')
       },
       targetList: [
         {text: _t('Open in this window / frame'), value: ''},

diff --git a/mockup/patterns/tinymce/templates/image.xml b/mockup/patterns/tinymce/templates/image.xml
@@ -2,15 +2,15 @@
   <div class="linkModal">
     <h1><%- insertHeading %></h1>
     <% if(_.contains(linkTypes, 'uploadImage')){ %>
-    <p class="info">Specify an image. It can be on this site already ("Internal Image"), an image you upload ("Upload"), or from an external site ("External Image").</p>
+    <p class="info"><%- insertImageHelp %></p>
     <% } %>
 
     <div class="linkTypes pat-autotoc autotabs"
          data-pat-autotoc="section:fieldset;levels:legend;IDPrefix:tinymce-autotoc-">
 
         <% if(_.contains(linkTypes, 'image')){ %>
       <fieldset class="linkType image" data-linkType="image">
-        <legend id="tinylink-image">Internal Image</legend>
+        <legend id="tinylink-image"><%- internalImageText %></legend>
         <div class="form-inline">
           <div class="form-group main">
             <input type="text" name="image" />
@@ -32,14 +32,14 @@
 
       <% if(_.contains(linkTypes, 'uploadImage')){ %>
       <fieldset class="linkType uploadImage" data-linkType="uploadImage">
-        <legend id="tinylink-uploadImage">Upload</legend>
+        <legend id="tinylink-uploadImage"><%- uploadText %></legend>
         <div class="uploadify-me"></div>
       </fieldset>
       <% } %>
 
       <% if(_.contains(linkTypes, 'externalImage')){ %>
       <fieldset class="linkType externalImage" data-linkType="externalImage">
-        <legend id="tinylink-externalImage">External Image</legend>
+        <legend id="tinylink-externalImage"><%- externalImage %></legend>
         <div>
           <div class="form-group main">
             <label><%- externalImageText %></label>

diff --git a/mockup/patterns/tinymce/templates/link.xml b/mockup/patterns/tinymce/templates/link.xml
@@ -2,14 +2,14 @@
   <div class="linkModal">
     <h1><%- insertHeading %></h1>
     <% if(upload){ %>
-    <p class="info">Specify the object to link to. It can be on this site already ("Internal"), an object you upload ("Upload"), from an external site ("External"), an email address ("Email"), or an anchor on this page ("Anchor").</p>
+    <p class="info"><%- insertLinkHelp %></p>
     <% } %>
 
     <div class="linkTypes pat-autotoc autotabs"
          data-pat-autotoc="section:fieldset;levels:legend;IDPrefix:tinymce-autotoc-">
 
       <fieldset class="linkType internal" data-linkType="internal">
-        <legend id="tinylink-internal">Internal</legend>
+        <legend id="tinylink-internal"><%- internal %></legend>
         <div>
           <div class="form-group main">
             <!-- this gives the name to the "linkType" -->
@@ -20,21 +20,21 @@
 
       <% if(upload){ %>
       <fieldset class="linkType upload" data-linkType="upload">
-        <legend id="tinylink-upload">Upload</legend>
+        <legend id="tinylink-upload"><%- uploadText %></legend>
         <div class="uploadify-me"></div>
       </fieldset>
       <% } %>
 
       <fieldset class="linkType external" data-linkType="external">
-        <legend id="tinylink-external">External</legend>
+        <legend id="tinylink-external"><%- external %></legend>
         <div class="form-group main">
           <label for="external"><%- externalText %></label>
           <input type="text" name="external" />
         </div>
       </fieldset>
 
       <fieldset class="linkType email" data-linkType="email">
-        <legend id="tinylink-email">Email</legend>
+        <legend id="tinylink-email"><%- emailText %></legend>
         <div class="form-inline">
           <div class="form-group main">
             <label><%- emailText %></label>
@@ -48,10 +48,10 @@
       </fieldset>
 
       <fieldset class="linkType anchor" data-linkType="anchor">
-        <legend id="tinylink-anchor">Anchor</legend>
+        <legend id="tinylink-anchor"><%- anchor %></legend>
         <div>
           <div class="form-group main">
-            <label>Select an anchor</label>
+            <label><%- anchorLabel %></label>
             <div class="input-wrapper">
               <select name="anchor" class="pat-select2" data-pat-select2="width:500px" />
             </div>
@@ -63,7 +63,7 @@
 
     <div class="common-controls">
       <div class="form-group">
-        <label>Target</label>
+        <label><%- target %></label>
         <select name="target">
           <% _.each(targetList, function(target){ %>
             <option value="<%- target.value %>"><%- target.text %></option>

diff --git a/news/910.bugfix b/news/910.bugfix
@@ -0,0 +1,5 @@
+tinymce pattern: Add missing translations by...
+    - copying generateModalHtml function from master branch,
+    - adding some backported xml changes from 71ddf6f387
+    - adding 2 further translations (not yet in master)
+[djowett-ftw]