From 31d783708ea2f4f17be8d8044d849bcb4e8ea6d6 Mon Sep 17 00:00:00 2001 From: Piotr Potrebka <piotr.potrebka@wpdesk.net> Date: Thu, 2 Feb 2023 08:39:58 +0100 Subject: [PATCH] feat: lang --- composer.json | 7 ------- src/Mailer.php | 13 ++++++++++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 193f1c9..61aa3f1 100644 --- a/composer.json +++ b/composer.json @@ -51,13 +51,6 @@ } }, "autoload-dev": {}, - "extra": { - "text-domain": "wp-email", - "translations-folder": "lang", - "po-files": { - "pl_PL": "pl_PL.po" - } - }, "scripts": { "phpcs": "phpcs", "phpunit-unit": "phpunit --configuration phpunit-unit.xml --coverage-text --colors=never", diff --git a/src/Mailer.php b/src/Mailer.php index 18e9845..348077d 100644 --- a/src/Mailer.php +++ b/src/Mailer.php @@ -78,13 +78,21 @@ class Mailer { add_filter( 'wp_mail_from', $from_cb = static function () use ( $email ) { - return $email->get_from(); + if ( ! empty( $email->get_from() ) ) { + return $email->get_from(); + } + + return 'wordpress@siteurl.pl'; } ); add_filter( 'wp_mail_from_name', $from_name_cb = static function () use ( $email ) { - return $email->get_from_name(); + if ( ! empty( $email->get_from_name() ) ) { + return $email->get_from_name(); + } + + return 'wordpress'; } ); add_action( 'wp_mail_failed', [ $this, 'catch_error' ] ); @@ -138,5 +146,4 @@ class Mailer { return HTML::style_inline( $content, $styles ); } - } -- GitLab