diff --git a/openslides/users/config_variables.py b/openslides/users/config_variables.py index 4946cfe94..bcb2c20ea 100644 --- a/openslides/users/config_variables.py +++ b/openslides/users/config_variables.py @@ -15,8 +15,8 @@ def get_config_variables(): input_type='choice', label='Sort name of participants by', choices=( - {'value': 'first_name', 'display_name': 'First name'}, - {'value': 'last_name', 'display_name': 'Last name'}), + {'value': 'first_name', 'display_name': 'Given name'}, + {'value': 'last_name', 'display_name': 'Surname'}), weight=510, group='Participants', subgroup='General') diff --git a/openslides/users/serializers.py b/openslides/users/serializers.py index ae4c4cd59..f2b82a076 100644 --- a/openslides/users/serializers.py +++ b/openslides/users/serializers.py @@ -56,7 +56,7 @@ class UserFullSerializer(ModelSerializer): username if it is empty. """ if not (data.get('username') or data.get('first_name') or data.get('last_name')): - raise ValidationError({'detail': _('Username, first name and last name can not all be empty.')}) + raise ValidationError({'detail': _('Username, given name and surname can not all be empty.')}) # Generate username. But only if it is not set and the serializer is not # called in a PATCH context (partial_update). diff --git a/openslides/users/static/js/users/site.js b/openslides/users/static/js/users/site.js index 29a3427b4..1369ce08a 100644 --- a/openslides/users/static/js/users/site.js +++ b/openslides/users/static/js/users/site.js @@ -318,7 +318,7 @@ angular.module('OpenSlidesApp.users.site', [ type: 'input', className: "col-xs-5 no-padding", templateOptions: { - label: gettextCatalog.getString('First name') + label: gettextCatalog.getString('Given name') } }, { @@ -326,7 +326,7 @@ angular.module('OpenSlidesApp.users.site', [ type: 'input', className: "col-xs-5 no-padding-right", templateOptions: { - label: gettextCatalog.getString('Last name') + label: gettextCatalog.getString('Surname') } } ] @@ -564,9 +564,9 @@ angular.module('OpenSlidesApp.users.site', [ $scope.sort.column = $scope.config('users_sort_by'); $scope.sortOptions = [ {name: 'first_name', - display_name: 'First name'}, + display_name: 'Given name'}, {name: 'last_name', - display_name: 'Last name'}, + display_name: 'Surname'}, {name: 'is_present', display_name: 'Present'}, {name: 'is_active', @@ -999,7 +999,7 @@ angular.module('OpenSlidesApp.users.site', [ } if (!user.first_name && !user.last_name) { user.importerror = true; - user.name_error = gettext('Error: First or last name is required.'); + user.name_error = gettext('Error: Given name or surname is required.'); } // structure level if (user.structure_level) { @@ -1092,10 +1092,10 @@ angular.module('OpenSlidesApp.users.site', [ user.duplicate_info += user_.last_name; user.duplicate_info += ' ('; if (user_.number) - user.duplicate_info += gettextCatalog.getString('number') + ': ' + user_.number + ', '; + user.duplicate_info += gettextCatalog.getString('Number') + ': ' + user_.number + ', '; if (user_.structure_level) - user.duplicate_info += gettextCatalog.getString('structure level') + ': ' + user_.structure_level + ', '; - user.duplicate_info += gettextCatalog.getString('username') + ': ' + user_.username + ') '+ + user.duplicate_info += gettextCatalog.getString('Structure level') + ': ' + user_.structure_level + ', '; + user.duplicate_info += gettextCatalog.getString('Username') + ': ' + user_.username + ') '+ gettextCatalog.getString('already exists.'); $scope.duplicates++; @@ -1552,8 +1552,8 @@ angular.module('OpenSlidesApp.users.site', [ gettext('General'); gettext('Sort name of participants by'); gettext('Participants'); - gettext('First name'); - gettext('Last name'); + gettext('Given name'); + gettext('Surname'); gettext('PDF'); gettext('Welcome to OpenSlides'); gettext('Title for access data and welcome PDF'); diff --git a/openslides/users/static/templates/users/user-detail-profile.html b/openslides/users/static/templates/users/user-detail-profile.html index e80f51eb7..159e93fca 100644 --- a/openslides/users/static/templates/users/user-detail-profile.html +++ b/openslides/users/static/templates/users/user-detail-profile.html @@ -23,11 +23,11 @@
- +
- +
diff --git a/openslides/users/static/templates/users/user-import.html b/openslides/users/static/templates/users/user-import.html index dda506e74..84a06b640 100644 --- a/openslides/users/static/templates/users/user-import.html +++ b/openslides/users/static/templates/users/user-import.html @@ -73,7 +73,7 @@ Delegates 2, Staff 3 Committees 4 -
  • At least first name or last name have to be filled in. All +
  • At least given name or surname have to be filled in. All other fields are optional and may be empty.
  • Only double quotes are accepted as text delimiter (no single quotes).
  • Download CSV example file @@ -87,8 +87,8 @@ # Title - First name - Last name + Given name + Surname Structure level Participant number Groups