Merge OpenOLAT 10.2 to OpenOLAT default with 5280fd88ec91308c3aadfee2628114fb075a1ce4

src/main/java/org/olat/user/_spring/userContext.xml

@@ -257,6 +257,10 @@
 	    </property>
 	</bean>
 
+	<!-- Implementation to display "firstname lastname" -->
+    <bean id="userDisplayName_firstname_lastname" class="org.olat.user.UserDisplayNameCreator" />
+    <!-- Implementation to display "lastname, firstname" -->
+    <bean id="userDisplayName_lastname_firstname" class="org.olat.user.UserDisplayNameCreatorLastnameFirst" />
 
 	<bean id="userManager" class="org.olat.user.UserManagerImpl" >
 		<property name="userPropertiesConfig">
@@ -266,11 +270,7 @@
         	<ref bean="org.olat.user.UserNameAndPasswordSyntaxChecker"/>
         </property>
 		<property name="userDisplayNameCreator">
-				<!-- Implementation to display "firstname lastname" 
-                <bean id="org.olat.user.UserDisplayNameCreator" class="org.olat.user.UserDisplayNameCreator" />
-				-->
-                <!-- Implementation to display "lastname, firstname" -->
-                <bean id="org.olat.user.UserDisplayNameCreator" class="org.olat.user.UserDisplayNameCreatorLastnameFirst" />
+			 <ref bean="${userDisplayName}"/>
         </property>
 	</bean>
 

src/main/resources/serviceconfig/olat.properties

@@ -660,6 +660,13 @@ usersearch.maxResults.values=-1,20,50
 #send user informations with the request in the tunnel cours ebuilding block
 userinfos.tunnelcoursebuildingblock=disabled
 
+########################################################################
+# Other user related settings
+########################################################################
+# When user full name is displayed, is it "Lastname, Firstname" (default) or "Firstname Lastname"
+userDisplayName=userDisplayName_lastname_firstname
+userDisplayName.values=userDisplayName_firstname_lastname, userDisplayName_lastname_firstname
+
 ########################################################################
 # Fulltext Search settings
 ########################################################################