Merge pull request #2698 from FinnStutzenstein/Issue2531

Translate default projector (closes #2531)

openslides/agenda/static/templates/agenda/current-list-of-speakers.html

@@ -32,7 +32,7 @@
             <a href="" ng-click="projectCurrentLoS(projector.id)"
               ng-class="{ 'projected': inArray(isCurrentLoSProjected(), projector.id) }">
               <i class="fa fa-video-camera" ng-show="inArray(isCurrentLoSProjected(), projector.id) "></i>
-              {{ projector.name }}
+              {{ projector.name | translate }}
               <span ng-if="projector.id == defaultProjectorId">(<translate>Default</translate>)</span>
             </a>
           </li>

openslides/agenda/static/templates/agenda/item-detail.html

@@ -31,7 +31,7 @@
             <a href="" ng-click="item.projectListOfSpeakers(projector.id)"
               ng-class="{ 'projected': inArray(item.isListOfSpeakersProjected(), projector.id) }">
               <i class="fa fa-video-camera" ng-show="inArray(item.isListOfSpeakersProjected(), projector.id) "></i>
-              {{ projector.name }}
+              {{ projector.name | translate }}
               <span ng-if="defaultProjectorListOfSpeakersId == projector.id">(<translate>Default</translate>)</span>
             </a>
           </li>

openslides/agenda/static/templates/agenda/item-list.html

@@ -48,7 +48,7 @@
             <a href="" ng-click="projectAgenda(projectorId=projector.id, tree=mainListTree)"
               ng-class="{ 'projected': inArray(isAgendaProjected(mainListTree), projector.id) }">
               <i class="fa fa-video-camera" ng-show="inArray(isAgendaProjected(mainListTree), projector.id) "></i>
-              {{ projector.name }}
+              {{ projector.name | translate }}
               <span ng-if="projector.id == defaultProjectorId_all_items">(<translate>Default</translate>)</span>
             </a>
           </li>
@@ -193,7 +193,7 @@
                 <a href="" ng-click="item.project(projector.id, item.tree)"
                   ng-class="{ 'projected': inArray(item.isProjected(item.tree), projector.id) }">
                   <i class="fa fa-video-camera" ng-show="inArray(item.isProjected(item.tree), projector.id)"></i>
-                  {{ projector.name }}
+                  {{ projector.name | translate }}
                   <span ng-if="projector.id == getProjectionDefault(item)">(<translate>Default</translate>)</span>
                 </a>
               </li>

openslides/core/static/js/core/projector.js

@@ -263,7 +263,7 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
 
         if ($scope.element.identify) {
             var projector = Projector.get(ProjectorID());
-            $scope.identifyMessage = gettextCatalog.getString('Projector') + ' ' + projector.id + ': ' + projector.name; 
+            $scope.identifyMessage = gettextCatalog.getString('Projector') + ' ' + projector.id + ': ' + gettextCatalog.getString(projector.name);
         } else {
             $scope.message = ProjectorMessage.get(id);
             ProjectorMessage.bindOne(id, $scope, 'message');

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

@@ -1442,6 +1442,9 @@ angular.module('OpenSlidesApp.core.site', [
         gettext('Predefined seconds of new countdowns');
         gettext('Color for blanked projector');
         gettext('List of speakers overlay');
+
+        // Mark the string 'Default projector' here, because it does not appear in the templates.
+        gettext('Default projector');
     }
 ]);
 

openslides/core/static/templates/core/manage-projectors.html

@@ -20,7 +20,7 @@
           <li ng-repeat="projector in projectors">
             <a href ng-click="setListOfSpeakers(projector)">
               <i class="fa fa-check" ng-if="projector.id == currentListOfSpeakers"></i>
-              {{ projector.name }}
+              {{ projector.name | translate }}
             </a>
           </li>
         </ul>
@@ -43,7 +43,7 @@
       <div>
         <a ui-sref="projector({id: projector.id})">
           {{ projector.id }}:
-          <strong>{{ projector.name }}</strong>
+          <strong>{{ projector.name | translate }}</strong>
         </a>
         <a href="" class="pull-right" ng-click="edit[projector.id] = !edit[projector.id]"><i class="fa" ng-class="edit[projector.id] ? 'fa-times' : 'fa-pencil'"></i></a>
       </div>
@@ -66,7 +66,7 @@
           <button type="button" class="btn btn-danger btn-sm"
             ng-hide="projector.id==1"
             ng-bootbox-confirm="{{ 'Are you sure you want to delete this entry?' | translate }}<br>
-            <b>{{ projector.name }}</b>"
+            <b>{{ projector.name | translate }}</b>"
             ng-bootbox-confirm-action="deleteProjector(projector)">
             <i class="fa fa-trash"></i>
             <translate>Delete</translate>

openslides/core/static/templates/core/projector-controls.html

@@ -34,7 +34,7 @@
             <div class="dropdown" ng-show="projectors.length > 1">
               <button class="btn btn-default btn-sm dropdown-toggle" id="menuProjector" data-toggle="dropdown"
                 aria-haspopup="true" aria-expanded="true">
-                {{ active_projector.name }}
+                {{ active_projector.name | translate }}
                 <span class="caret"></span>
               </button>
               <ul class="dropdown-menu dropdown-entries" aria-labelledby="menuProjector">
@@ -42,7 +42,7 @@
                   ng-class="{'projected': projector === active_projector}"
                   ng-click="changeProjector(projector)">
                   <i ng-show="projector === active_projector" class="fa fa-check"></i>
-                  {{ projector.name }}
+                  {{ projector.name | translate }}
                   <i ng-show="projector.id == broadcast" class="fa fa-star-o spacer-left"></i>
                 </li>
               </ul>

openslides/core/static/templates/projector-button.html

@@ -19,7 +19,7 @@
       <a href="" ng-click="model.project(projector.id, arg)"
         ng-class="{ 'projected': inArray(model.isProjected(arg), projector.id) }">
         <i class="fa fa-video-camera" ng-show="inArray(model.isProjected(arg), projector.id)"></i>
-        {{ projector.name }}
+        {{ projector.name | translate }}
         <span ng-if="defaultProjectorId == projector.id">(<translate>Default</translate>)</span>
       </a>
     </li>

openslides/mediafiles/static/templates/mediafiles/mediafile-list.html

@@ -268,7 +268,7 @@
               <a href="" ng-click="showMediafile(projector.id, mediafile)"
                 ng-class="{ 'projected': inArray(mediafile.isProjected(), projector.id)  }">
                 <i class="fa fa-video-camera" ng-show="inArray(mediafile.isProjected(), projector.id) "></i>
-                {{ projector.name }}
+                {{ projector.name | translate }}
                 <span ng-if="defaultProjectorId == projector.id">(<translate>Default</translate>)</span>
               </a>
             </li>