Merge pull request #2803 from emanuelschuetze/participant-number2

Added "No." for participant number in get_full_name().
This commit is contained in:
Norman Jäckel 2016-12-21 12:33:12 +01:00 committed by GitHub
commit 900ddaabb3

View File

@ -69,8 +69,9 @@ angular.module('OpenSlidesApp.users', [])
'Group', 'Group',
'jsDataModel', 'jsDataModel',
'gettext', 'gettext',
'gettextCatalog',
'Config', 'Config',
function(DS, Group, jsDataModel, gettext, Config) { function(DS, Group, jsDataModel, gettext, gettextCatalog, Config) {
var name = 'users/user'; var name = 'users/user';
return DS.defineResource({ return DS.defineResource({
name: name, name: name,
@ -133,7 +134,10 @@ angular.module('OpenSlidesApp.users', [])
addition.push(structure_level); addition.push(structure_level);
} }
if (number) { if (number) {
addition.push(number); addition.push(
/// abbreviation for number
gettextCatalog.getString('No.') + ' ' + number
);
} }
if (addition.length > 0) { if (addition.length > 0) {
name += ' (' + addition.join(' · ') + ')'; name += ' (' + addition.join(' · ') + ')';