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

Fix translation strings in motions and users forms.

Browse Source
This commit is contained in:
Emanuel Schuetze 2016-03-19 13:06:36 +01:00
parent 0cd6bb272c
commit 5e08e073f4
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/core/static/css/app.css
View File

@ -760,7 +760,7 @@ img {
box-shadow: -5px 5px 5px rgba(0, 0, 0, 0.2); box-shadow: -5px 5px 5px rgba(0, 0, 0, 0.2);
height: 200px; height: 200px;
padding: 0 10px 10px 10px; padding: 0 10px 10px 10px;
z-index: 1; z-index: 10;
} }
#chatbox-text { #chatbox-text {

5
openslides/motions/static/js/motions/site.js
View File

@ -189,9 +189,6 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
// angular-formly fields for motion form // angular-formly fields for motion form
getFormFields: function () { getFormFields: function () {
var workflows = Workflow.getAll(); var workflows = Workflow.getAll();
angular.forEach(workflows, function(workflow) {
workflow.name = gettextCatalog.getString(workflow.name);
});
var images = Mediafile.getAllImages(); var images = Mediafile.getAllImages();
return [ return [
{ {
@ -319,7 +316,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
label: gettextCatalog.getString('Workflow'), label: gettextCatalog.getString('Workflow'),
optionsAttr: 'bs-options', optionsAttr: 'bs-options',
options: workflows, options: workflows,
ngOptions: 'option.id as option.name for option in to.options', ngOptions: 'option.id as option.name | translate for option in to.options',
placeholder: gettextCatalog.getString('Select or search a workflow ...') placeholder: gettextCatalog.getString('Select or search a workflow ...')
}, },
hideExpression: '!model.more', hideExpression: '!model.more',

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

@ -304,7 +304,7 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
templateOptions: { templateOptions: {
label: gettextCatalog.getString('Groups'), label: gettextCatalog.getString('Groups'),
options: Group.getAll(), options: Group.getAll(),
ngOptions: 'option.id as option.name for option in to.options | ' + ngOptions: 'option.id as option.name | translate for option in to.options | ' +
'filter: {id: "!1"} | filter: {id: "!2"}', 'filter: {id: "!1"} | filter: {id: "!2"}',
placeholder: gettextCatalog.getString('Select or search a group ...') placeholder: gettextCatalog.getString('Select or search a group ...')
} }

2
openslides/users/static/templates/users/group-form.html
View File

@ -15,7 +15,7 @@
<form name="groupForm"> <form name="groupForm">
<div class="form-group"> <div class="form-group">
<label for="inputName" translate>Name</label> <label for="inputName" translate>Name</label>
<input type="text" ng-model="group.name" class="form-control" name="inputName" required> <input type="text" ng-model="group.name|translate" class="form-control" name="inputName" required>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="selectPermissions" translate>Permissions</label> <label for="selectPermissions" translate>Permissions</label>