From 5bcab0b9e1ba07cc7796226aef89e2454339abc9 Mon Sep 17 00:00:00 2001
From: dyszczo <krzysztof.dyszczyk@gmail.com>
Date: Wed, 13 Nov 2019 11:34:23 +0100
Subject: [PATCH] remove translation initialization
---
src/Basic_Requirement_Checker_Factory.php | 32 ++-----------------
...Test_Basic_Requirement_Checker_Factory.php | 2 --
2 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/src/Basic_Requirement_Checker_Factory.php b/src/Basic_Requirement_Checker_Factory.php
index 5c691b6..5bc7cfd 100644
--- a/src/Basic_Requirement_Checker_Factory.php
+++ b/src/Basic_Requirement_Checker_Factory.php
@@ -24,8 +24,7 @@ class WPDesk_Basic_Requirement_Checker_Factory {
* @return WPDesk_Requirement_Checker
*/
public function create_requirement_checker( $plugin_file, $plugin_name, $text_domain = null ) {
- return new WPDesk_Basic_Requirement_Checker( $plugin_file, $plugin_name,
- $this->initialize_translations( $text_domain ), null, null );
+ return new WPDesk_Basic_Requirement_Checker( $plugin_file, $plugin_name, $text_domain, null, null );
}
/**
@@ -42,7 +41,7 @@ class WPDesk_Basic_Requirement_Checker_Factory {
$requirements_checker = new WPDesk_Basic_Requirement_Checker_With_Update_Disable(
$plugin_file,
$plugin_name,
- $this->initialize_translations( $text_domain ),
+ $text_domain,
$requirements['php'],
$requirements['wp']
);
@@ -68,31 +67,4 @@ class WPDesk_Basic_Requirement_Checker_Factory {
return $requirements_checker;
}
-
- /**
- * Tries to initialize translations for requirement checker. If not given then default library translation is used.
- *
- * @param string|null $text_domain
- *
- * @return string
- */
- private function initialize_translations( $text_domain = null ) {
- if ( $text_domain === null ) {
- $text_domain = self::LIBRARY_TEXT_DOMAIN;
-
- if ( function_exists( 'determine_locale' ) ) {
- $locale = determine_locale();
- } else { // before WP 5.0 compatibility
- $locale = get_locale();
- }
- $locale = apply_filters( 'plugin_locale', $locale, self::LIBRARY_TEXT_DOMAIN );
-
- $lang_mo_file = __DIR__ . '/../lang/' . self::LIBRARY_TEXT_DOMAIN . '-' . $locale . '.mo';
- if ( file_exists( $lang_mo_file ) ) {
- load_textdomain( self::LIBRARY_TEXT_DOMAIN, $lang_mo_file );
- }
- }
-
- return $text_domain;
- }
}
diff --git a/tests/unit/Test_Basic_Requirement_Checker_Factory.php b/tests/unit/Test_Basic_Requirement_Checker_Factory.php
index adbf8d9..a8ca81a 100644
--- a/tests/unit/Test_Basic_Requirement_Checker_Factory.php
+++ b/tests/unit/Test_Basic_Requirement_Checker_Factory.php
@@ -24,8 +24,6 @@ class Test_Basic_Requirement_Checker_Factory extends PHPUnit\Framework\TestCase
WP_Mock::wpFunction( 'get_locale' )
->andReturn( $existing_locale );
- WP_Mock::wpFunction( 'load_textdomain' )
- ->once(); // locale pl_PL exists so it should try to load it
$factory = new WPDesk_Basic_Requirement_Checker_Factory();
$checker = $factory->create_from_requirement_array( 'whatever', 'whatever', $requirements );
--
GitLab