Merge branch '4.x' into 6524-php-tokenizer-required

app/Helpers/CountriesHelper.php

@@ -198,6 +198,6 @@ public static function getDefaultTimezone($country): string
                 break;
         }
 
-        return $timezone;
+        return $timezone ?? config('app.timezone');
     }
 }

app/Http/Controllers/ContactsController.php

@@ -85,6 +85,8 @@ private function contacts(Request $request, bool $active)
         }
 
         $tagsCount = Tag::contactsCount();
+        $contactsWithoutTagsCount = $contacts->doesntHave('tags')->count();
+
         $tags = null;
         $url = null;
         $count = 1;
@@ -134,7 +136,8 @@ private function contacts(Request $request, bool $active)
             ->withTagsCount($tagsCount)
             ->withUrl($url)
             ->withTagCount($count)
-            ->withTagLess($request->input('no_tag') ?? false);
+            ->withTagLess($request->input('no_tag') ?? false)
+            ->with('contactsWithoutTagsCount', $contactsWithoutTagsCount);
     }
 
     /**

app/Http/Controllers/SettingsController.php

@@ -59,7 +59,9 @@ public function index()
         if (auth()->user()->me_contact_id) {
             $meContact = Contact::where('account_id', auth()->user()->account_id)
                 ->find(auth()->user()->me_contact_id);
-            $existingContacts->prepend($meContact);
+            if ($meContact) {
+                $existingContacts->prepend($meContact);
+            }
         }
 
         $accountHasLimitations = AccountHelper::hasLimitations(auth()->user()->account);

config/mail.php

@@ -41,6 +41,7 @@
             'encryption' => env('MAIL_ENCRYPTION', 'tls'),
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
+            'verify_peer' => env('MAIL_VERIFY_PEER', true),
         ],
 
         'ses' => [
@@ -57,7 +58,7 @@
 
         'sendmail' => [
             'transport' => 'sendmail',
-            'path' => '/usr/sbin/sendmail -bs',
+            'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'),
         ],
 
         'log' => [

phpstan.neon

@@ -48,3 +48,5 @@ parameters:
         - */Http/Resources/**/*.php
         - */ExportResources/**/*.php
         - */ExportResources/*.php
+        - */Console/Commands/ImportAccounts.php
+

resources/lang/he/app.php

@@ -180,10 +180,10 @@
     'relationship_type_lovedby_female_with_name' => 'מאהבת סודית של :name',
     'relationship_type_lovedby_male_with_name' => 'מאהב סודי של :name',
 
-    'relationship_type_ex' => 'ex-partner',
+    'relationship_type_ex' => 'שותף לשעבר לחיים',
     'relationship_type_ex_female' => 'חברה לשעבר',
     'relationship_type_ex_male' => 'חבר לשעבר',
-    'relationship_type_ex_with_name' => ':name’s ex-partner',
+    'relationship_type_ex_with_name' => 'שותף לחיים לשעבר של :name',
     'relationship_type_ex_female_with_name' => 'חברה לשעבר של :name',
     'relationship_type_ex_male_with_name' => 'חבר לשעבר של :name',
 
@@ -222,17 +222,17 @@
     'relationship_type_sibling_female_with_name' => 'אחות של :name',
     'relationship_type_sibling_male_with_name' => 'אח של :name',
 
-    'relationship_type_grandparent' => 'grandparent',
+    'relationship_type_grandparent' => 'סב',
     'relationship_type_grandparent_female' => 'סבתא',
     'relationship_type_grandparent_male' => 'סבא',
-    'relationship_type_grandparent_with_name' => ':name’s grandparent',
+    'relationship_type_grandparent_with_name' => 'הסבא או הסבתא של :name',
     'relationship_type_grandparent_female_with_name' => 'סבתא של :name',
     'relationship_type_grandparent_male_with_name' => 'סבא של :name',
 
     'relationship_type_grandchild' => 'נכד/ה',
     'relationship_type_grandchild_female' => 'נכדה',
     'relationship_type_grandchild_male' => 'נכד',
-    'relationship_type_grandchild_with_name' => ':name’s grandchild',
+    'relationship_type_grandchild_with_name' => 'הנכד או הנכדה של :name',
     'relationship_type_grandchild_female_with_name' => 'נכדה של :name',
     'relationship_type_grandchild_male_with_name' => 'נכד של :name',
 
@@ -257,10 +257,10 @@
     'relationship_type_cousin_female_with_name' => 'בת דודה של :name',
     'relationship_type_cousin_male_with_name' => 'בן דוד של :name',
 
-    'relationship_type_godfather' => 'godparent',
+    'relationship_type_godfather' => 'אפוטרופוס',
     'relationship_type_godfather_female' => 'סנדקית',
     'relationship_type_godfather_male' => 'סנדק',
-    'relationship_type_godfather_with_name' => ':name’s godparent',
+    'relationship_type_godfather_with_name' => 'האפוטרופוס/ית של :name',
     'relationship_type_godfather_female_with_name' => 'הסנדקית של :name',
     'relationship_type_godfather_male_with_name' => 'הסנדק של :name',
 

resources/lang/he/settings.php

@@ -42,7 +42,7 @@
     'export_title_json' => 'ייצוא ל־Json',
     'export_submitted' => 'הייצוא שלך הוגש, הוא יהיה זמין בעוד מספר רגעים…',
     'export_json_explanation' => 'הנתונים שלך מיוצאים בתצורת Json למטרות גיבוי.',
-    'export_json_beta' => 'Json export is in preview mode. Tell us what you think about it:',
+    'export_json_beta' => 'ייצוא Json הוא במצב תצוגה מקדימה. נא לספר לנו מה דעתך עליו:',
     'export_json_cta' => 'ייצוא ל־Json',
     'export_header_type' => 'סוג',
     'export_header_timestamp' => 'מועד יצירה',

resources/sass/people.scss

@@ -41,14 +41,18 @@
         position: absolute;
       }
 
-      .number-contacts-per-tag {
+      .number-contacts-per-tag,
+      .number-contacts-without-tag {
         @if $htmldir == ltr {
           float: right;
         } @else {
           float: left;
         }
       }
     }
+    .number-contacts-without-tag{
+      font-size: 1rem;
+    }
   }
 
   .list {

resources/views/people/index.blade.php

@@ -144,6 +144,7 @@
               @if ($tagsCount->count() != 0)
                 <li class="f7 mt3">
                     <a href="{{ route('people.index') }}?no_tag=true">{{ trans('people.people_list_untagged') }}</a>
+                    <span class="number-contacts-without-tag">{{ trans_choice('people.people_list_contacts_per_tags', $contactsWithoutTagsCount) }}</span>
                 </li>
               @endif