Merge pull request #114 from silinternational/develop

Release 7.6.1 fixed bug with float type sent to translate

Author: Baggerone

README.md

@@ -112,9 +112,21 @@ If provided, an alert will be shown to the user filled with the content of that
 
 ### Expiry functionality
 
-#### About to expire page
+#### About to expire page (expires in one day)
 
-_Note:  This nag only works once since choosing later will simply set the nag date into the future a little._
+_Note:  This nag only works once since choosing later will simply set the nag date into the future a little.
+        If needed, use a new private/incognito browser window to retry._
+
+1.  Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
+1.  Click **idp2** (second one)
+1.  Login as an "about to expire" user: `username=`**near_future** `password=`**a**
+1.  Click **Later**
+1.  Click **Logout**
+
+#### About to expire page (expires in three days)
+
+_Note:  This nag only works once since choosing later will simply set the nag date into the future a little.
+        If needed, use a new private/incognito browser window to retry._
 
 1.  Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
 1.  Click **idp2** (second one)

development/idp2/authsources.php

@@ -22,6 +22,18 @@
             'mail' => ['[email protected]'],
             'employeeNumber' => ['22222'],
             'cn' => ['NEAR_FUTURE'],
+            'schacExpiryDate' => [
+                gmdate('YmdHis\Z', strtotime('+3 day')), // Soon but not tomorrow
+            ],
+        ],
+        'next_day:a' => [
+            'eduPersonPrincipalName' => ['[email protected]'],
+            'eduPersonTargetID' => ['22888888-2222-2222-2222-222222222222'],
+            'sn' => ['Day'],
+            'givenName' => ['Next'],
+            'mail' => ['[email protected]'],
+            'employeeNumber' => ['22888'],
+            'cn' => ['NEXT_DAY'],
             'schacExpiryDate' => [
                 gmdate('YmdHis\Z', strtotime('+1 day')), // Very soon
             ],

themes/material/expirychecker/about2expire.php

@@ -31,7 +31,7 @@
             $expiringMessage = $daysLeft < 2 ?
                                $this->t('{material:about2expire:expiring_in_a_day}') :
                                $this->t('{material:about2expire:expiring_soon}',
-                                        ['{daysLeft}' => $daysLeft]);
+                                        ['{daysLeft}' => (string) $daysLeft]);
             ?>
                 <?= $expiringMessage ?>
             </p>