[Testbot] Plone 5.0 - Python 2.7 - Build # 2959 - Still failing! - 0 failure(s)
jenkins at plone.org
jenkins at plone.org
Sun Aug 10 09:56:04 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 2959 - Still Failing!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/2959/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: mockup
Branch: refs/heads/master
Date: 2014-08-10T07:28:43+02:00
Author: Blaz Bratanic () <blaz.bratanic at sensum.eu>
Commit: https://github.com/plone/mockup/commit/16a29a8cf9b8dd74f8d0fb8224ace7a0c5a011d4
Added i18n to all patterns.
Files changed:
M js/config.js
M patterns/formunloadalert/pattern.js
M patterns/pickadate/pattern.js
M patterns/preventdoublesubmit/pattern.js
M patterns/querystring/pattern.js
M patterns/relateditems/pattern.js
M patterns/tinymce/pattern.js
M patterns/upload/pattern.js
M patterns/upload/templates/upload.xml
diff --git a/js/config.js b/js/config.js
index 2c97f51..860545b 100644
--- a/js/config.js
+++ b/js/config.js
@@ -119,7 +119,7 @@
'tinymce-textpattern': 'bower_components/tinymce/plugins/textpattern/plugin',
'tinymce-visualblocks': 'bower_components/tinymce/plugins/visualblocks/plugin',
'tinymce-visualchars': 'bower_components/tinymce/plugins/visualchars/plugin',
- 'tinymce-wordcount': 'bower_components/tinymce/plugins/wordcount/plugin',
+ 'tinymce-wordcount': 'bower_components/tinymce/plugins/wordcount/plugin',
'tinymce-modern-theme': 'bower_components/tinymce/themes/modern/theme.min',
'tinymce': 'bower_components/tinymce/tinymce',
'underscore': 'bower_components/lodash/dist/lodash.underscore'
diff --git a/patterns/formunloadalert/pattern.js b/patterns/formunloadalert/pattern.js
index 686c9c3..8a8d2ba 100644
--- a/patterns/formunloadalert/pattern.js
+++ b/patterns/formunloadalert/pattern.js
@@ -44,17 +44,21 @@
define([
'jquery',
- 'mockup-patterns-base'
-], function ($, Base) {
+ 'mockup-patterns-base',
+ 'mockup-i18n'
+], function ($, Base, i18n) {
'use strict';
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
+
var FormUnloadAlert = Base.extend({
name: 'formunloadalert',
_changed : false, // Stores a listing of raised changes by their key
_suppressed : false, // whether or not warning should be suppressed
defaults: {
- message : 'Discard changes? If you click OK, ' +
- 'any changes you have made will be lost.',
+ message : _t('Discard changes? If you click OK, ' +
+ 'any changes you have made will be lost.'),
// events on which to check for changes
changingEvents: 'change keyup paste',
// fields on which to check for changes
diff --git a/patterns/pickadate/pattern.js b/patterns/pickadate/pattern.js
index e508b2b..29bd9e2 100644
--- a/patterns/pickadate/pattern.js
+++ b/patterns/pickadate/pattern.js
@@ -103,10 +103,14 @@ define([
'picker',
'picker.date',
'picker.time',
- 'mockup-patterns-select2'
-], function($, Base) {
+ 'mockup-patterns-select2',
+ 'mockup-i18n'
+], function($, Base, Picker, PickerDate, PickerTime, Select2, i18n) {
'use strict';
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
+
var PickADate = Base.extend({
name: 'pickadate',
defaults: {
@@ -127,9 +131,9 @@ define([
classTimezoneName: 'pattern-pickadate-timezone',
classTimezoneWrapperName: 'pattern-pickadate-timezone-wrapper',
classClearName: 'pattern-pickadate-clear',
- placeholderDate: 'Enter date...',
- placeholderTime: 'Enter time...',
- placeholderTimezone: 'Enter timezone...'
+ placeholderDate: _t('Enter date...'),
+ placeholderTime: _t('Enter time...'),
+ placeholderTimezone: _t('Enter timezone...')
},
isFalse: function(value) {
if (typeof(value) === 'string' && value === 'false') {
diff --git a/patterns/preventdoublesubmit/pattern.js b/patterns/preventdoublesubmit/pattern.js
index c6c3a7d..1a89950 100644
--- a/patterns/preventdoublesubmit/pattern.js
+++ b/patterns/preventdoublesubmit/pattern.js
@@ -37,15 +37,19 @@
define([
'jquery',
- 'mockup-patterns-base'
-], function($, Base) {
+ 'mockup-patterns-base',
+ 'mockup-i18n'
+], function($, Base, i18n) {
'use strict';
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
+
var PreventDoubleSubmit = Base.extend({
name: 'preventdoublesubmit',
defaults: {
- message : 'You already clicked the submit button. ' +
- 'Do you really want to submit this form again?',
+ message : _t('You already clicked the submit button. ' +
+ 'Do you really want to submit this form again?'),
guardClassName: 'submitting',
optOutClassName: 'allowMultiSubmit'
},
diff --git a/patterns/querystring/pattern.js b/patterns/querystring/pattern.js
index 318155a..21e65c9 100644
--- a/patterns/querystring/pattern.js
+++ b/patterns/querystring/pattern.js
@@ -63,19 +63,23 @@ define([
'mockup-patterns-base',
'mockup-patterns-select2',
'mockup-patterns-pickadate',
- 'select2'
-], function($, Base, Select2, PickADate, undefined) {
+ 'select2',
+ 'mockup-i18n'
+], function($, Base, Select2, PickADate, undefined, i18n) {
'use strict';
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
+
var Criteria = function() { this.init.apply(this, arguments); };
Criteria.prototype = {
defaults: {
indexWidth: '20em',
- placeholder: 'Select criteria',
+ placeholder: _t('Select criteria'),
remove: '',
- results: ' items matching your search.',
- days: 'days',
- betweendt: 'to',
+ results: _t(' items matching your search.'),
+ days: _t('days'),
+ betweendt: _t('to'),
classBetweenDtName: 'querystring-criteria-betweendt',
classWrapperName: 'querystring-criteria-wrapper',
classIndexName: 'querystring-criteria-index',
@@ -438,10 +442,10 @@ define([
indexOptionsUrl: null,
previewURL: 'portal_factory/@@querybuilder_html_results', // base url to use to request preview information from
previewCountURL: 'portal_factory/@@querybuildernumberofresults',
- sorttxt: 'Sort On',
- reversetxt: 'Reversed Order',
- previewTitle: 'Preview',
- previewDescription: 'Preview of at most 10 items',
+ sorttxt: _t('Sort On'),
+ reversetxt: _t('Reversed Order'),
+ previewTitle: _t('Preview'),
+ previewDescription: _t('Preview of at most 10 items'),
classSortLabelName: 'querystring-sort-label',
classSortReverseName: 'querystring-sortreverse',
classSortReverseLabelName: 'querystring-sortreverse-label',
diff --git a/patterns/relateditems/pattern.js b/patterns/relateditems/pattern.js
index ffeee0e..c664385 100644
--- a/patterns/relateditems/pattern.js
+++ b/patterns/relateditems/pattern.js
@@ -91,10 +91,14 @@ define([
'mockup-patterns-base',
'mockup-patterns-select2',
'mockup-utils',
- 'mockup-patterns-tree'
-], function($, _, Base, Select2, utils, Tree) {
+ 'mockup-patterns-tree',
+ 'mockup-i18n'
+], function($, _, Base, Select2, utils, Tree, i18n) {
'use strict';
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
+
var RelatedItems = Base.extend({
name: 'relateditems',
browsing: false,
@@ -110,9 +114,9 @@ define([
mode: 'search', // possible values are search and browse
closeOnSelect: false,
basePath: '/',
- searchText: 'Search:',
- searchAllText: 'entire site',
- homeText: 'home',
+ searchText: _t('Search:'),
+ searchAllText: _t('entire site'),
+ homeText: _t('home'),
folderTypes: ['Folder'],
selectableTypes: null, // null means everything is selectable, otherwise a list of strings to match types that are selectable
attributes: ['UID', 'Title', 'Type', 'path'],
diff --git a/patterns/tinymce/pattern.js b/patterns/tinymce/pattern.js
index e8aaf77..68a8a39 100644
--- a/patterns/tinymce/pattern.js
+++ b/patterns/tinymce/pattern.js
@@ -119,13 +119,16 @@ define([
'text!mockup-patterns-tinymce-url/templates/result.xml',
'text!mockup-patterns-tinymce-url/templates/selection.xml',
'mockup-utils',
- 'mockup-patterns-tinymce-url/js/links'
+ 'mockup-patterns-tinymce-url/js/links',
+ 'mockup-i18n'
], function($, _,
Base, RelatedItems, Modal, tinymce,
AutoTOC, ResultTemplate, SelectionTemplate,
- utils, LinkModal) {
+ utils, LinkModal, i18n) {
'use strict';
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
var TinyMCE = Base.extend({
name: 'tinymce',
@@ -143,23 +146,23 @@ define([
vocabularyUrl: null,
width: 500,
maximumSelectionSize: 1,
- placeholder: 'Search for item on site...'
+ placeholder: _t('Search for item on site...')
},
text: {
- insertBtn: 'Insert', // so this can be configurable for different languages
- cancelBtn: 'Cancel',
- insertHeading: 'Insert link',
- title: 'Title',
- internal: 'Internal',
- external: 'External',
- email: 'Email',
- anchor: 'Anchor',
- subject: 'Subject',
- image: 'Image',
- imageAlign: 'Align',
- scale: 'Size',
- alt: 'Alternative Text',
- externalImage: 'External Image URI'
+ insertBtn: _t('Insert'), // so this can be configurable for different languages
+ cancelBtn: _t('Cancel'),
+ insertHeading: _t('Insert link'),
+ title: _t('Title'),
+ internal: _t('Internal'),
+ external: _t('External'),
+ email: _t('Email'),
+ anchor: _t('Anchor'),
+ subject: _t('Subject'),
+ image: _t('Image'),
+ imageAlign: _t('Align'),
+ scale: _t('Size'),
+ alt: _t('Alternative Text'),
+ externalImage: _t('External Image URI')
},
// URL generation options
loadingBaseUrl: '../../../bower_components/tinymce-builded/js/tinymce/',
@@ -168,14 +171,14 @@ define([
linkAttribute: 'path', // attribute to get link value from data
prependToScalePart: '/imagescale/', // some value here is required to be able to parse scales back
appendToScalePart: '',
- scales: 'Listing (16x16):listing,Icon (32x32):icon,Tile (64x64):tile,' +
+ scales: _t('Listing (16x16):listing,Icon (32x32):icon,Tile (64x64):tile,' +
'Thumb (128x128):thumb,Mini (200x200):mini,Preview (400x400):preview,' +
- 'Large (768x768):large',
+ 'Large (768x768):large'),
targetList: [
- {text: 'Open in this window / frame', value: ''},
- {text: 'Open in new window', value: '_blank'},
- {text: 'Open in parent window / frame', value: '_parent'},
- {text: 'Open in top frame (replaces all frames)', value: '_top'}
+ {text: _t('Open in this window / frame'), value: ''},
+ {text: _t('Open in new window'), value: '_blank'},
+ {text: _t('Open in parent window / frame'), value: '_parent'},
+ {text: _t('Open in top frame (replaces all frames)'), value: '_top'}
],
imageTypes: 'Image',
folderTypes: 'Folder,Plone Site',
@@ -226,7 +229,7 @@ define([
linkTypes: ['image', 'uploadImage', 'externalImage'],
initialLinkType: 'image',
text: {
- insertHeading: 'Insert Image'
+ insertHeading: _t('Insert Image')
},
relatedItems: {
baseCriteria: [{
diff --git a/patterns/upload/pattern.js b/patterns/upload/pattern.js
index 785d096..430b1ae 100644
--- a/patterns/upload/pattern.js
+++ b/patterns/upload/pattern.js
@@ -64,13 +64,17 @@ define([
'dropzone',
'text!mockup-patterns-upload-url/templates/upload.xml',
'text!mockup-patterns-upload-url/templates/preview.xml',
+ 'mockup-i18n'
], function($, _, Base, RelatedItems, Dropzone,
- UploadTemplate, PreviewTemplate) {
+ UploadTemplate, PreviewTemplate, i18n) {
'use strict';
/* we do not want this plugin to auto discover */
Dropzone.autoDiscover = false;
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
+
var UploadPattern = Base.extend({
name: 'upload',
defaults: {
@@ -101,10 +105,11 @@ define([
vocabularyUrl: null,
width: 500,
maximumSelectionSize: 1,
- placeholder: 'Search for item on site...'
+ placeholder: _t('Search for item on site...')
}
},
+ //placeholder: 'Search for item on site...'
init: function() {
var self = this,
template = UploadTemplate;
@@ -114,7 +119,7 @@ define([
self.numFiles = 0;
self.currentFile = 0;
- template = _.template(template);
+ template = _.template(template, {_t: _t});
self.$el.addClass(self.options.className);
self.$el.append(template);
@@ -389,7 +394,7 @@ define([
}).progress(function(e, bytesUploaded, bytesTotal) {
var percentage = (bytesUploaded / bytesTotal * 100);
self.$progress.attr('aria-valuenow', percentage).css('width', percentage + '%');
- self.$progress.html('uploading...<br />' +
+ self.$progress.html(_t('uploading...<br />') +
self.formatBytes(bytesUploaded) +
' / ' + self.formatBytes(bytesTotal));
}).done(function(url, file) {
diff --git a/patterns/upload/templates/upload.xml b/patterns/upload/templates/upload.xml
index d63ae3e..b29f1ef 100644
--- a/patterns/upload/templates/upload.xml
+++ b/patterns/upload/templates/upload.xml
@@ -8,7 +8,7 @@
<div class="fallback">
<input name="file" type="file" multiple />
</div>
- <div class="dz-message"><p>Drop files here...</p></div>
+ <div class="dz-message"><p><%-_t("Drop files here...")%></p></div>
<div class="row">
<div class="col-md-9">
<input
Repository: mockup
Branch: refs/heads/master
Date: 2014-08-10T10:37:40+02:00
Author: Nathan Van Gheem (vangheem) <vangheem at gmail.com>
Commit: https://github.com/plone/mockup/commit/5b10684981a964fb9d4d94256577416f662dabd1
Merge pull request #399 from blazbratanic/template-i18n
Added i18n to all patterns.
Files changed:
M js/config.js
M patterns/formunloadalert/pattern.js
M patterns/pickadate/pattern.js
M patterns/preventdoublesubmit/pattern.js
M patterns/querystring/pattern.js
M patterns/relateditems/pattern.js
M patterns/tinymce/pattern.js
M patterns/upload/pattern.js
M patterns/upload/templates/upload.xml
diff --git a/js/config.js b/js/config.js
index 55b5867..4db476c 100644
--- a/js/config.js
+++ b/js/config.js
@@ -124,7 +124,7 @@
'tinymce-textpattern': 'bower_components/tinymce/plugins/textpattern/plugin',
'tinymce-visualblocks': 'bower_components/tinymce/plugins/visualblocks/plugin',
'tinymce-visualchars': 'bower_components/tinymce/plugins/visualchars/plugin',
- 'tinymce-wordcount': 'bower_components/tinymce/plugins/wordcount/plugin',
+ 'tinymce-wordcount': 'bower_components/tinymce/plugins/wordcount/plugin',
'tinymce-modern-theme': 'bower_components/tinymce/themes/modern/theme.min',
'tinymce': 'bower_components/tinymce/tinymce',
'underscore': 'bower_components/lodash/dist/lodash.underscore'
diff --git a/patterns/formunloadalert/pattern.js b/patterns/formunloadalert/pattern.js
index 686c9c3..8a8d2ba 100644
--- a/patterns/formunloadalert/pattern.js
+++ b/patterns/formunloadalert/pattern.js
@@ -44,17 +44,21 @@
define([
'jquery',
- 'mockup-patterns-base'
-], function ($, Base) {
+ 'mockup-patterns-base',
+ 'mockup-i18n'
+], function ($, Base, i18n) {
'use strict';
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
+
var FormUnloadAlert = Base.extend({
name: 'formunloadalert',
_changed : false, // Stores a listing of raised changes by their key
_suppressed : false, // whether or not warning should be suppressed
defaults: {
- message : 'Discard changes? If you click OK, ' +
- 'any changes you have made will be lost.',
+ message : _t('Discard changes? If you click OK, ' +
+ 'any changes you have made will be lost.'),
// events on which to check for changes
changingEvents: 'change keyup paste',
// fields on which to check for changes
diff --git a/patterns/pickadate/pattern.js b/patterns/pickadate/pattern.js
index e508b2b..29bd9e2 100644
--- a/patterns/pickadate/pattern.js
+++ b/patterns/pickadate/pattern.js
@@ -103,10 +103,14 @@ define([
'picker',
'picker.date',
'picker.time',
- 'mockup-patterns-select2'
-], function($, Base) {
+ 'mockup-patterns-select2',
+ 'mockup-i18n'
+], function($, Base, Picker, PickerDate, PickerTime, Select2, i18n) {
'use strict';
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
+
var PickADate = Base.extend({
name: 'pickadate',
defaults: {
@@ -127,9 +131,9 @@ define([
classTimezoneName: 'pattern-pickadate-timezone',
classTimezoneWrapperName: 'pattern-pickadate-timezone-wrapper',
classClearName: 'pattern-pickadate-clear',
- placeholderDate: 'Enter date...',
- placeholderTime: 'Enter time...',
- placeholderTimezone: 'Enter timezone...'
+ placeholderDate: _t('Enter date...'),
+ placeholderTime: _t('Enter time...'),
+ placeholderTimezone: _t('Enter timezone...')
},
isFalse: function(value) {
if (typeof(value) === 'string' && value === 'false') {
diff --git a/patterns/preventdoublesubmit/pattern.js b/patterns/preventdoublesubmit/pattern.js
index c6c3a7d..1a89950 100644
--- a/patterns/preventdoublesubmit/pattern.js
+++ b/patterns/preventdoublesubmit/pattern.js
@@ -37,15 +37,19 @@
define([
'jquery',
- 'mockup-patterns-base'
-], function($, Base) {
+ 'mockup-patterns-base',
+ 'mockup-i18n'
+], function($, Base, i18n) {
'use strict';
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
+
var PreventDoubleSubmit = Base.extend({
name: 'preventdoublesubmit',
defaults: {
- message : 'You already clicked the submit button. ' +
- 'Do you really want to submit this form again?',
+ message : _t('You already clicked the submit button. ' +
+ 'Do you really want to submit this form again?'),
guardClassName: 'submitting',
optOutClassName: 'allowMultiSubmit'
},
diff --git a/patterns/querystring/pattern.js b/patterns/querystring/pattern.js
index 318155a..21e65c9 100644
--- a/patterns/querystring/pattern.js
+++ b/patterns/querystring/pattern.js
@@ -63,19 +63,23 @@ define([
'mockup-patterns-base',
'mockup-patterns-select2',
'mockup-patterns-pickadate',
- 'select2'
-], function($, Base, Select2, PickADate, undefined) {
+ 'select2',
+ 'mockup-i18n'
+], function($, Base, Select2, PickADate, undefined, i18n) {
'use strict';
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
+
var Criteria = function() { this.init.apply(this, arguments); };
Criteria.prototype = {
defaults: {
indexWidth: '20em',
- placeholder: 'Select criteria',
+ placeholder: _t('Select criteria'),
remove: '',
- results: ' items matching your search.',
- days: 'days',
- betweendt: 'to',
+ results: _t(' items matching your search.'),
+ days: _t('days'),
+ betweendt: _t('to'),
classBetweenDtName: 'querystring-criteria-betweendt',
classWrapperName: 'querystring-criteria-wrapper',
classIndexName: 'querystring-criteria-index',
@@ -438,10 +442,10 @@ define([
indexOptionsUrl: null,
previewURL: 'portal_factory/@@querybuilder_html_results', // base url to use to request preview information from
previewCountURL: 'portal_factory/@@querybuildernumberofresults',
- sorttxt: 'Sort On',
- reversetxt: 'Reversed Order',
- previewTitle: 'Preview',
- previewDescription: 'Preview of at most 10 items',
+ sorttxt: _t('Sort On'),
+ reversetxt: _t('Reversed Order'),
+ previewTitle: _t('Preview'),
+ previewDescription: _t('Preview of at most 10 items'),
classSortLabelName: 'querystring-sort-label',
classSortReverseName: 'querystring-sortreverse',
classSortReverseLabelName: 'querystring-sortreverse-label',
diff --git a/patterns/relateditems/pattern.js b/patterns/relateditems/pattern.js
index ffeee0e..c664385 100644
--- a/patterns/relateditems/pattern.js
+++ b/patterns/relateditems/pattern.js
@@ -91,10 +91,14 @@ define([
'mockup-patterns-base',
'mockup-patterns-select2',
'mockup-utils',
- 'mockup-patterns-tree'
-], function($, _, Base, Select2, utils, Tree) {
+ 'mockup-patterns-tree',
+ 'mockup-i18n'
+], function($, _, Base, Select2, utils, Tree, i18n) {
'use strict';
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
+
var RelatedItems = Base.extend({
name: 'relateditems',
browsing: false,
@@ -110,9 +114,9 @@ define([
mode: 'search', // possible values are search and browse
closeOnSelect: false,
basePath: '/',
- searchText: 'Search:',
- searchAllText: 'entire site',
- homeText: 'home',
+ searchText: _t('Search:'),
+ searchAllText: _t('entire site'),
+ homeText: _t('home'),
folderTypes: ['Folder'],
selectableTypes: null, // null means everything is selectable, otherwise a list of strings to match types that are selectable
attributes: ['UID', 'Title', 'Type', 'path'],
diff --git a/patterns/tinymce/pattern.js b/patterns/tinymce/pattern.js
index e8aaf77..68a8a39 100644
--- a/patterns/tinymce/pattern.js
+++ b/patterns/tinymce/pattern.js
@@ -119,13 +119,16 @@ define([
'text!mockup-patterns-tinymce-url/templates/result.xml',
'text!mockup-patterns-tinymce-url/templates/selection.xml',
'mockup-utils',
- 'mockup-patterns-tinymce-url/js/links'
+ 'mockup-patterns-tinymce-url/js/links',
+ 'mockup-i18n'
], function($, _,
Base, RelatedItems, Modal, tinymce,
AutoTOC, ResultTemplate, SelectionTemplate,
- utils, LinkModal) {
+ utils, LinkModal, i18n) {
'use strict';
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
var TinyMCE = Base.extend({
name: 'tinymce',
@@ -143,23 +146,23 @@ define([
vocabularyUrl: null,
width: 500,
maximumSelectionSize: 1,
- placeholder: 'Search for item on site...'
+ placeholder: _t('Search for item on site...')
},
text: {
- insertBtn: 'Insert', // so this can be configurable for different languages
- cancelBtn: 'Cancel',
- insertHeading: 'Insert link',
- title: 'Title',
- internal: 'Internal',
- external: 'External',
- email: 'Email',
- anchor: 'Anchor',
- subject: 'Subject',
- image: 'Image',
- imageAlign: 'Align',
- scale: 'Size',
- alt: 'Alternative Text',
- externalImage: 'External Image URI'
+ insertBtn: _t('Insert'), // so this can be configurable for different languages
+ cancelBtn: _t('Cancel'),
+ insertHeading: _t('Insert link'),
+ title: _t('Title'),
+ internal: _t('Internal'),
+ external: _t('External'),
+ email: _t('Email'),
+ anchor: _t('Anchor'),
+ subject: _t('Subject'),
+ image: _t('Image'),
+ imageAlign: _t('Align'),
+ scale: _t('Size'),
+ alt: _t('Alternative Text'),
+ externalImage: _t('External Image URI')
},
// URL generation options
loadingBaseUrl: '../../../bower_components/tinymce-builded/js/tinymce/',
@@ -168,14 +171,14 @@ define([
linkAttribute: 'path', // attribute to get link value from data
prependToScalePart: '/imagescale/', // some value here is required to be able to parse scales back
appendToScalePart: '',
- scales: 'Listing (16x16):listing,Icon (32x32):icon,Tile (64x64):tile,' +
+ scales: _t('Listing (16x16):listing,Icon (32x32):icon,Tile (64x64):tile,' +
'Thumb (128x128):thumb,Mini (200x200):mini,Preview (400x400):preview,' +
- 'Large (768x768):large',
+ 'Large (768x768):large'),
targetList: [
- {text: 'Open in this window / frame', value: ''},
- {text: 'Open in new window', value: '_blank'},
- {text: 'Open in parent window / frame', value: '_parent'},
- {text: 'Open in top frame (replaces all frames)', value: '_top'}
+ {text: _t('Open in this window / frame'), value: ''},
+ {text: _t('Open in new window'), value: '_blank'},
+ {text: _t('Open in parent window / frame'), value: '_parent'},
+ {text: _t('Open in top frame (replaces all frames)'), value: '_top'}
],
imageTypes: 'Image',
folderTypes: 'Folder,Plone Site',
@@ -226,7 +229,7 @@ define([
linkTypes: ['image', 'uploadImage', 'externalImage'],
initialLinkType: 'image',
text: {
- insertHeading: 'Insert Image'
+ insertHeading: _t('Insert Image')
},
relatedItems: {
baseCriteria: [{
diff --git a/patterns/upload/pattern.js b/patterns/upload/pattern.js
index c762b4e..6a7bc9b 100644
--- a/patterns/upload/pattern.js
+++ b/patterns/upload/pattern.js
@@ -64,13 +64,17 @@ define([
'dropzone',
'text!mockup-patterns-upload-url/templates/upload.xml',
'text!mockup-patterns-upload-url/templates/preview.xml',
+ 'mockup-i18n'
], function($, _, Base, RelatedItems, Dropzone,
- UploadTemplate, PreviewTemplate) {
+ UploadTemplate, PreviewTemplate, i18n) {
'use strict';
/* we do not want this plugin to auto discover */
Dropzone.autoDiscover = false;
+ i18n.loadCatalog('widgets');
+ var _t = i18n.MessageFactory('widgets');
+
var UploadPattern = Base.extend({
name: 'upload',
defaults: {
@@ -101,10 +105,11 @@ define([
vocabularyUrl: null,
width: 500,
maximumSelectionSize: 1,
- placeholder: 'Search for item on site...'
+ placeholder: _t('Search for item on site...')
}
},
+ //placeholder: 'Search for item on site...'
init: function() {
var self = this,
template = UploadTemplate;
@@ -114,7 +119,7 @@ define([
self.numFiles = 0;
self.currentFile = 0;
- template = _.template(template);
+ template = _.template(template, {_t: _t});
self.$el.addClass(self.options.className);
self.$el.append(template);
@@ -389,7 +394,7 @@ define([
}).progress(function(e, bytesUploaded, bytesTotal) {
var percentage = (bytesUploaded / bytesTotal * 100);
self.$progress.attr('aria-valuenow', percentage).css('width', percentage + '%');
- self.$progress.html('uploading...<br />' +
+ self.$progress.html(_t('uploading...<br />') +
self.formatBytes(bytesUploaded) +
' / ' + self.formatBytes(bytesTotal));
}).done(function(url, file) {
diff --git a/patterns/upload/templates/upload.xml b/patterns/upload/templates/upload.xml
index d63ae3e..b29f1ef 100644
--- a/patterns/upload/templates/upload.xml
+++ b/patterns/upload/templates/upload.xml
@@ -8,7 +8,7 @@
<div class="fallback">
<input name="file" type="file" multiple />
</div>
- <div class="dz-message"><p>Drop files here...</p></div>
+ <div class="dz-message"><p><%-_t("Drop files here...")%></p></div>
<div class="row">
<div class="col-md-9">
<input
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 27647 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140810/773fc873/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 93836 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140810/773fc873/attachment-0003.obj>
More information about the Testbot
mailing list