amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add a name order with the last name outside of brackets (#6286)

Browse Source 
Co-authored-by: Alexis Saettler <alexis@saettler.org>
This commit is contained in:
Andrew Aylett
2023-11-05 18:37:08 +00:00
committed by GitHub
parent 2e63f05f16
commit 0a9112ecd1
4 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Contact/Contact.php
+19
View File
@@ -877,6 +877,21 @@ class Contact extends Model
$completeName = $completeName.' '.$this->middle_name;
}
break;
case 'nickname_bracketed_firstname_lastname':
$completeName = $this->first_name;
if (! is_null($this->middle_name)) {
$completeName = $completeName.' '.$this->middle_name;
}
if (! is_null($this->nickname)) {
$completeName = $this->nickname.' ('.$completeName.')';
}
if (! is_null($this->last_name)) {
$completeName = $completeName.' '.$this->last_name;
}
break;
case 'nickname':
if (! is_null($this->nickname)) {
$completeName = $this->nickname;
@@ -909,6 +924,10 @@ class Contact extends Model
$incompleteName = '';
$incompleteName = $this->first_name;
if ($this->nameOrder == 'nickname_bracketed_firstname_lastname' && ! is_null($this->nickname)) {
$incompleteName = $this->nickname;
}
if (! is_null($this->last_name)) {
$incompleteName .= ' '.mb_substr($this->last_name, 0, 1);
}
app/Models/User/User.php
+1
View File
@@ -90,6 +90,7 @@ class User extends Authenticatable implements MustVerifyEmail, HasLocalePreferen
'lastname_nickname_firstname',
'nickname_firstname_lastname',
'nickname_lastname_firstname',
'nickname_bracketed_firstname_lastname',
'nickname',
];
resources/lang/en/settings.php
+1
View File
@@ -69,6 +69,7 @@ return [
'name_order_lastname_nickname_firstname' => '<Last name> (<Nickname>) <First name> – Doe (Rambo) John',
'name_order_nickname_firstname_lastname' => '<Nickname> (<First name> <Last name>) – Rambo (John Doe)',
'name_order_nickname_lastname_firstname' => '<Nickname> (<Last name> <First name>) – Rambo (Doe John)',
'name_order_nickname_bracketed_firstname_lastname' => '<Nickname> (<First name>) <Last name> - Rambo (John) Doe',
'name_order_nickname' => '<Nickname> – Rambo',
'currency' => 'Currency',
'name' => 'Your name: :name',
tests/Unit/Models/ContactTest.php
+33
View File
@@ -335,6 +335,39 @@ class ContactTest extends FeatureTestCase
$contact->name
);
$contact = new Contact;
$contact->first_name = 'Peter';
$contact->middle_name = 'H';
$contact->last_name = 'Gregory';
$contact->nickname = 'Rambo';
$contact->nameOrder('nickname_bracketed_firstname_lastname');
$this->assertEquals(
'Rambo (Peter H) Gregory',
$contact->name
);
$contact = new Contact;
$contact->first_name = 'Peter';
$contact->middle_name = 'H';
$contact->last_name = null;
$contact->nickname = 'Rambo';
$contact->nameOrder('nickname_bracketed_firstname_lastname');
$this->assertEquals(
'Rambo (Peter H)',
$contact->name
);
$contact = new Contact;
$contact->first_name = 'Peter';
$contact->middle_name = null;
$contact->last_name = 'Gregory';
$contact->nickname = 'Rambo';
$contact->nameOrder('nickname_bracketed_firstname_lastname');
$this->assertEquals(
'Rambo (Peter) Gregory',
$contact->name
);
$contact = new Contact;
$contact->first_name = 'Peter';
$contact->middle_name = 'H';