Merge pull request #608 from swissspidy/fix/load-textdomain

Rely on just-in-time translation loading

class-two-factor-core.php

@@ -93,7 +93,6 @@ class Two_Factor_Core {
 	 * @since 0.1-dev
 	 */
 	public static function add_hooks( $compat ) {
-		add_action( 'plugins_loaded', array( __CLASS__, 'load_textdomain' ) );
 		add_action( 'init', array( __CLASS__, 'get_providers' ) );
 		add_action( 'wp_login', array( __CLASS__, 'wp_login' ), 10, 2 );
 		add_filter( 'wp_login_errors', array( __CLASS__, 'maybe_show_reset_password_notice' ) );
@@ -132,15 +131,6 @@ public static function add_hooks( $compat ) {
 		$compat->init();
 	}
 
-	/**
-	 * Loads the plugin's text domain.
-	 *
-	 * Sites on WordPress 4.6+ benefit from just-in-time loading of translations.
-	 */
-	public static function load_textdomain() {
-		load_plugin_textdomain( 'two-factor' );
-	}
-
 	/**
 	 * For each provider, include it and then instantiate it.
 	 *

readme.txt

@@ -1,7 +1,7 @@
 === Two-Factor ===
 Contributors:      georgestephanis, valendesigns, stevenkword, extendwings, sgrant, aaroncampbell, johnbillion, stevegrunwell, netweb, kasparsd, alihusnainarshad, passoniate
 Tags:              two factor, two step, authentication, login, totp, fido u2f, u2f, email, backup codes, 2fa, yubikey
-Requires at least: 4.3
+Requires at least: 4.6
 Tested up to:      6.5
 Requires PHP:      5.6
 Stable tag:        0.9.1

two-factor.php

@@ -8,14 +8,16 @@
  * @license     GPL-2.0-or-later
  *
  * @wordpress-plugin
- * Plugin Name: Two Factor
- * Plugin URI:  https://wordpress.org/plugins/two-factor/
- * Description: Two-Factor Authentication using time-based one-time passwords, Universal 2nd Factor (FIDO U2F), email and backup verification codes.
- * Author:      Plugin Contributors
- * Version:     0.9.1
- * Author URI:  https://github.com/wordpress/two-factor/graphs/contributors
- * Network:     True
- * Text Domain: two-factor
+ * Plugin Name:       Two Factor
+ * Plugin URI:        https://wordpress.org/plugins/two-factor/
+ * Description:       wo-Factor Authentication using time-based one-time passwords, Universal 2nd Factor (FIDO U2F), email and backup verification codes.
+ * Author:            Plugin Contributors
+ * Version:           0.9.1
+ * Author URI:        https://github.com/wordpress/two-factor/graphs/contributors
+ * Network:           True
+ * Text Domain:       two-factor
+ * Requires at least: 4.6
+ * Requires PHP:      5.6
  */
 
 /**