Improved wording for recommendation config (Fixes #2626)
- updated config label and helptext - added recommendation also to motion slide
This commit is contained in:
parent
5ab8b3172b
commit
80f4cf8f2d
@ -101,8 +101,8 @@ def get_config_variables():
|
||||
yield ConfigVariable(
|
||||
name='motions_recommendations_by',
|
||||
default_value='',
|
||||
label='Name of recommendation committee',
|
||||
help_text='Use an empty value to disable the recommendation system.',
|
||||
label='Name of recommender',
|
||||
help_text='Will be displayed as label before selected recommendation. Use an empty value to disable the recommendation system.',
|
||||
weight=332,
|
||||
group='Motions',
|
||||
subgroup='General',
|
||||
|
@ -322,7 +322,7 @@ angular.module('OpenSlidesApp.motions', [
|
||||
getRecommendationName: function () {
|
||||
var recommendation = '';
|
||||
var additionalName = '';
|
||||
if (this.recommendation) {
|
||||
if (Config.get('motions_recommendations_by').value !== '' && this.recommendation) {
|
||||
recommendation = gettextCatalog.getString(this.recommendation.recommendation_label);
|
||||
if (this.recommendation.show_recommendation_extension_field) {
|
||||
// check motion comment fields for flag 'forRecommendation'
|
||||
|
@ -1930,8 +1930,8 @@ angular.module('OpenSlidesApp.motions.site', [
|
||||
gettext('The maximum number of characters per line. Relevant when line numbering is enabled. Min: 40');
|
||||
gettext('Stop submitting new motions by non-staff users');
|
||||
gettext('Allow to disable versioning');
|
||||
gettext('Name of recommendation committee');
|
||||
gettext('Use an empty value to disable the recommendation system.');
|
||||
gettext('Name of recommender');
|
||||
gettext('Will be displayed as label before selected recommendation. Use an empty value to disable the recommendation system.');
|
||||
|
||||
// subgroup Amendments
|
||||
gettext('Amendments');
|
||||
|
@ -5,6 +5,12 @@
|
||||
<h3 translate>State</h3>
|
||||
{{ motion.getStateName() }}
|
||||
|
||||
<!-- Recommendation -->
|
||||
<div ng-if="motion.getRecommendationName() != ''">
|
||||
<h3 translate>{{ config('motions_recommendations_by') }}</h3>
|
||||
{{ motion.getRecommendationName() }}
|
||||
</div>
|
||||
|
||||
<!-- Submitters -->
|
||||
<h3 ng-if="motion.submitters.length > 0" translate>Submitters</h3>
|
||||
<div ng-repeat="submitter in motion.submitters">
|
||||
|
Loading…
Reference in New Issue
Block a user