Merge pull request #1734 from emanuelschuetze/fixTranslationAgendaSupplement

Fixed translations in agendaSupplement.

openslides/agenda/static/js/agenda/base.js

@@ -26,7 +26,8 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users'])
     'Speaker',
     'jsDataModel',
     'Projector',
-    function(DS, Speaker, jsDataModel, Projector) {
+    'gettextCatalog',
+    function(DS, Speaker, jsDataModel, Projector, gettextCatalog) {
         var name = 'agenda/item';
         return DS.defineResource({
             name: name,
@@ -50,11 +51,10 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users'])
                         // in the DS store.
                         title = this.title;
                     }
-                    return _.trim(
+                    if (this.getContentResource().agendaSupplement) {
-                        title + ' ' + (
+                        title = title + ' (' + gettextCatalog.getString(this.getContentResource().agendaSupplement) + ')';
-                            this.getContentResource().agendaSupplement || ''
+                    }
-                        )
+                    return title;
-                    );
                 },
                 isProjected: function () {
                     var projector = Projector.get(1);

openslides/assignments/static/js/assignments/base.js

@@ -77,7 +77,7 @@ angular.module('OpenSlidesApp.assignments', [])
         return DS.defineResource({
             name: name,
             useClass: jsDataModel,
-            agendaSupplement: '(' + gettext('Election') + ')',
+            agendaSupplement: gettext('Election'),
             methods: {
                 getResourceName: function () {
                     return name;

openslides/core/static/js/core/site.js

@@ -450,9 +450,9 @@ angular.module('OpenSlidesApp.core.site', [
 
 // Provide generic customslide form fields for create and update view
 .factory('CustomslideFormFieldFactory', [
-    'gettext',
+    'gettextCatalog',
     'CKEditorOptions',
-    function (gettext, CKEditorOptions) {
+    function (gettextCatalog, CKEditorOptions) {
         return {
             getFormFields: function () {
                 return [
@@ -460,7 +460,7 @@ angular.module('OpenSlidesApp.core.site', [
                     key: 'title',
                     type: 'input',
                     templateOptions: {
-                        label: gettext('Title'),
+                        label: gettextCatalog.getString('Title'),
                         required: true
                     }
                 },
@@ -468,7 +468,7 @@ angular.module('OpenSlidesApp.core.site', [
                     key: 'text',
                     type: 'textarea',
                     templateOptions: {
-                        label: gettext('Text')
+                        label: gettextCatalog.getString('Text')
                     },
                     ngModelElAttrs: {'ckeditor': 'CKEditorOptions'}
                 }];

openslides/motions/static/js/motions/base.js

@@ -168,7 +168,7 @@ angular.module('OpenSlidesApp.motions', ['OpenSlidesApp.users'])
         return DS.defineResource({
             name: name,
             useClass: jsDataModel,
-            agendaSupplement: '(' + gettext('Motion') + ')',
+            agendaSupplement: gettext('Motion'),
             methods: {
                 getResourceName: function () {
                     return name;

openslides/motions/static/templates/motions/motion-list.html

@@ -71,7 +71,7 @@
   </div>
 
   <i class="spacer">
-    {{ motions.length }} {{ "motion" | translate }}<span ng-if="(motions|filter:{selected:true}).length > 0">,
+    {{ motions.length }} {{ "motions" | translate }}<span ng-if="(motions|filter:{selected:true}).length > 0">,
     {{(motions|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
   </i>
   <table class="table table-striped table-bordered table-hover">