diff --git a/mockup/patterns/tinymce/js/links.js b/mockup/patterns/tinymce/js/links.js index 91fa49a06..494a1c076 100644 --- 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 index e942d81ef..d2a1deaf3 100644 --- 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 index 90b45c4cd..96e4d56a8 100644 --- a/mockup/patterns/tinymce/templates/image.xml +++ b/mockup/patterns/tinymce/templates/image.xml @@ -2,7 +2,7 @@

<%- insertHeading %>

<% if(_.contains(linkTypes, 'uploadImage')){ %> -

Specify an image. It can be on this site already ("Internal Image"), an image you upload ("Upload"), or from an external site ("External Image").

+

<%- insertImageHelp %>

<% } %>
- Internal Image + <%- internalImageText %>
@@ -32,14 +32,14 @@ <% if(_.contains(linkTypes, 'uploadImage')){ %>
- Upload + <%- uploadText %>
<% } %> <% if(_.contains(linkTypes, 'externalImage')){ %>
- External Image + <%- externalImage %>
diff --git a/mockup/patterns/tinymce/templates/link.xml b/mockup/patterns/tinymce/templates/link.xml index b8a686c88..b77616513 100644 --- a/mockup/patterns/tinymce/templates/link.xml +++ b/mockup/patterns/tinymce/templates/link.xml @@ -2,14 +2,14 @@

<%- insertHeading %>

<% if(upload){ %> -

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").

+

<%- insertLinkHelp %>

<% } %>
- Internal + <%- internal %>
@@ -20,13 +20,13 @@ <% if(upload){ %>
- Upload + <%- uploadText %>
<% } %>
- External + <%- external %>
@@ -34,7 +34,7 @@
- Anchor + <%- anchor %>
- +
<% _.each(targetList, function(target){ %> diff --git a/news/910.bugfix b/news/910.bugfix new file mode 100644 index 000000000..f33a9b215 --- /dev/null +++ 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]