Merge pull request #2356 from emanuelschuetze/fix
Fixed missing translation and form errors.
This commit is contained in:
commit
0fddfdd25a
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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) {
|
||||
|
@ -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>
|
||||
|
@ -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">
|
||||
|
Loading…
Reference in New Issue
Block a user