Merge pull request #2698 from FinnStutzenstein/Issue2531

Translate default projector (closes #2531)
This commit is contained in:
Emanuel Schütze 2016-12-01 11:02:02 +01:00 committed by GitHub
commit 9dd44edb9e
9 changed files with 15 additions and 12 deletions

View File

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

View File

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

View File

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

View File

@ -263,7 +263,7 @@ angular.module('OpenSlidesApp.core.projector', ['OpenSlidesApp.core'])
if ($scope.element.identify) { if ($scope.element.identify) {
var projector = Projector.get(ProjectorID()); 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 { } else {
$scope.message = ProjectorMessage.get(id); $scope.message = ProjectorMessage.get(id);
ProjectorMessage.bindOne(id, $scope, 'message'); ProjectorMessage.bindOne(id, $scope, 'message');

View File

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

View File

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

View File

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

View File

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

View File

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