Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…

… and firstnamelastinitial to username formats
snipe · Jul 22, 2020 · 20c9ae5 · 20c9ae5
1 parent b905154
commit 20c9ae5
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 3 deletions.
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -379,6 +379,18 @@ public static function generateFormattedNameFromFullName($format = 'filastname',
             } elseif ($format=='firstname') {
                 $username = str_slug($first_name);
             }
+              elseif ($format=='firstinitial.lastname') {
+                $username = str_slug(substr($first_name, 0, 1). '.' . str_slug($last_name));
+            }
+              elseif ($format=='lastname_firstinitial') {
+                $username = str_slug($last_name).'_'.str_slug(substr($first_name, 0, 1));
+            }
+              elseif ($format=='firstnamelastname') {
+                $username = str_slug($first_name) . str_slug($last_name);
+            }
+              elseif ($format=='firstnamelastinitial') {
+                $username = str_slug(($first_name.substr($last_name, 0, 1)));
+              }
         }
 
         $user['first_name'] = $first_name;

diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
@@ -88,6 +88,9 @@
     'firstname_lastname_underscore_format' => 'First Name Last Name ([email protected])',
     'lastnamefirstinitial_format' =>  'Last Name First Initial ([email protected])',
     'first'					=> 'First',
+    'firstnamelastname'     => 'First Name Last Name ([email protected])',
+    'lastname_firstinitial' => 'Last Name First Initial ([email protected])',
+    'firstinitial.lastname' => 'First Initial Last Name ([email protected])',  'first'					=> 'First',
     'first_name'			=> 'First Name',
     'first_name_format'		=> 'First Name ([email protected])',
     'files'                 => 'Files',

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
@@ -88,6 +88,11 @@
     'firstname_lastname_underscore_format' => 'First Name Last Name ([email protected])',
     'lastnamefirstinitial_format' =>  'Last Name First Initial ([email protected])',
     'first'					=> 'First',
+    'firstnamelastname'     => 'First Name Last Name ([email protected])',
+    'lastname_firstinitial' => 'Last Name First Initial ([email protected])',
+    'firstinitial.lastname' => 'First Initial Last Name ([email protected])',
+    'firstnamelastinitial'  => 'First Name Last Initial ([email protected])',
+    'first'					=> 'First',
     'first_name'			=> 'First Name',
     'first_name_format'		=> 'First Name ([email protected])',
     'files'                 => 'Files',

diff --git a/resources/macros/macros.php b/resources/macros/macros.php
@@ -469,7 +469,10 @@
         'filastname' => trans('general.filastname_format'),
         'lastnamefirstinitial' => trans('general.lastnamefirstinitial_format'),
         'firstname_lastname' => trans('general.firstname_lastname_underscore_format'),
-
+        'firstinitial.lastname' => trans('general.firstinitial.lastname'),
+        'lastname_firstinitial' => trans('general.lastname_firstinitial'),
+        'firstnamelastname' => trans('general.firstnamelastname'),
+        'firstnamelastinitial' => trans('general.firstnamelastinitial')
     );
 
     $select = '<select name="'.$name.'" class="'.$class.'" style="width: 100%" aria-label="'.$name.'">';

diff --git a/tests/unit/UserTest.php b/tests/unit/UserTest.php
@@ -74,7 +74,7 @@ public function testFirstInitialLastName()
     public function testFirstInitialUnderscoreLastName()
     {
         $fullname = "Natalia Allanovna Romanova-O'Shostakova";
-        $expected_username = 'natalia_allanovna-romanova-oshostakova';
+        $expected_username = 'n_allanovna-romanova-oshostakova';
         $user = User::generateFormattedNameFromFullName('firstname_lastname', $fullname);
         $this->assertEquals($expected_username, $user['username']);
     }
@@ -86,6 +86,33 @@ public function testSingleName()
         $user = User::generateFormattedNameFromFullName('firstname_lastname', $fullname);
         $this->assertEquals($expected_username, $user['username']);
     }
-
+    public function firstInitialDotLastname()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_username = 'n.allanovnaromanovaoshostakova';
+        $user = User::generateFormattedNameFromFullName('firstinitial.lastname', $fullname);
+        $this->assertEquals($expected_username, $user['username']);
+    }
+    public function lastNameUnderscoreFirstInitial()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_username = 'allanovnaromanovaoshostakova_n';
+        $user = User::generateFormattedNameFromFullName('lastname_firstinitial', $fullname);
+        $this->assertEquals($expected_username, $user['username']);
+    }
+    public function firstNameLastName()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_username = 'nataliaallanovnaromanovaoshostakova';
+        $user = User::generateFormattedNameFromFullName('firstnamelastname', $fullname);
+        $this->assertEquals($expected_username, $user['username']);
+    }
+    public function firstNameLastInitial()
+    {
+        $fullname = "Natalia Allanovna Romanova-O'Shostakova";
+        $expected_username = 'nataliaa';
+        $user = User::generateFormattedNameFromFullName('firstnamelastinitial', $fullname);
+        $this->assertEquals($expected_username, $user['username']);
+    }
 
 }