Updated German translations.
Changed some strings in source. Fixed some regressions introduces by new sort-submitters and amendment features.
This commit is contained in:
Emanuel Schütze
parent
5a5475299c
commit
8dca3b5321
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -577,8 +577,10 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions',
|
||||
$scope.$watch(function () {
|
||||
return Motion.lastModified();
|
||||
}, function () {
|
||||
$scope.paragraph_amendments = motion.getParagraphBasedAmendmentsForDiffView();
|
||||
rebuild_amendments_crs();
|
||||
if (motion) {
|
||||
$scope.paragraph_amendments = motion.getParagraphBasedAmendmentsForDiffView();
|
||||
rebuild_amendments_crs();
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@ -72,7 +72,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
|
||||
if (motion.parent_id) {
|
||||
var parentMotion = Motion.get(motion.parent_id);
|
||||
subtitleLines.push(
|
||||
gettextCatalog.getString('Amendment of motion') + ': ' +
|
||||
gettextCatalog.getString('Amendment to motion') + ': ' +
|
||||
(parentMotion.identifier ? parentMotion.identifier : parentMotion.getTitle())
|
||||
);
|
||||
}
|
||||
@ -530,7 +530,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
|
||||
if (motion.parent_id) {
|
||||
var parentMotion = Motion.get(motion.parent_id);
|
||||
subtitleLines.push(
|
||||
gettextCatalog.getString('Amendment of motion') + ': ' +
|
||||
gettextCatalog.getString('Amendment to motion') + ': ' +
|
||||
(parentMotion.identifier ? parentMotion.identifier : parentMotion.getTitle())
|
||||
);
|
||||
}
|
||||
@ -545,7 +545,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
|
||||
|
||||
// submitters
|
||||
var submitters = _.map(motion.submitters, function (submitter) {
|
||||
return submitter.get_full_name();
|
||||
return submitter.user.get_full_name();
|
||||
}).join(', ');
|
||||
metaTableBody.push([
|
||||
{
|
||||
@ -1047,7 +1047,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
|
||||
|
||||
// submitters
|
||||
var submitters = _.map(motion.submitters, function (submitter) {
|
||||
return submitter.get_full_name();
|
||||
return submitter.user.get_full_name();
|
||||
}).join(', ');
|
||||
content.push({
|
||||
text: gettextCatalog.getString('Submitters') + ': ' + submitters,
|
||||
@ -1076,7 +1076,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
|
||||
// title
|
||||
var title = leadMotion.identifier ? ' ' + leadMotion.identifier : '';
|
||||
title += ': ' + leadMotion.getTitle();
|
||||
title = PDFLayout.createTitle(gettextCatalog.getString('Amendments of motion') + title);
|
||||
title = PDFLayout.createTitle(gettextCatalog.getString('Amendments to motion') + title);
|
||||
|
||||
var content = [title],
|
||||
foundAmendments = [];
|
||||
|
||||
@ -108,6 +108,11 @@ angular.module('OpenSlidesApp.motions.site', [
|
||||
params: {
|
||||
motionId: null,
|
||||
},
|
||||
resolve: {
|
||||
motionId: ['$stateParams', function($stateParams) {
|
||||
return $stateParams.id;
|
||||
}],
|
||||
}
|
||||
})
|
||||
.state('motions.motion.allamendments', {
|
||||
url: '/amendments',
|
||||
@ -3179,6 +3184,10 @@ angular.module('OpenSlidesApp.motions.site', [
|
||||
gettext('Apply text for new amendments');
|
||||
gettext('The title of the motion is always applied.');
|
||||
gettext('Amendment to');
|
||||
gettext('How to create new amendments');
|
||||
gettext('Empty text field');
|
||||
gettext('Edit the whole motion text');
|
||||
gettext('Paragraph-based, Diff-enabled');
|
||||
|
||||
// subgroup Supporters
|
||||
gettext('Supporters');
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<h1 translate>Choose the paragraph to amend</h1>
|
||||
<h1 translate>Choose the paragraph to amend!</h1>
|
||||
|
||||
<div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" close="alert={}">
|
||||
{{ alert.msg }}
|
||||
|
||||
@ -318,8 +318,8 @@
|
||||
<div ng-if="amendment.submitters.length">
|
||||
<small>
|
||||
<span class="optional" translate>by</span>
|
||||
<span class="optional" ng-repeat="submitter in amendment.submitters | limitTo:1">
|
||||
{{ submitter.get_full_name() }}<span ng-if="!$last">,</span></span><span ng-if="amendment.submitters.length > 1">,
|
||||
<span class="optional" ng-repeat="submitter in amendment.submitters | orderBy: 'weight' | limitTo:1">
|
||||
{{ submitter.user.get_full_name() }}<span ng-if="!$last">,</span></span><span ng-if="amendment.submitters.length > 1">,
|
||||
... [+{{ amendment.submitters.length - 1 }}]</span>
|
||||
<!-- sorry for merging them together, but otherwise there would be a whitespace because of the new line -->
|
||||
</small>
|
||||
@ -328,6 +328,11 @@
|
||||
<div ng-if="amendment.isAllowed('update')">
|
||||
<small>
|
||||
<a href="" ng-click="openDialog(amendment)" translate>Edit</a>
|
||||
<span ng-if="amendment.isAllowed('update_submitters')"> ·
|
||||
<a ui-sref="motions.motion.submitters({id: amendment.id})" translate>
|
||||
Edit submitters
|
||||
</a>
|
||||
</span>
|
||||
<span ng-if="amendment.isAllowed('delete')"> ·
|
||||
<a href="" class="text-danger"
|
||||
ng-bootbox-confirm="{{ 'Are you sure you want to delete this entry?' | translate }}<br><b>{{ amendment.getTitle() }}</b>"
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
ng-if="motion.isParagraphBasedAmendment()">
|
||||
<section class="motion-text-holder">
|
||||
<div class="alert alert-info" ng-if="amendment_diff_paragraphs.length === 0">
|
||||
<translate>No changes at the text</translate>
|
||||
<translate>No changes at the text.</translate>
|
||||
</div>
|
||||
<div ng-repeat="paragraph in amendment_diff_paragraphs" class="motion-text motion-text-diff line-numbers-{{ lineNumberMode }}"
|
||||
ng-class="{'amendment-context': showAmendmentContext}">
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<h1 ng-if="model.id" translate>Edit motion</h1>
|
||||
<h1 ng-if="!model.id && !parent" translate>New motion</h1>
|
||||
<h1 ng-if="parent"><translate>New amendment of motion</translate> {{ parent.identifier || parent.getTitle() }}</h1>
|
||||
<h1 ng-if="parent"><translate>New amendment to motion</translate> {{ parent.identifier || parent.getTitle() }}</h1>
|
||||
|
||||
<div uib-alert ng-show="alert.show" ng-class="'alert-' + (alert.type || 'warning')" close="alert={}">
|
||||
{{ alert.msg }}
|
||||
|
||||
@ -136,15 +136,6 @@
|
||||
|
||||
<!-- Agreed View -->
|
||||
<div ng-if="mode == 'agreed'">
|
||||
<div class="alert alert-danger" ng-if="changed_version_has_accepted_collissions">
|
||||
<i class="fa fa-warning"></i>
|
||||
<translate>
|
||||
At least two amendments or change recommendations affecting the same line are to be integrated.
|
||||
This leads to undeterministic results.
|
||||
Please resolve this conflict by not accepting multiple changes affecting the same line.
|
||||
</translate>
|
||||
</div>
|
||||
|
||||
<div ng-bind-html="motion.getTextByMode('agreed', null, line) | trusted"
|
||||
class="motion-text motion-text-changed line-numbers-{{ config('motions_default_line_numbering') }}"></div>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user