From 4b124a629b7e6146433301fd29fd0719947fe1aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Tue, 1 Nov 2016 23:30:54 +0100
Subject: [PATCH] Fixed translation issues.

---
 openslides/core/static/js/core/site.js        | 16 +++++++------
 .../static/templates/config-form-field.html   |  4 ++--
 openslides/motions/config_variables.py        |  2 +-
 .../templates/motions/category-sort.html      |  2 +-
 .../templates/motions/motion-detail.html      | 24 ++++++++++---------
 openslides/users/static/js/users/site.js      |  1 +
 6 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index 0124eaf15..4f77d8b59 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -467,19 +467,21 @@ angular.module('OpenSlidesApp.core.site', [
                 var config = Config.get(field.key);
                 $scope.type = getHtmlType(field.input_type);
                 if ($scope.type == 'choice') {
-                    $scope.choices = [];
-                    angular.forEach(field.choices, function(choice) {
-                        choice.display_name = gettextCatalog.getString(choice.display_name);
-                        $scope.choices.push(choice);
-                    });
+                    $scope.choices = field.choices;
+                    $scope.value = config.value;
+                } else {
+                    $scope.value = gettextCatalog.getString(config.value);
                 }
                 $scope.label = field.label;
                 $scope.key = 'field-' + field.key;
-                $scope.value = gettextCatalog.getString(config.value);
                 $scope.help_text = field.help_text;
                 $scope.default_value = field.default_value;
                 $scope.reset = function () {
-                    $scope.value = gettextCatalog.getString($scope.default_value);
+                    if ($scope.type == 'choice') {
+                        $scope.value = $scope.default_value;
+                    } else {
+                        $scope.value = gettextCatalog.getString($scope.default_value);
+                    }
                     $scope.save(field.key, $scope.value);
                 };
             }
diff --git a/openslides/core/static/templates/config-form-field.html b/openslides/core/static/templates/config-form-field.html
index bb5d6f349..621b5d2fc 100644
--- a/openslides/core/static/templates/config-form-field.html
+++ b/openslides/core/static/templates/config-form-field.html
@@ -76,8 +76,8 @@
             ng-model="$parent.value"
             ng-model-options="{debounce: 500}"
             ng-change="save(configOption.key, $parent.value)"
-            id="{{ key }}"
-        class="form-control" ng-options="option.value as option.display_name for option in choices">
+            id="{{ key }}" class="form-control"
+            ng-options="option.value as option.display_name | translate for option in choices">
     </select>
 
     <span class="input-group-btn">
diff --git a/openslides/motions/config_variables.py b/openslides/motions/config_variables.py
index 8c67dc4cf..98b5571ec 100644
--- a/openslides/motions/config_variables.py
+++ b/openslides/motions/config_variables.py
@@ -64,7 +64,7 @@ def get_config_variables():
         choices=(
             {'value': 'outside', 'display_name': 'Outside'},
             {'value': 'inline', 'display_name': 'Inline'},
-            {'value': 'none', 'display_name': 'None'}),
+            {'value': 'none', 'display_name': 'Disabled'}),
         weight=322,
         group='Motions',
         subgroup='General')
diff --git a/openslides/motions/static/templates/motions/category-sort.html b/openslides/motions/static/templates/motions/category-sort.html
index 075070b39..57da8b2c0 100644
--- a/openslides/motions/static/templates/motions/category-sort.html
+++ b/openslides/motions/static/templates/motions/category-sort.html
@@ -13,7 +13,7 @@
 <div class="details">
   <div class="lead-div">
     <p class="lead" translate>
-      Drag and drop motions to reorder the category and when finished, renumber them.
+      Drag and drop motions to reorder the category. Then click the button to renumber.
     </p>
     <a os-perms="motions.can_manage" class="btn btn-primary btn-sm" ng-click="numbering()">
       <i class="fa fa-sort-numeric-asc fa-lg"></i>
diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html
index 4ba4a5264..baf15cf90 100644
--- a/openslides/motions/static/templates/motions/motion-detail.html
+++ b/openslides/motions/static/templates/motions/motion-detail.html
@@ -202,7 +202,7 @@
                 <div class="input-group">
                   <span><translate>Required majority</translate>: </span>
                   <select ng-init="config('motions_poll_default_majority_method')" ng-model="$parent.method"
-                      ng-options="option.value as option.display_name for option in methodChoices" />
+                      ng-options="option.value as option.display_name | translate for option in methodChoices" />
                 </div>
               </div>
 
@@ -387,16 +387,18 @@
       </div>
 
       <!-- log -->
-      <button type="button" class="btn btn-sm btn-default spacer" ng-click="isCollapsed = !isCollapsed" translate>
-        Show history
-      </button>
-      <div uib-collapse="isCollapsed">
-        <div class="well well-sm">
-          <ul class="list-unstyled">
-            <li ng-repeat="message in motion.log_messages">
-              <small>{{ message.message }}</small>
-            </li>
-          </ul>
+      <div os-perms="motions.can_manage">
+        <button type="button" class="btn btn-sm btn-default spacer" ng-click="isCollapsed = !isCollapsed" translate>
+          Show history
+        </button>
+        <div uib-collapse="isCollapsed">
+          <div class="well well-sm">
+            <ul class="list-unstyled">
+              <li ng-repeat="message in motion.log_messages">
+                <small>{{ message.message }}</small>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </div>
diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js
index 1beb73e49..df2642289 100644
--- a/openslides/users/static/js/users/site.js
+++ b/openslides/users/static/js/users/site.js
@@ -1345,6 +1345,7 @@ angular.module('OpenSlidesApp.users.site', [
         gettext('Can manage tags');
         gettext('Can manage configuration');
         gettext('Can use the chat');
+        gettext('Can manage the chat');
         // mediafiles
         gettext('Can see the list of files');
         gettext('Can upload files');