From cb605d619e202263dc10c9953683df58f439bc2f Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sun, 3 Apr 2016 11:53:40 +0200 Subject: [PATCH 1/3] Mark missing translation string. --- openslides/core/static/js/core/site.js | 4 +++- openslides/core/static/templates/index.html | 2 +- .../locale/angular-gettext/template-en.pot | 16 ++++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js index 2016c624a..62ee12aa4 100644 --- a/openslides/core/static/js/core/site.js +++ b/openslides/core/static/js/core/site.js @@ -429,7 +429,9 @@ angular.module('OpenSlidesApp.core.site', [ .directive('routeLoadingIndicator', [ '$rootScope', '$state', - function($rootScope, $state) { + 'gettext', + function($rootScope, $state, gettext) { + gettext('Loading ...'); return { restrict: 'E', template: "

Loading ...

", diff --git a/openslides/core/static/templates/index.html b/openslides/core/static/templates/index.html index 0061c4b11..4c83fca39 100644 --- a/openslides/core/static/templates/index.html +++ b/openslides/core/static/templates/index.html @@ -128,7 +128,7 @@ -
+
  • diff --git a/openslides/locale/angular-gettext/template-en.pot b/openslides/locale/angular-gettext/template-en.pot index 18196652d..f3187727f 100644 --- a/openslides/locale/angular-gettext/template-en.pot +++ b/openslides/locale/angular-gettext/template-en.pot @@ -140,7 +140,7 @@ msgid "" " other fields are optional and may be empty." msgstr "" -#: core/static/js/core/site.js:609 +#: core/static/js/core/site.js:611 #: motions/static/js/motions/site.js:281 msgid "Attachment" msgstr "" @@ -717,7 +717,7 @@ msgstr "" msgid "Identifier, reason, submitter and category are optional and may be empty." msgstr "" -#: core/static/js/core/site.js:620 +#: core/static/js/core/site.js:622 msgid "If deactivated it appears as internal item on agenda." msgstr "" @@ -852,6 +852,10 @@ msgstr "" msgid "Live view" msgstr "" +#: core/static/js/core/site.js:434 +msgid "Loading ..." +msgstr "" + #: core/static/templates/core/login-form.html:20 #: index.html:101 msgid "Login" @@ -1369,7 +1373,7 @@ msgstr "" msgid "Select or search a workflow ..." msgstr "" -#: core/static/js/core/site.js:612 +#: core/static/js/core/site.js:614 #: motions/static/js/motions/site.js:284 msgid "Select or search an attachment ..." msgstr "" @@ -1395,7 +1399,7 @@ msgstr "" #: agenda/static/templates/agenda/item-list.html:216 #: assignments/static/js/assignments/site.js:164 -#: core/static/js/core/site.js:619 +#: core/static/js/core/site.js:621 #: motions/static/js/motions/site.js:264 msgid "Show as agenda item" msgstr "" @@ -1510,7 +1514,7 @@ msgid "Tags" msgstr "" #: agenda/static/templates/agenda/item-import.html:83 -#: core/static/js/core/site.js:599 +#: core/static/js/core/site.js:601 #: motions/static/js/motions/site.js:234 #: motions/static/templates/motions/motion-detail.html:227 #: motions/static/templates/motions/motion-import.html:56 @@ -1530,7 +1534,7 @@ msgstr "" #: assignments/static/js/assignments/site.js:133 #: assignments/static/templates/assignments/assignment-list.html:172 #: assignments/static/templates/assignments/assignment-list.html:97 -#: core/static/js/core/site.js:591 +#: core/static/js/core/site.js:593 #: mediafiles/static/templates/mediafiles/mediafile-form.html:20 #: mediafiles/static/templates/mediafiles/mediafile-list.html:140 #: motions/static/js/motions/site.js:226 From c2230c0251ed78cd9618bf8f815246ebd5561211 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Tue, 5 Apr 2016 20:01:16 +0200 Subject: [PATCH 2/3] Added missing en.js for tinyMCE. (Fixes #2067) --- gulpfile.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 051cc57da..2ba192360 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -83,6 +83,7 @@ gulp.task('tinymce-skins', function () { // Catches all required i18n files for TinyMCE editor. gulp.task('tinymce-i18n', function () { return gulp.src([ + 'bower_components/tinymce-i18n/langs/en_GB.js', 'bower_components/tinymce-i18n/langs/cs.js', 'bower_components/tinymce-i18n/langs/de.js', 'bower_components/tinymce-i18n/langs/es.js', @@ -90,7 +91,9 @@ gulp.task('tinymce-i18n', function () { 'bower_components/tinymce-i18n/langs/pt_PT.js', ]) .pipe(rename(function (path) { - if (path.basename === 'fr_FR') { + if (path.basename === 'en_GB') { + path.basename = 'en'; + } else if (path.basename === 'fr_FR') { path.basename = 'fr'; } else if (path.basename === 'pt_PT') { path.basename = 'pt'; From 3c59f1f75c2b3bfd1a6fa04bab4b44b78b50def1 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 6 Apr 2016 22:02:09 +0200 Subject: [PATCH 3/3] Set angular-ui-tinymce to v0.0.14 (Fixes #2069). --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 7ab911d9f..1300c33b6 100644 --- a/bower.json +++ b/bower.json @@ -17,7 +17,7 @@ "angular-sanitize": "~1.4.9", "angular-scroll-glue": "~2.0.6", "angular-ui-router": "~0.2.17", - "angular-ui-tinymce": "~0.0.13", + "angular-ui-tinymce": "0.0.14", "angular-ui-tree": "~2.5.0", "bootstrap-css-only": "~3.3.6", "font-awesome-bower": "~4.5.0",