From b0c94888ce1118f29664e321a271d31563f4791f Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Tue, 29 Nov 2016 11:46:38 +0100 Subject: [PATCH] Translate default projector (closes #2531) --- .../static/templates/agenda/current-list-of-speakers.html | 2 +- openslides/agenda/static/templates/agenda/item-detail.html | 2 +- openslides/agenda/static/templates/agenda/item-list.html | 4 ++-- openslides/core/static/js/core/projector.js | 2 +- openslides/core/static/js/core/site.js | 3 +++ .../core/static/templates/core/manage-projectors.html | 6 +++--- .../core/static/templates/core/projector-controls.html | 4 ++-- openslides/core/static/templates/projector-button.html | 2 +- .../static/templates/mediafiles/mediafile-list.html | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/openslides/agenda/static/templates/agenda/current-list-of-speakers.html b/openslides/agenda/static/templates/agenda/current-list-of-speakers.html index 4610c8eac..92d93c501 100644 --- a/openslides/agenda/static/templates/agenda/current-list-of-speakers.html +++ b/openslides/agenda/static/templates/agenda/current-list-of-speakers.html @@ -32,7 +32,7 @@ - {{ projector.name }} + {{ projector.name | translate }} (Default) diff --git a/openslides/agenda/static/templates/agenda/item-detail.html b/openslides/agenda/static/templates/agenda/item-detail.html index 85f9128e2..66e596c67 100644 --- a/openslides/agenda/static/templates/agenda/item-detail.html +++ b/openslides/agenda/static/templates/agenda/item-detail.html @@ -31,7 +31,7 @@ - {{ projector.name }} + {{ projector.name | translate }} (Default) diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html index 5404f5991..71f93c6e8 100644 --- a/openslides/agenda/static/templates/agenda/item-list.html +++ b/openslides/agenda/static/templates/agenda/item-list.html @@ -48,7 +48,7 @@ - {{ projector.name }} + {{ projector.name | translate }} (Default) @@ -193,7 +193,7 @@ - {{ projector.name }} + {{ projector.name | translate }} (Default) diff --git a/openslides/core/static/js/core/projector.js b/openslides/core/static/js/core/projector.js index 5b60097d6..c2e2583cc 100644 --- a/openslides/core/static/js/core/projector.js +++ b/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'); diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js index b34698bb0..eef923343 100644 --- a/openslides/core/static/js/core/site.js +++ b/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'); } ]); diff --git a/openslides/core/static/templates/core/manage-projectors.html b/openslides/core/static/templates/core/manage-projectors.html index 8e1aa4574..1dbc57fbe 100644 --- a/openslides/core/static/templates/core/manage-projectors.html +++ b/openslides/core/static/templates/core/manage-projectors.html @@ -20,7 +20,7 @@
  • - {{ projector.name }} + {{ projector.name | translate }}
  • @@ -43,7 +43,7 @@
    {{ projector.id }}: - {{ projector.name }} + {{ projector.name | translate }}
    @@ -66,7 +66,7 @@ diff --git a/openslides/core/static/templates/projector-button.html b/openslides/core/static/templates/projector-button.html index d79825e6f..4643d5115 100644 --- a/openslides/core/static/templates/projector-button.html +++ b/openslides/core/static/templates/projector-button.html @@ -19,7 +19,7 @@ - {{ projector.name }} + {{ projector.name | translate }} (Default) diff --git a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html index eb76e3c05..90b9367b3 100644 --- a/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html +++ b/openslides/mediafiles/static/templates/mediafiles/mediafile-list.html @@ -268,7 +268,7 @@ - {{ projector.name }} + {{ projector.name | translate }} (Default)