From d7b092300defd6a812f955266d2b558d5934265c Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 5 Sep 2016 23:13:07 +0200
Subject: [PATCH] Fixed missing translation and form errors.

---
 .../static/templates/assignments/assignment-detail.html      | 2 +-
 .../static/templates/assignments/assignment-form.html        | 2 +-
 .../static/templates/assignments/slide_assignment.html       | 2 +-
 openslides/core/static/templates/core/customslide-form.html  | 2 +-
 .../static/templates/mediafiles/mediafile-form.html          | 2 +-
 openslides/motions/static/js/motions/site.js                 | 5 +++--
 openslides/motions/static/templates/motions/motion-form.html | 2 +-
 .../motions/static/templates/motions/slide_motion.html       | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/openslides/assignments/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html
index d688f14db..3a83e6dc0 100644
--- a/openslides/assignments/static/templates/assignments/assignment-detail.html
+++ b/openslides/assignments/static/templates/assignments/assignment-detail.html
@@ -68,7 +68,7 @@
           <div os-perms="assignments.can_manage" class="spacer">
             <select ng-model="phaseSelect" class="form-control" ng-change="updatePhase(phaseSelect)">
               <option value="" translate>--- Set phase ---</option>
-              <option ng-repeat="phase in phases" value="{{ phase.value }}">{{ phase.display_name }}</option>
+              <option ng-repeat="phase in phases" value="{{ phase.value }}">{{ phase.display_name | translate }}</option>
             </select>
           </div>
       </div>
diff --git a/openslides/assignments/static/templates/assignments/assignment-form.html b/openslides/assignments/static/templates/assignments/assignment-form.html
index 60fd97b94..a8174b388 100644
--- a/openslides/assignments/static/templates/assignments/assignment-form.html
+++ b/openslides/assignments/static/templates/assignments/assignment-form.html
@@ -10,7 +10,7 @@
     <button type="submit" ng-disabled="assignmentForm.$invalid" class="btn btn-primary" translate>
       Save
     </button>
-    <button ng-click="closeThisDialog()" class="btn btn-default" translate>
+    <button type="button" ng-click="closeThisDialog()" class="btn btn-default" translate>
       Cancel
     </button>
   </formly-form>
diff --git a/openslides/assignments/static/templates/assignments/slide_assignment.html b/openslides/assignments/static/templates/assignments/slide_assignment.html
index cf84064d5..7e78233f5 100644
--- a/openslides/assignments/static/templates/assignments/slide_assignment.html
+++ b/openslides/assignments/static/templates/assignments/slide_assignment.html
@@ -3,7 +3,7 @@
   <div id="sidebox">
     <!-- Phase -->
     <h3 translate>State</h3>
-    {{ phases[assignment.phase].display_name }}
+    {{ phases[assignment.phase].display_name | translate }}
 
     <!-- Posts -->
     <h3 translate>Posts</h3>
diff --git a/openslides/core/static/templates/core/customslide-form.html b/openslides/core/static/templates/core/customslide-form.html
index 48257ac1a..50e9bde34 100644
--- a/openslides/core/static/templates/core/customslide-form.html
+++ b/openslides/core/static/templates/core/customslide-form.html
@@ -10,7 +10,7 @@
     <button type="submit" ng-disabled="customslideForm.$invalid" class="btn btn-primary" translate>
       Save
     </button>
-    <button ng-click="closeThisDialog()" class="btn btn-default" translate>
+    <button type="button" ng-click="closeThisDialog()" class="btn btn-default" translate>
       Cancel
     </button>
   </formly-form>
diff --git a/openslides/mediafiles/static/templates/mediafiles/mediafile-form.html b/openslides/mediafiles/static/templates/mediafiles/mediafile-form.html
index 8ce2356d7..2c4e9404a 100644
--- a/openslides/mediafiles/static/templates/mediafiles/mediafile-form.html
+++ b/openslides/mediafiles/static/templates/mediafiles/mediafile-form.html
@@ -42,7 +42,7 @@
   <button type="submit" ng-disabled="mediafileForm.$invalid" class="btn btn-primary" translate>
     Save
   </button>
-  <button ng-click="closeThisDialog()" class="btn btn-default" translate>
+  <button type="button" ng-click="closeThisDialog()" class="btn btn-default" translate>
     Cancel
   </button>
 </form>
diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js
index 9b37765c3..a33436746 100644
--- a/openslides/motions/static/js/motions/site.js
+++ b/openslides/motions/static/js/motions/site.js
@@ -1056,6 +1056,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid
     '$scope',
     '$state',
     'gettext',
+    'gettextCatalog',
     'Motion',
     'MotionForm',
     'Category',
@@ -1066,7 +1067,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid
     'Workflow',
     'Agenda',
     'AgendaUpdate',
-    function($scope, $state, gettext, Motion, MotionForm, Category, Config, Mediafile, Tag, User, Workflow, Agenda, AgendaUpdate) {
+    function($scope, $state, gettext, gettextCatalog, Motion, MotionForm, Category, Config, Mediafile, Tag, User, Workflow, Agenda, AgendaUpdate) {
         Category.bindAll({}, $scope, 'categories');
         Mediafile.bindAll({}, $scope, 'mediafiles');
         Tag.bindAll({}, $scope, 'tags');
@@ -1080,7 +1081,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid
 
         // Set default values for create form
         // ... set preamble config value as text
-        $scope.model.text = Config.get('motions_preamble').value;
+        $scope.model.text = gettextCatalog.getString(Config.get('motions_preamble').value);
         // ... for amendments add parent_id
         if (isAmendment) {
             if (Config.get('motions_amendments_apply_title_text').value) {
diff --git a/openslides/motions/static/templates/motions/motion-form.html b/openslides/motions/static/templates/motions/motion-form.html
index eac2c5d64..2001241d1 100644
--- a/openslides/motions/static/templates/motions/motion-form.html
+++ b/openslides/motions/static/templates/motions/motion-form.html
@@ -11,7 +11,7 @@
     <button type="submit" ng-disabled="motionForm.$invalid" class="btn btn-primary" translate>
       Save
     </button>
-    <button ng-click="closeThisDialog()" class="btn btn-default" translate>
+    <button type="button" ng-click="closeThisDialog()" class="btn btn-default" translate>
       Cancel
     </button>
   </formly-form>
diff --git a/openslides/motions/static/templates/motions/slide_motion.html b/openslides/motions/static/templates/motions/slide_motion.html
index 32db12bea..3e263c7d1 100644
--- a/openslides/motions/static/templates/motions/slide_motion.html
+++ b/openslides/motions/static/templates/motions/slide_motion.html
@@ -12,7 +12,7 @@
     </div>
 
     <!-- Poll results -->
-    <h3 ng-if="motion.polls.length > 0" translate>Voting result</h3>
+    <h3 ng-if="motion.polls.length > 0 && motion.polls[0].has_votes" translate>Voting result</h3>
       <div ng-repeat="poll in motion.polls | orderBy:'-id'" class="spacer">
         <div ng-show="poll.has_votes" class="pollresults">
           <strong ng-if="motion.polls.length > 1">