diff --git a/modules/expirychecker/locales/en/LC_MESSAGES/.gitkeep b/modules/expirychecker/locales/en/LC_MESSAGES/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/modules/expirychecker/public/about2expire.php b/modules/expirychecker/public/about2expire.php index f3cfc0b9..499259a3 100644 --- a/modules/expirychecker/public/about2expire.php +++ b/modules/expirychecker/public/about2expire.php @@ -54,13 +54,13 @@ $globalConfig = Configuration::getInstance(); -$t = new Template($globalConfig, 'expirychecker:about2expire.php'); +$t = new Template($globalConfig, 'expirychecker:about2expire'); $t->data['formTarget'] = Module::getModuleURL('expirychecker/about2expire.php'); $t->data['formData'] = ['StateId' => $stateId]; $t->data['daysLeft'] = $state['daysLeft']; $t->data['dayOrDays'] = (intval($state['daysLeft']) === 1 ? 'day' : 'days'); $t->data['expiresAtTimestamp'] = $state['expiresAtTimestamp']; $t->data['accountName'] = $state['accountName']; -$t->show(); +$t->send(); Logger::info('expirychecker - User has been warned that their password will expire soon.'); diff --git a/modules/material/dictionaries/about2expire.definition.json b/modules/material/dictionaries/about2expire.definition.json deleted file mode 100644 index b39acd50..00000000 --- a/modules/material/dictionaries/about2expire.definition.json +++ /dev/null @@ -1,45 +0,0 @@ - -{ - "title": { - "en": "Expiring password", - "es": "Contraseña vencida", - "fr": "Mot de passe expiré", - "ko": "만료 된 암호" - }, - "header": { - "en": "Password expiring soon", - "es": "Contraseña caducada pronto", - "fr": "Mot de passe expire bientôt", - "ko": "곧 만료되는 암호" - }, - "expiring_in_a_day": { - "en": "Your password will expire in one day.", - "es": "Su contraseña caducará en un día.", - "fr": "Votre mot de passe expirera en un jour.", - "ko": "암호는 하루 만료됩니다." - }, - "expiring_soon": { - "en": "Your password will expire in {daysLeft} days.", - "es": "Su contraseña caducará en {daysLeft} días.", - "fr": "Votre mot de passe expirera en {daysLeft} jours.", - "ko": "비밀번호는 {daysLeft} 일 후에 만료됩니다." - }, - "change_now": { - "en": "Would you like to change it now?", - "es": "¿Quieres cambiarlo ahora?", - "fr": "Voulez-vous le changer maintenant?", - "ko": "지금 변경 하시겠습니까?" - }, - "button_change": { - "en": "Yes", - "es": "Sí", - "fr": "Oui", - "ko": "예" - }, - "button_continue": { - "en": "Later", - "es": "Después", - "fr": "Plus tard", - "ko": "후에" - } -} diff --git a/modules/material/dictionaries/expired.definition.json b/modules/material/dictionaries/expired.definition.json deleted file mode 100644 index 0915a459..00000000 --- a/modules/material/dictionaries/expired.definition.json +++ /dev/null @@ -1,27 +0,0 @@ - -{ - "title": { - "en": "Expired password", - "es": "Contraseña caducada", - "fr": "Mot de passe expiré", - "ko": "만료 된 암호" - }, - "header": { - "en": "Password expired", - "es": "La contraseña expiró", - "fr": "Mot de passe expiré", - "ko": "암호가 만료되었습니다." - }, - "expired": { - "en": "Your password has expired and must be changed before continuing.", - "es": "Su contraseña ha caducado y debe cambiarse antes de continuar.", - "fr": "Votre mot de passe a expiré et doit être modifié avant de continuer.", - "ko": "비밀번호가 만료되었으므로 계속하기 전에 비밀번호를 변경해야합니다." - }, - "button_change": { - "en": "Change", - "es": "Cambiar", - "fr": "Changer", - "ko": "바꾸다" - } -} diff --git a/modules/material/dictionaries/footer.definition.json b/modules/material/dictionaries/footer.definition.json deleted file mode 100644 index 0ee65023..00000000 --- a/modules/material/dictionaries/footer.definition.json +++ /dev/null @@ -1,9 +0,0 @@ - -{ - "copyright": { - "en": "Unauthorized use of this site is prohibited and may be subjected to civil and criminal prosecution.", - "es": "El uso no autorizado de este sitio está prohibido y puede ser sometido a procesamiento civil y penal.", - "fr": "L'utilisation non autorisée de ce site est interdite et peut faire l'objet de poursuites civiles et pénales.", - "ko": "이 사이트의 무단 사용은 금지되어 있으며 민사 및 형사 고발의 대상이 될 수 있습니다." - } -} diff --git a/modules/material/themes/material/expirychecker/about2expire.php b/modules/material/themes/material/expirychecker/about2expire.php deleted file mode 100644 index 11500f97..00000000 --- a/modules/material/themes/material/expirychecker/about2expire.php +++ /dev/null @@ -1,58 +0,0 @@ - - - - <?= $this->t('{material:about2expire:title}') ?> - - - - -
-
-
- - t('{material:about2expire:header}') ?> - -
-
-
-
- data['formData'] as $name => $value) { - ?> - - - -

- data['daysLeft'] ?? '0'; - $expiringMessage = $daysLeft < 2 ? - $this->t('{material:about2expire:expiring_in_a_day}') : - $this->t('{material:about2expire:expiring_soon}', - ['{daysLeft}' => (string)$daysLeft]); - ?> - -

- -

- t('{material:about2expire:change_now}') ?> -

- -
- - - -
-
-
- - -
- - diff --git a/modules/material/themes/material/expirychecker/about2expire.twig b/modules/material/themes/material/expirychecker/about2expire.twig new file mode 100644 index 00000000..fdfbf402 --- /dev/null +++ b/modules/material/themes/material/expirychecker/about2expire.twig @@ -0,0 +1,50 @@ + + + + {{ '{about2expire:title}'|trans }} + + {% include 'header.twig' %} + + +
+
+
+ + {{ '{about2expire:header}'|trans }} + +
+
+
+
+ {% for name, value in formData %} + + {% endfor %} + +

+ {% if daysLeft < 2 %} + {{ '{about2expire:expiring_in_a_day}'|trans }} + {% else %} + {{ '{about2expire:expiring_soon}'|trans({'%daysLeft%': daysLeft}) }} + {% endif %} +

+ +

+ {{ '{about2expire:change_now}'|trans }} +

+ +
+ + + +
+
+
+ + {% include 'footer.twig' %} +
+ +