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

Merge pull request #2356 from emanuelschuetze/fix

Browse Source 
Fixed missing translation and form errors.
This commit is contained in:
Norman Jäckel 2016-09-06 00:33:40 +02:00 committed by GitHub
commit 0fddfdd25a
8 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/assignments/static/templates/assignments/assignment-detail.html
View File

@ -68,7 +68,7 @@
<div os-perms="assignments.can_manage" class="spacer"> <div os-perms="assignments.can_manage" class="spacer">
<select ng-model="phaseSelect" class="form-control" ng-change="updatePhase(phaseSelect)"> <select ng-model="phaseSelect" class="form-control" ng-change="updatePhase(phaseSelect)">
<option value="" translate>--- Set phase ---</option> <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> </select>
</div> </div>
</div> </div>

2
openslides/assignments/static/templates/assignments/assignment-form.html
View File

@ -10,7 +10,7 @@
<button type="submit" ng-disabled="assignmentForm.$invalid" class="btn btn-primary" translate> <button type="submit" ng-disabled="assignmentForm.$invalid" class="btn btn-primary" translate>
Save Save
</button> </button>
<button ng-click="closeThisDialog()" class="btn btn-default" translate> <button type="button" ng-click="closeThisDialog()" class="btn btn-default" translate>
Cancel Cancel
</button> </button>
</formly-form> </formly-form>

2
openslides/assignments/static/templates/assignments/slide_assignment.html
View File

@ -3,7 +3,7 @@
<div id="sidebox"> <div id="sidebox">
<!-- Phase --> <!-- Phase -->
<h3 translate>State</h3> <h3 translate>State</h3>
{{ phases[assignment.phase].display_name }} {{ phases[assignment.phase].display_name | translate }}
<!-- Posts --> <!-- Posts -->
<h3 translate>Posts</h3> <h3 translate>Posts</h3>

2
openslides/core/static/templates/core/customslide-form.html
View File

@ -10,7 +10,7 @@
<button type="submit" ng-disabled="customslideForm.$invalid" class="btn btn-primary" translate> <button type="submit" ng-disabled="customslideForm.$invalid" class="btn btn-primary" translate>
Save Save
</button> </button>
<button ng-click="closeThisDialog()" class="btn btn-default" translate> <button type="button" ng-click="closeThisDialog()" class="btn btn-default" translate>
Cancel Cancel
</button> </button>
</formly-form> </formly-form>

2
openslides/mediafiles/static/templates/mediafiles/mediafile-form.html
View File

@ -42,7 +42,7 @@
<button type="submit" ng-disabled="mediafileForm.$invalid" class="btn btn-primary" translate> <button type="submit" ng-disabled="mediafileForm.$invalid" class="btn btn-primary" translate>
Save Save
</button> </button>
<button ng-click="closeThisDialog()" class="btn btn-default" translate> <button type="button" ng-click="closeThisDialog()" class="btn btn-default" translate>
Cancel Cancel
</button> </button>
</form> </form>

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

@ -1056,6 +1056,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid
'$scope', '$scope',
'$state', '$state',
'gettext', 'gettext',
'gettextCatalog',
'Motion', 'Motion',
'MotionForm', 'MotionForm',
'Category', 'Category',
@ -1066,7 +1067,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid
'Workflow', 'Workflow',
'Agenda', 'Agenda',
'AgendaUpdate', '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'); Category.bindAll({}, $scope, 'categories');
Mediafile.bindAll({}, $scope, 'mediafiles'); Mediafile.bindAll({}, $scope, 'mediafiles');
Tag.bindAll({}, $scope, 'tags'); Tag.bindAll({}, $scope, 'tags');
@ -1080,7 +1081,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid
// Set default values for create form // Set default values for create form
// ... set preamble config value as text // ... 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 // ... for amendments add parent_id
if (isAmendment) { if (isAmendment) {
if (Config.get('motions_amendments_apply_title_text').value) { if (Config.get('motions_amendments_apply_title_text').value) {

2
openslides/motions/static/templates/motions/motion-form.html
View File

@ -11,7 +11,7 @@
<button type="submit" ng-disabled="motionForm.$invalid" class="btn btn-primary" translate> <button type="submit" ng-disabled="motionForm.$invalid" class="btn btn-primary" translate>
Save Save
</button> </button>
<button ng-click="closeThisDialog()" class="btn btn-default" translate> <button type="button" ng-click="closeThisDialog()" class="btn btn-default" translate>
Cancel Cancel
</button> </button>
</formly-form> </formly-form>

2
openslides/motions/static/templates/motions/slide_motion.html
View File

@ -12,7 +12,7 @@
</div> </div>
<!-- Poll results --> <!-- 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-repeat="poll in motion.polls | orderBy:'-id'" class="spacer">
<div ng-show="poll.has_votes" class="pollresults"> <div ng-show="poll.has_votes" class="pollresults">
<strong ng-if="motion.polls.length > 1"> <strong ng-if="motion.polls.length > 1">