Simplify access to current locale

14 files changed, 58 insertions, 18 deletions

diff --git a/resources/views/emails/approve-user-html.phtml b/resources/views/emails/approve-user-html.phtml
index 4c14f7cc2c..233a6e76ff 100644
--- a/resources/views/emails/approve-user-html.phtml
+++ b/resources/views/emails/approve-user-html.phtml
@@ -1,6 +1,10 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
+<?php
 
-<div <?= I18N::htmlAttributes() ?>>
+use Fisharebest\Webtrees\I18N;
+
+?>
+
+<div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>">
     <p>
         <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($user->realName()) . '</span>') ?>
     </p>
diff --git a/resources/views/emails/approve-user-text.phtml b/resources/views/emails/approve-user-text.phtml
index 8c54c5a04d..1e5b699b2e 100644
--- a/resources/views/emails/approve-user-text.phtml
+++ b/resources/views/emails/approve-user-text.phtml
@@ -1,4 +1,8 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
+<?php
+
+use Fisharebest\Webtrees\I18N;
+
+?>
 ?= I18N::translate('Hello %s…', $user->realName()) ?>
 
 <?= I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', $base_url, $base_url) ?>
diff --git a/resources/views/emails/message-copy-html.phtml b/resources/views/emails/message-copy-html.phtml
index af04b68ed1..f5676f4ad3 100644
--- a/resources/views/emails/message-copy-html.phtml
+++ b/resources/views/emails/message-copy-html.phtml
@@ -1,5 +1,9 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
-<div <?= I18N::htmlAttributes() ?>>
+<?php
+
+use Fisharebest\Webtrees\I18N;
+
+?>
+<div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>">
     <p>
         <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($sender->realName()) . '</span>') ?>
     </p>
diff --git a/resources/views/emails/message-copy-text.phtml b/resources/views/emails/message-copy-text.phtml
index 5082f0fb2e..47e292c204 100644
--- a/resources/views/emails/message-copy-text.phtml
+++ b/resources/views/emails/message-copy-text.phtml
@@ -1,4 +1,8 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
+<?php
+
+use Fisharebest\Webtrees\I18N;
+
+?>
 <?= I18N::translate('Hello %s…', $sender->realName()) ?>
 
 <?= I18N::translate('You sent the following message to a webtrees user:') ?><?= $recipient->realName() ?>
diff --git a/resources/views/emails/message-user-html.phtml b/resources/views/emails/message-user-html.phtml
index 693945b549..cc64365da6 100644
--- a/resources/views/emails/message-user-html.phtml
+++ b/resources/views/emails/message-user-html.phtml
@@ -1,5 +1,9 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
-<div <?= I18N::htmlAttributes() ?>>
+<?php
+
+use Fisharebest\Webtrees\I18N;
+
+?>
+<div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>">
     <p>
         <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($recipient->realName()) . '</span>') ?>
     </p>
diff --git a/resources/views/emails/message-user-text.phtml b/resources/views/emails/message-user-text.phtml
index 8944f67802..225f6e5767 100644
--- a/resources/views/emails/message-user-text.phtml
+++ b/resources/views/emails/message-user-text.phtml
@@ -1,4 +1,8 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
+<?php
+
+use Fisharebest\Webtrees\I18N;
+
+?>
 <?= I18N::translate('Hello %s…', $recipient->realName()) ?>
 
 <?= /* I18N: %s is a person's name */ I18N::translate('%s sent you the following message.', $sender->realName()) ?>
diff --git a/resources/views/emails/password-request-html.phtml b/resources/views/emails/password-request-html.phtml
index 149af889f3..1b9b2acf53 100644
--- a/resources/views/emails/password-request-html.phtml
+++ b/resources/views/emails/password-request-html.phtml
@@ -1,6 +1,9 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
+<?php
 
-<div <?= I18N::htmlAttributes() ?>>
+use Fisharebest\Webtrees\I18N;
+
+?>
+<div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>">
     <p>
         <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($user->realName()) . '</span>') ?>
     </p>
diff --git a/resources/views/emails/password-request-text.phtml b/resources/views/emails/password-request-text.phtml
index a256ca6678..42de45ed63 100644
--- a/resources/views/emails/password-request-text.phtml
+++ b/resources/views/emails/password-request-text.phtml
@@ -1,5 +1,8 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
+<?php
 
+use Fisharebest\Webtrees\I18N;
+
+?>
 <?= I18N::translate('Hello %s…', e($user->realName())) ?>
 
 <?= I18N::translate('To set a new password, follow this link.') ?>
diff --git a/resources/views/emails/pending-changes-html.phtml b/resources/views/emails/pending-changes-html.phtml
index 5662c0d5e4..9b08542f10 100644
--- a/resources/views/emails/pending-changes-html.phtml
+++ b/resources/views/emails/pending-changes-html.phtml
@@ -4,7 +4,7 @@ use Fisharebest\Webtrees\Http\RequestHandlers\PendingChanges;
 use Fisharebest\Webtrees\I18N;
 
 ?>
-<div <?= I18N::htmlAttributes() ?>>
+<div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>">
     <p>
         <?= I18N::translate('Hello %s…', '<span dir="auto">' . e($user->realName()) . '</span>') ?>
     </p>
diff --git a/resources/views/emails/register-notify-html.phtml b/resources/views/emails/register-notify-html.phtml
index fb5b64e61c..b46d38b7b5 100644
--- a/resources/views/emails/register-notify-html.phtml
+++ b/resources/views/emails/register-notify-html.phtml
@@ -3,7 +3,7 @@
 use Fisharebest\Webtrees\I18N;
 
 ?>
-<div <?= I18N::htmlAttributes() ?>>
+<div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>">
     <p>
         <?= I18N::translate('Hello administrator…') ?>
     </p>
diff --git a/resources/views/emails/register-user-html.phtml b/resources/views/emails/register-user-html.phtml
index 2c331415ad..0af32bdb6c 100644
--- a/resources/views/emails/register-user-html.phtml
+++ b/resources/views/emails/register-user-html.phtml
@@ -1,10 +1,11 @@
 <?php
+
 use Fisharebest\Webtrees\Http\RequestHandlers\VerifyEmail;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\User;
 
 ?>
-<div <?= I18N::htmlAttributes() ?>>
+<div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>">
     <p>
         <?= I18N::translate('Hello %s…', e($user->realName())) ?>
     </p>
diff --git a/resources/views/emails/register-user-text.phtml b/resources/views/emails/register-user-text.phtml
index 91388f2795..06bf179089 100644
--- a/resources/views/emails/register-user-text.phtml
+++ b/resources/views/emails/register-user-text.phtml
@@ -1,4 +1,5 @@
 <?php
+
 use Fisharebest\Webtrees\Http\RequestHandlers\VerifyEmail;
 use Fisharebest\Webtrees\I18N;
 use Fisharebest\Webtrees\User;
diff --git a/resources/views/emails/verify-notify-html.phtml b/resources/views/emails/verify-notify-html.phtml
index 56a3386458..fff6bce5de 100644
--- a/resources/views/emails/verify-notify-html.phtml
+++ b/resources/views/emails/verify-notify-html.phtml
@@ -1,5 +1,9 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
-<div <?= I18N::htmlAttributes() ?>>
+<?php
+
+use Fisharebest\Webtrees\I18N;
+
+?>
+<div dir="<?= I18N::locale()->direction() ?>" lang="<?= I18N::locale()->languageTag() ?>">
     <p>
         <?= I18N::translate('Hello administrator…') ?>
     </p>
diff --git a/resources/views/emails/verify-notify-text.phtml b/resources/views/emails/verify-notify-text.phtml
index a7ce6f5b54..fe937076a3 100644
--- a/resources/views/emails/verify-notify-text.phtml
+++ b/resources/views/emails/verify-notify-text.phtml
@@ -1,4 +1,8 @@
-<?php use Fisharebest\Webtrees\I18N; ?>
+<?php
+
+use Fisharebest\Webtrees\I18N;
+
+?>
 <?= I18N::translate('Hello administrator…') ?>
 
 <?= /* I18N: %1$s is a real-name, %2$s is a username, %3$s is an email address */ I18N::translate(