bl-kernel/admin/views/edit-user.php

@@ -37,10 +37,7 @@ echo Bootstrap::formInputHidden(array(
 <div class="tab-content" id="nav-tabContent">
 	<!-- Profile tab -->
 	<div class="tab-pane fade show active" id="profile" role="tabpanel" aria-labelledby="nav-profile-tab">
-
 		<?php
-		echo Bootstrap::formTitle(array('title' => $L->g('Base Infos')));
-
 		// Display username but disable the field
 		echo Bootstrap::formInputText(array(
 			'name' => 'usernameDisabled',
@@ -72,8 +69,6 @@ echo Bootstrap::formInputHidden(array(
 			'tip' => ''
 		));
 
-		echo Bootstrap::formTitle(array('title' => $L->g('Name')));
-
 		echo Bootstrap::formInputText(array(
 			'name' => 'nickname',
 			'label' => $L->g('Nickname'),
@@ -101,17 +96,6 @@ echo Bootstrap::formInputHidden(array(
 			'tip' => ''
 		));
 
-		echo Bootstrap::formSelect(array(
-			'name' => 'displayNameMode',
-			'label' => $L->g('Display Name'),
-			'options' => array('nickname' => $L->g('Nickname'), 'fullname' => $L->g('Full Name'), 'firstname' => $L->g('First Name')),
-			'selected' => $user->displayNameMode(),
-			'class' => '',
-			'tip' => $L->g('if-not-present-fallback-on-username')
-		));
-
-		echo Bootstrap::formTitle(array('title' => $L->g('More Infos')));
-
 		echo Bootstrap::formInputText(array(
 			'name' => 'pronouns',
 			'label' => $L->g(string: 'Pronouns'),

bl-kernel/user.class.php

@@ -50,36 +50,6 @@ class User
 		return $this->getValue('username');
 	}
 
-	public function displayName()
-	{
-		$mode = $this->getValue('displayNameMode');
-		$name = $this->firstName();
-		$lastName = $this->lastName();
-		$nickname = $this->nickname();
-		$username = $this->username();
-		switch ($mode) {
-			case 'fullname':
-				if ($name && $lastName) {
-					return $name." ".$lastName;
-				} elseif ($name) {
-					return $name;
-				} else {
-					return $username;
-				}
-			case 'firstname':
-				return $name ?? $username;
-			case '':
-			case 'nickname':
-			default:
-			return $nickname ?? $username;
-		}
-	}
-
-	public function displayNameMode()
-	{
-		return $this->getValue('displayNameMode');
-	}
-
 	public function pronouns()
 	{
 		return $this->getValue('pronouns');

bl-kernel/users.class.php

@@ -6,7 +6,6 @@ class Users extends dbJSON {
 		'firstName'=>'',
 		'lastName'=>'',
 		'nickname'=>'',
-		'displayNameMode'=>'nickname',
 		'pronouns'=>'',
 		'description'=>'',
 		'homepage'=>'',

bl-languages/en.json

@@ -130,13 +130,10 @@
     "add-a-new-category": "Add a new category",
     "name": "Name",
     "username": "Username",
-    "display-name": "Display Name",
     "first-name": "First name",
     "last-name": "Last name",
-    "full-name": "Full name",
     "pronouns": "Pronouns",
     "to-schedule-the-content-select-the-date-and-time": "To schedule the content select the date and time, the status has to be set to \"Published\".",
-    "if-not-present-fallback-on-username":"If the value isn't present, it'll fallback on the username",
     "email": "Email",
     "role": "Role",
     "registered": "Registered",
@@ -400,7 +397,5 @@
     "start-typing-to-see-a-list-of-suggestions": "Start typing to see a list of suggestions.",
     "view": "View",
     "insert-thumbnail": "Insert thumbnail",
-    "insert-linked-thumbnail": "Insert linked thumbnail",
-    "more-infos": "More infos",
-    "base-infos": "Base infos"
+    "insert-linked-thumbnail": "Insert linked thumbnail"
 }

bl-languages/fr_FR.json

@@ -130,13 +130,10 @@
     "add-a-new-category": "Ajouter une nouvelle catégorie",
     "name": "Nom",
     "username": "Nom d’utilisateur",
-    "display-name": "Nom affiché",
     "first-name": "Prénom",
     "last-name": "Nom",
-    "full-name": "Prénom et Nom",
     "pronouns": "Pronoms",
     "to-schedule-the-content-select-the-date-and-time": "Pour planifier votre contenu, sélectionnez la date et l’heure, le statut doit être défini sur \"Publié\".",
-    "if-not-present-fallback-on-username":"Si la valeur n'est pas présente, alors cela affichera le nom d'utilisateur",
     "email": "E-mail",
     "role": "Rôle",
     "registered": "Inscrit",
@@ -400,7 +397,5 @@
     "start-typing-to-see-a-list-of-suggestions": "Commencez à taper pour voir une liste de suggestions.",
     "view": "Vue",
     "insert-thumbnail": "Insérer une miniature",
-    "insert-linked-thumbnail": "Insérer une miniature liée",
-    "more-infos": "Infos supplémentaires",
-    "base-infos": "Infos de bases"
+    "insert-linked-thumbnail": "Insérer une miniature liée"
 }

bl-themes/popeye/php/page.php

@@ -14,7 +14,7 @@
 						<span class="pr-3"><i class="bi bi-clock"></i><?php echo $page->readingTime() . ' ' . $L->get('minutes') . ' ' . $L->g('read') ?></span>
 
 						<!-- Page author -->
-						<span><i class="bi bi-person"></i><?php echo $page->user('displayName') ?></span>
+						<span><i class="bi bi-person"></i><?php echo $page->user('nickname') ?></span>
 					</div>
 				<?php endif ?>