ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2567 from emanuelschuetze/fix-translation-strings

Browse Source 
Fixed translation issues.
This commit is contained in:
Norman Jäckel 2016-11-01 23:58:43 +01:00 committed by GitHub
commit 50868d1432
6 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openslides/core/static/js/core/site.js
View File

@ -467,19 +467,21 @@ angular.module('OpenSlidesApp.core.site', [
var config = Config.get(field.key); var config = Config.get(field.key);
$scope.type = getHtmlType(field.input_type); $scope.type = getHtmlType(field.input_type);
if ($scope.type == 'choice') { if ($scope.type == 'choice') {
$scope.choices = []; $scope.choices = field.choices;
angular.forEach(field.choices, function(choice) { $scope.value = config.value;
choice.display_name = gettextCatalog.getString(choice.display_name); } else {
$scope.choices.push(choice); $scope.value = gettextCatalog.getString(config.value);
});
} }
$scope.label = field.label; $scope.label = field.label;
$scope.key = 'field-' + field.key; $scope.key = 'field-' + field.key;
$scope.value = gettextCatalog.getString(config.value);
$scope.help_text = field.help_text; $scope.help_text = field.help_text;
$scope.default_value = field.default_value; $scope.default_value = field.default_value;
$scope.reset = function () { $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); $scope.save(field.key, $scope.value);
}; };
} }

4
openslides/core/static/templates/config-form-field.html
View File

@ -76,8 +76,8 @@
ng-model="$parent.value" ng-model="$parent.value"
ng-model-options="{debounce: 500}" ng-model-options="{debounce: 500}"
ng-change="save(configOption.key, $parent.value)" ng-change="save(configOption.key, $parent.value)"
id="{{ key }}" id="{{ key }}" class="form-control"
class="form-control" ng-options="option.value as option.display_name for option in choices"> ng-options="option.value as option.display_name | translate for option in choices">
</select> </select>
<span class="input-group-btn"> <span class="input-group-btn">

2
openslides/motions/config_variables.py
View File

@ -64,7 +64,7 @@ def get_config_variables():
choices=( choices=(
{'value': 'outside', 'display_name': 'Outside'}, {'value': 'outside', 'display_name': 'Outside'},
{'value': 'inline', 'display_name': 'Inline'}, {'value': 'inline', 'display_name': 'Inline'},
{'value': 'none', 'display_name': 'None'}), {'value': 'none', 'display_name': 'Disabled'}),
weight=322, weight=322,
group='Motions', group='Motions',
subgroup='General') subgroup='General')

2
openslides/motions/static/templates/motions/category-sort.html
View File

@ -13,7 +13,7 @@
<div class="details"> <div class="details">
<div class="lead-div"> <div class="lead-div">
<p class="lead" translate> <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> </p>
<a os-perms="motions.can_manage" class="btn btn-primary btn-sm" ng-click="numbering()"> <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> <i class="fa fa-sort-numeric-asc fa-lg"></i>

24
openslides/motions/static/templates/motions/motion-detail.html
View File

@ -202,7 +202,7 @@
<div class="input-group"> <div class="input-group">
<span><translate>Required majority</translate>: </span> <span><translate>Required majority</translate>: </span>
<select ng-init="config('motions_poll_default_majority_method')" ng-model="$parent.method" <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>
</div> </div>
@ -387,16 +387,18 @@
</div> </div>
<!-- log --> <!-- log -->
<button type="button" class="btn btn-sm btn-default spacer" ng-click="isCollapsed = !isCollapsed" translate> <div os-perms="motions.can_manage">
Show history <button type="button" class="btn btn-sm btn-default spacer" ng-click="isCollapsed = !isCollapsed" translate>
</button> Show history
<div uib-collapse="isCollapsed"> </button>
<div class="well well-sm"> <div uib-collapse="isCollapsed">
<ul class="list-unstyled"> <div class="well well-sm">
<li ng-repeat="message in motion.log_messages"> <ul class="list-unstyled">
<small>{{ message.message }}</small> <li ng-repeat="message in motion.log_messages">
</li> <small>{{ message.message }}</small>
</ul> </li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>

1
openslides/users/static/js/users/site.js
View File

@ -1345,6 +1345,7 @@ angular.module('OpenSlidesApp.users.site', [
gettext('Can manage tags'); gettext('Can manage tags');
gettext('Can manage configuration'); gettext('Can manage configuration');
gettext('Can use the chat'); gettext('Can use the chat');
gettext('Can manage the chat');
// mediafiles // mediafiles
gettext('Can see the list of files'); gettext('Can see the list of files');
gettext('Can upload files'); gettext('Can upload files');