eventespresso / event-espresso-core

caffeinated/core/domain/services/pue/RegisterAddonPUE.php

Indentation +87 added lines, -87 removed lines

@@ -12,98 +12,98 @@
 
 class RegisterAddonPUE
 {
-    /**
-     * @var array
-     */
-    private static $addon_api_settings;
+	/**
+	 * @var array
+	 */
+	private static $addon_api_settings;
 
 
-    public static function registerPUE(
-        array $addon_api_settings,
-        string $addon_name,
-        string $class_name,
-        array $addon_args
-    ): array {
-        if (! empty($addon_args['pue_options'])) {
-            $addon_api_settings[ $addon_name ]['pue_options'] = [
-                'pue_plugin_slug' => isset($addon_args['pue_options']['pue_plugin_slug'])
-                    ? (string) $addon_args['pue_options']['pue_plugin_slug']
-                    : 'espresso_' . strtolower($class_name),
-                'plugin_basename' => isset($addon_args['pue_options']['plugin_basename'])
-                    ? (string) $addon_args['pue_options']['plugin_basename']
-                    : plugin_basename($addon_args['main_file_path']),
-                'checkPeriod'     => isset($addon_args['pue_options']['checkPeriod'])
-                    ? (string) $addon_args['pue_options']['checkPeriod']
-                    : '24',
-                'use_wp_update'   => isset($addon_args['pue_options']['use_wp_update'])
-                    ? (string) $addon_args['pue_options']['use_wp_update']
-                    : false,
-            ];
-            add_action(
-                'AHEE__EE_System__brew_espresso__after_pue_init',
-                [RegisterAddonPUE::class, 'loadPueUpdate']
-            );
-        }
-        RegisterAddonPUE::$addon_api_settings = $addon_api_settings;
-        return $addon_api_settings;
-    }
+	public static function registerPUE(
+		array $addon_api_settings,
+		string $addon_name,
+		string $class_name,
+		array $addon_args
+	): array {
+		if (! empty($addon_args['pue_options'])) {
+			$addon_api_settings[ $addon_name ]['pue_options'] = [
+				'pue_plugin_slug' => isset($addon_args['pue_options']['pue_plugin_slug'])
+					? (string) $addon_args['pue_options']['pue_plugin_slug']
+					: 'espresso_' . strtolower($class_name),
+				'plugin_basename' => isset($addon_args['pue_options']['plugin_basename'])
+					? (string) $addon_args['pue_options']['plugin_basename']
+					: plugin_basename($addon_args['main_file_path']),
+				'checkPeriod'     => isset($addon_args['pue_options']['checkPeriod'])
+					? (string) $addon_args['pue_options']['checkPeriod']
+					: '24',
+				'use_wp_update'   => isset($addon_args['pue_options']['use_wp_update'])
+					? (string) $addon_args['pue_options']['use_wp_update']
+					: false,
+			];
+			add_action(
+				'AHEE__EE_System__brew_espresso__after_pue_init',
+				[RegisterAddonPUE::class, 'loadPueUpdate']
+			);
+		}
+		RegisterAddonPUE::$addon_api_settings = $addon_api_settings;
+		return $addon_api_settings;
+	}
 
 
-    public static function setAddonPueSlug(EE_Addon $addon, string $addon_name)
-    {
-        // setup the add-on's pue_slug if we have one.
-        if (! empty(RegisterAddonPUE::$addon_api_settings[ $addon_name ]['pue_options']['pue_plugin_slug'])) {
-            $addon->setPueSlug(RegisterAddonPUE::$addon_api_settings[ $addon_name ]['pue_options']['pue_plugin_slug']);
-        }
-    }
+	public static function setAddonPueSlug(EE_Addon $addon, string $addon_name)
+	{
+		// setup the add-on's pue_slug if we have one.
+		if (! empty(RegisterAddonPUE::$addon_api_settings[ $addon_name ]['pue_options']['pue_plugin_slug'])) {
+			$addon->setPueSlug(RegisterAddonPUE::$addon_api_settings[ $addon_name ]['pue_options']['pue_plugin_slug']);
+		}
+	}
 
 
-    /**
-     *    load_pue_update - Update notifications
-     *
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function loadPueUpdate()
-    {
-        // PUE client existence
-        if (! is_readable(EE_THIRD_PARTY . 'pue/pue-client.php')) {
-            return;
-        }
+	/**
+	 *    load_pue_update - Update notifications
+	 *
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function loadPueUpdate()
+	{
+		// PUE client existence
+		if (! is_readable(EE_THIRD_PARTY . 'pue/pue-client.php')) {
+			return;
+		}
 
-        /** @var EE_Network_Config $network_config */
-        $network_config = LoaderFactory::getLoader()->getShared('EE_Network_Config');
-        // load PUE client
-        require_once EE_THIRD_PARTY . 'pue/pue-client.php';
-        $license_server = defined('PUE_UPDATES_ENDPOINT') ? PUE_UPDATES_ENDPOINT : 'https://eventespresso.com';
-        // cycle thru settings
-        foreach (RegisterAddonPUE::$addon_api_settings as $settings) {
-            if (empty($settings['pue_options'])) {
-                continue;
-            }
-            // initiate the class and start the plugin update engine!
-            new PluginUpdateEngineChecker(
-            // host file URL
-                $license_server,
-                // plugin slug(s)
-                [
-                    'premium'    => ['p' => $settings['pue_options']['pue_plugin_slug']],
-                    'prerelease' => ['beta' => $settings['pue_options']['pue_plugin_slug'] . '-pr'],
-                ],
-                // options
-                [
-                    'apikey'            => $network_config->core->site_license_key,
-                    'lang_domain'       => 'event_espresso',
-                    'checkPeriod'       => $settings['pue_options']['checkPeriod'],
-                    'option_key'        => 'ee_site_license_key',
-                    'options_page_slug' => 'event_espresso',
-                    'plugin_basename'   => $settings['pue_options']['plugin_basename'],
-                    // if use_wp_update is TRUE it means you want FREE versions of the plugin to be updated from WP
-                    'use_wp_update'     => $settings['pue_options']['use_wp_update'],
-                ]
-            );
-        }
-    }
+		/** @var EE_Network_Config $network_config */
+		$network_config = LoaderFactory::getLoader()->getShared('EE_Network_Config');
+		// load PUE client
+		require_once EE_THIRD_PARTY . 'pue/pue-client.php';
+		$license_server = defined('PUE_UPDATES_ENDPOINT') ? PUE_UPDATES_ENDPOINT : 'https://eventespresso.com';
+		// cycle thru settings
+		foreach (RegisterAddonPUE::$addon_api_settings as $settings) {
+			if (empty($settings['pue_options'])) {
+				continue;
+			}
+			// initiate the class and start the plugin update engine!
+			new PluginUpdateEngineChecker(
+			// host file URL
+				$license_server,
+				// plugin slug(s)
+				[
+					'premium'    => ['p' => $settings['pue_options']['pue_plugin_slug']],
+					'prerelease' => ['beta' => $settings['pue_options']['pue_plugin_slug'] . '-pr'],
+				],
+				// options
+				[
+					'apikey'            => $network_config->core->site_license_key,
+					'lang_domain'       => 'event_espresso',
+					'checkPeriod'       => $settings['pue_options']['checkPeriod'],
+					'option_key'        => 'ee_site_license_key',
+					'options_page_slug' => 'event_espresso',
+					'plugin_basename'   => $settings['pue_options']['plugin_basename'],
+					// if use_wp_update is TRUE it means you want FREE versions of the plugin to be updated from WP
+					'use_wp_update'     => $settings['pue_options']['use_wp_update'],
+				]
+			);
+		}
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -24,11 +24,11 @@ 
         string $class_name,
         array $addon_args
     ): array {
-        if (! empty($addon_args['pue_options'])) {
-            $addon_api_settings[ $addon_name ]['pue_options'] = [
+        if ( ! empty($addon_args['pue_options'])) {
+            $addon_api_settings[$addon_name]['pue_options'] = [
                 'pue_plugin_slug' => isset($addon_args['pue_options']['pue_plugin_slug'])
                     ? (string) $addon_args['pue_options']['pue_plugin_slug']
-                    : 'espresso_' . strtolower($class_name),
+                    : 'espresso_'.strtolower($class_name),
                 'plugin_basename' => isset($addon_args['pue_options']['plugin_basename'])
                     ? (string) $addon_args['pue_options']['plugin_basename']
                     : plugin_basename($addon_args['main_file_path']),
@@ -52,8 +52,8 @@ 
     public static function setAddonPueSlug(EE_Addon $addon, string $addon_name)
     {
         // setup the add-on's pue_slug if we have one.
-        if (! empty(RegisterAddonPUE::$addon_api_settings[ $addon_name ]['pue_options']['pue_plugin_slug'])) {
-            $addon->setPueSlug(RegisterAddonPUE::$addon_api_settings[ $addon_name ]['pue_options']['pue_plugin_slug']);
+        if ( ! empty(RegisterAddonPUE::$addon_api_settings[$addon_name]['pue_options']['pue_plugin_slug'])) {
+            $addon->setPueSlug(RegisterAddonPUE::$addon_api_settings[$addon_name]['pue_options']['pue_plugin_slug']);
         }
     }
 
@@ -69,14 +69,14 @@ 
     public static function loadPueUpdate()
     {
         // PUE client existence
-        if (! is_readable(EE_THIRD_PARTY . 'pue/pue-client.php')) {
+        if ( ! is_readable(EE_THIRD_PARTY.'pue/pue-client.php')) {
             return;
         }
 
         /** @var EE_Network_Config $network_config */
         $network_config = LoaderFactory::getLoader()->getShared('EE_Network_Config');
         // load PUE client
-        require_once EE_THIRD_PARTY . 'pue/pue-client.php';
+        require_once EE_THIRD_PARTY.'pue/pue-client.php';
         $license_server = defined('PUE_UPDATES_ENDPOINT') ? PUE_UPDATES_ENDPOINT : 'https://eventespresso.com';
         // cycle thru settings
         foreach (RegisterAddonPUE::$addon_api_settings as $settings) {
@@ -90,7 +90,7 @@ 
                 // plugin slug(s)
                 [
                     'premium'    => ['p' => $settings['pue_options']['pue_plugin_slug']],
-                    'prerelease' => ['beta' => $settings['pue_options']['pue_plugin_slug'] . '-pr'],
+                    'prerelease' => ['beta' => $settings['pue_options']['pue_plugin_slug'].'-pr'],
                 ],
                 // options
                 [

core/domain/entities/routing/handlers/admin/EspressoEventsAdmin.php

Indentation +30 added lines, -30 removed lines

@@ -14,36 +14,36 @@
  */
 class EspressoEventsAdmin extends AdminRoute
 {
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   5.0.0.p
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        global $pagenow;
-        return parent::matchesCurrentRequest()
-               && $pagenow
-               && $pagenow === 'admin.php'
-               && $this->request->getRequestParam('page') === 'espresso_events';
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		global $pagenow;
+		return parent::matchesCurrentRequest()
+			   && $pagenow
+			   && $pagenow === 'admin.php'
+			   && $this->request->getRequestParam('page') === 'espresso_events';
+	}
 
 
-    /**
-     * @since 5.0.0.p
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\events\default_settings\AdvancedEditorAdminFormSection',
-            AdminRoute::getDefaultDependencies()
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\admin\AdminListTableFilters',
-            [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-    }
+	/**
+	 * @since 5.0.0.p
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\events\default_settings\AdvancedEditorAdminFormSection',
+			AdminRoute::getDefaultDependencies()
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\admin\AdminListTableFilters',
+			[
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+	}
 }

vendor/appsero/client/src/Insights.php

Indentation +832 added lines, -832 removed lines

@@ -10,807 +10,807 @@ 
  */
 class Insights {
 
-    /**
-     * The notice text
-     *
-     * @var string
-     */
-    public $notice;
-
-    /**
-     * Wheather to the notice or not
-     *
-     * @var boolean
-     */
-    protected $show_notice = true;
-
-    /**
-     * If extra data needs to be sent
-     *
-     * @var array
-     */
-    protected $extra_data = array();
-
-    /**
-     * AppSero\Client
-     *
-     * @var object
-     */
-    protected $client;
-
-    /**
-     * @var boolean
-     */
-    private $plugin_data = false;
-
-
-    /**
-     * Initialize the class
-     *
-     * @param      $client
-     * @param null $name
-     * @param null $file
-     */
-    public function __construct( $client, $name = null, $file = null ) {
-
-        if ( is_string( $client ) && ! empty( $name ) && ! empty( $file ) ) {
-            $client = new Client( $client, $name, $file );
-        }
-
-        if ( is_object( $client ) && is_a( $client, 'Appsero\Client' ) ) {
-            $this->client = $client;
-        }
-    }
-
-    /**
-     * Don't show the notice
-     *
-     * @return \self
-     */
-    public function hide_notice() {
-        $this->show_notice = false;
-
-        return $this;
-    }
-
-    /**
-     * Add plugin data if needed
-     *
-     * @return \self
-     */
-    public function add_plugin_data() {
-        $this->plugin_data = true;
-
-        return $this;
-    }
-
-    /**
-     * Add extra data if needed
-     *
-     * @param array $data
-     *
-     * @return \self
-     */
-    public function add_extra( $data = array() ) {
-        $this->extra_data = $data;
-
-        return $this;
-    }
-
-    /**
-     * Set custom notice text
-     *
-     * @param  string $text
-     *
-     * @return \self
-     */
-    public function notice($text='' ) {
-        $this->notice = $text;
-
-        return $this;
-    }
-
-    /**
-     * Initialize insights
-     *
-     * @return void
-     */
-    public function init() {
-        if ( $this->client->type == 'plugin' ) {
-            $this->init_plugin();
-        } else if ( $this->client->type == 'theme' ) {
-            $this->init_theme();
-        }
-    }
-
-    /**
-     * Initialize theme hooks
-     *
-     * @return void
-     */
-    public function init_theme() {
-        $this->init_common();
-
-        add_action( 'switch_theme', array( $this, 'deactivation_cleanup' ) );
-        add_action( 'switch_theme', array( $this, 'theme_deactivated' ), 12, 3 );
-    }
-
-    /**
-     * Initialize plugin hooks
-     *
-     * @return void
-     */
-    public function init_plugin() {
-        // plugin deactivate popup
-        if ( ! $this->is_local_server() ) {
-            add_filter( 'plugin_action_links_' . $this->client->basename, array( $this, 'plugin_action_links' ) );
-            add_action( 'admin_footer', array( $this, 'deactivate_scripts' ) );
-        }
-
-        $this->init_common();
-
-        register_activation_hook( $this->client->file, array( $this, 'activate_plugin' ) );
-        register_deactivation_hook( $this->client->file, array( $this, 'deactivation_cleanup' ) );
-    }
-
-    /**
-     * Initialize common hooks
-     *
-     * @return void
-     */
-    protected function init_common() {
-
-        if ( $this->show_notice ) {
-            // tracking notice
-            add_action( 'admin_notices', array( $this, 'admin_notice' ) );
-        }
-
-        add_action( 'admin_init', array( $this, 'handle_optin_optout' ) );
-
-        // uninstall reason
-        add_action( 'wp_ajax_' . $this->client->slug . '_submit-uninstall-reason', array( $this, 'uninstall_reason_submission' ) );
-
-        // cron events
-        add_filter( 'cron_schedules', array( $this, 'add_weekly_schedule' ) );
-        add_action( $this->client->slug . '_tracker_send_event', array( $this, 'send_tracking_data' ) );
-        // add_action( 'admin_init', array( $this, 'send_tracking_data' ) ); // test
-    }
-
-    /**
-     * Send tracking data to AppSero server
-     *
-     * @param  boolean  $override
-     *
-     * @return void
-     */
-    public function send_tracking_data( $override = false ) {
-        if ( ! $this->tracking_allowed() && ! $override ) {
-            return;
-        }
-
-        // Send a maximum of once per week
-        $last_send = $this->get_last_send();
-
-        if ( $last_send && $last_send > strtotime( '-1 week' ) ) {
-            return;
-        }
-
-        $tracking_data = $this->get_tracking_data();
-
-        $response = $this->client->send_request( $tracking_data, 'track' );
-
-        update_option( $this->client->slug . '_tracking_last_send', time() );
-    }
-
-    /**
-     * Get the tracking data points
-     *
-     * @return array
-     */
-    protected function get_tracking_data() {
-        $all_plugins = $this->get_all_plugins();
-
-        $users = get_users( array(
-            'role'    => 'administrator',
-            'orderby' => 'ID',
-            'order'   => 'ASC',
-            'number'  => 1,
-            'paged'   => 1,
-        ) );
-
-        $admin_user =  ( is_array( $users ) && ! empty( $users ) ) ? $users[0] : false;
-        $first_name = $last_name = '';
-
-        if ( $admin_user ) {
-            $first_name = $admin_user->first_name ? $admin_user->first_name : $admin_user->display_name;
-            $last_name  = $admin_user->last_name;
-        }
-
-        $data = array(
-            'url'              => esc_url( home_url() ),
-            'site'             => $this->get_site_name(),
-            'admin_email'      => get_option( 'admin_email' ),
-            'first_name'       => $first_name,
-            'last_name'        => $last_name,
-            'hash'             => $this->client->hash,
-            'server'           => $this->get_server_info(),
-            'wp'               => $this->get_wp_info(),
-            'users'            => $this->get_user_counts(),
-            'active_plugins'   => count( $all_plugins['active_plugins'] ),
-            'inactive_plugins' => count( $all_plugins['inactive_plugins'] ),
-            'ip_address'       => $this->get_user_ip_address(),
-            'project_version'  => $this->client->project_version,
-            'tracking_skipped' => false,
-            'is_local'         => $this->is_local_server(),
-        );
-
-        // Add Plugins
-        if ($this->plugin_data) {
-            
-            $plugins_data = array();
-
-            foreach ($all_plugins['active_plugins'] as $slug => $plugin) {
-                $slug = strstr($slug, '/', true);
-                if (! $slug) {
-                    continue;
-                }
-
-                $plugins_data[ $slug ] = array(
-                    'name' => isset($plugin['name']) ? $plugin['name'] : '',
-                    'version' => isset($plugin['version']) ? $plugin['version'] : '',
-                );
-            }
+	/**
+	 * The notice text
+	 *
+	 * @var string
+	 */
+	public $notice;
+
+	/**
+	 * Wheather to the notice or not
+	 *
+	 * @var boolean
+	 */
+	protected $show_notice = true;
+
+	/**
+	 * If extra data needs to be sent
+	 *
+	 * @var array
+	 */
+	protected $extra_data = array();
+
+	/**
+	 * AppSero\Client
+	 *
+	 * @var object
+	 */
+	protected $client;
+
+	/**
+	 * @var boolean
+	 */
+	private $plugin_data = false;
+
+
+	/**
+	 * Initialize the class
+	 *
+	 * @param      $client
+	 * @param null $name
+	 * @param null $file
+	 */
+	public function __construct( $client, $name = null, $file = null ) {
+
+		if ( is_string( $client ) && ! empty( $name ) && ! empty( $file ) ) {
+			$client = new Client( $client, $name, $file );
+		}
+
+		if ( is_object( $client ) && is_a( $client, 'Appsero\Client' ) ) {
+			$this->client = $client;
+		}
+	}
+
+	/**
+	 * Don't show the notice
+	 *
+	 * @return \self
+	 */
+	public function hide_notice() {
+		$this->show_notice = false;
+
+		return $this;
+	}
+
+	/**
+	 * Add plugin data if needed
+	 *
+	 * @return \self
+	 */
+	public function add_plugin_data() {
+		$this->plugin_data = true;
+
+		return $this;
+	}
+
+	/**
+	 * Add extra data if needed
+	 *
+	 * @param array $data
+	 *
+	 * @return \self
+	 */
+	public function add_extra( $data = array() ) {
+		$this->extra_data = $data;
+
+		return $this;
+	}
+
+	/**
+	 * Set custom notice text
+	 *
+	 * @param  string $text
+	 *
+	 * @return \self
+	 */
+	public function notice($text='' ) {
+		$this->notice = $text;
+
+		return $this;
+	}
+
+	/**
+	 * Initialize insights
+	 *
+	 * @return void
+	 */
+	public function init() {
+		if ( $this->client->type == 'plugin' ) {
+			$this->init_plugin();
+		} else if ( $this->client->type == 'theme' ) {
+			$this->init_theme();
+		}
+	}
+
+	/**
+	 * Initialize theme hooks
+	 *
+	 * @return void
+	 */
+	public function init_theme() {
+		$this->init_common();
+
+		add_action( 'switch_theme', array( $this, 'deactivation_cleanup' ) );
+		add_action( 'switch_theme', array( $this, 'theme_deactivated' ), 12, 3 );
+	}
+
+	/**
+	 * Initialize plugin hooks
+	 *
+	 * @return void
+	 */
+	public function init_plugin() {
+		// plugin deactivate popup
+		if ( ! $this->is_local_server() ) {
+			add_filter( 'plugin_action_links_' . $this->client->basename, array( $this, 'plugin_action_links' ) );
+			add_action( 'admin_footer', array( $this, 'deactivate_scripts' ) );
+		}
+
+		$this->init_common();
+
+		register_activation_hook( $this->client->file, array( $this, 'activate_plugin' ) );
+		register_deactivation_hook( $this->client->file, array( $this, 'deactivation_cleanup' ) );
+	}
+
+	/**
+	 * Initialize common hooks
+	 *
+	 * @return void
+	 */
+	protected function init_common() {
+
+		if ( $this->show_notice ) {
+			// tracking notice
+			add_action( 'admin_notices', array( $this, 'admin_notice' ) );
+		}
+
+		add_action( 'admin_init', array( $this, 'handle_optin_optout' ) );
+
+		// uninstall reason
+		add_action( 'wp_ajax_' . $this->client->slug . '_submit-uninstall-reason', array( $this, 'uninstall_reason_submission' ) );
+
+		// cron events
+		add_filter( 'cron_schedules', array( $this, 'add_weekly_schedule' ) );
+		add_action( $this->client->slug . '_tracker_send_event', array( $this, 'send_tracking_data' ) );
+		// add_action( 'admin_init', array( $this, 'send_tracking_data' ) ); // test
+	}
+
+	/**
+	 * Send tracking data to AppSero server
+	 *
+	 * @param  boolean  $override
+	 *
+	 * @return void
+	 */
+	public function send_tracking_data( $override = false ) {
+		if ( ! $this->tracking_allowed() && ! $override ) {
+			return;
+		}
+
+		// Send a maximum of once per week
+		$last_send = $this->get_last_send();
+
+		if ( $last_send && $last_send > strtotime( '-1 week' ) ) {
+			return;
+		}
+
+		$tracking_data = $this->get_tracking_data();
+
+		$response = $this->client->send_request( $tracking_data, 'track' );
+
+		update_option( $this->client->slug . '_tracking_last_send', time() );
+	}
+
+	/**
+	 * Get the tracking data points
+	 *
+	 * @return array
+	 */
+	protected function get_tracking_data() {
+		$all_plugins = $this->get_all_plugins();
+
+		$users = get_users( array(
+			'role'    => 'administrator',
+			'orderby' => 'ID',
+			'order'   => 'ASC',
+			'number'  => 1,
+			'paged'   => 1,
+		) );
+
+		$admin_user =  ( is_array( $users ) && ! empty( $users ) ) ? $users[0] : false;
+		$first_name = $last_name = '';
+
+		if ( $admin_user ) {
+			$first_name = $admin_user->first_name ? $admin_user->first_name : $admin_user->display_name;
+			$last_name  = $admin_user->last_name;
+		}
+
+		$data = array(
+			'url'              => esc_url( home_url() ),
+			'site'             => $this->get_site_name(),
+			'admin_email'      => get_option( 'admin_email' ),
+			'first_name'       => $first_name,
+			'last_name'        => $last_name,
+			'hash'             => $this->client->hash,
+			'server'           => $this->get_server_info(),
+			'wp'               => $this->get_wp_info(),
+			'users'            => $this->get_user_counts(),
+			'active_plugins'   => count( $all_plugins['active_plugins'] ),
+			'inactive_plugins' => count( $all_plugins['inactive_plugins'] ),
+			'ip_address'       => $this->get_user_ip_address(),
+			'project_version'  => $this->client->project_version,
+			'tracking_skipped' => false,
+			'is_local'         => $this->is_local_server(),
+		);
 
-            if (array_key_exists($this->client->slug, $plugins_data)) {
-                unset($plugins_data[$this->client->slug]);
-            }
+		// Add Plugins
+		if ($this->plugin_data) {
+            
+			$plugins_data = array();
+
+			foreach ($all_plugins['active_plugins'] as $slug => $plugin) {
+				$slug = strstr($slug, '/', true);
+				if (! $slug) {
+					continue;
+				}
+
+				$plugins_data[ $slug ] = array(
+					'name' => isset($plugin['name']) ? $plugin['name'] : '',
+					'version' => isset($plugin['version']) ? $plugin['version'] : '',
+				);
+			}
+
+			if (array_key_exists($this->client->slug, $plugins_data)) {
+				unset($plugins_data[$this->client->slug]);
+			}
             
-            $data['plugins'] = $plugins_data;
-        }
-
-        // Add metadata
-        if ( $extra = $this->get_extra_data() ) {
-            $data['extra'] = $extra;
-        }
-
-        // Check this has previously skipped tracking
-        $skipped = get_option( $this->client->slug . '_tracking_skipped' );
-
-        if ( $skipped === 'yes' ) {
-            delete_option( $this->client->slug . '_tracking_skipped' );
-
-            $data['tracking_skipped'] = true;
-        }
-
-        return apply_filters( $this->client->slug . '_tracker_data', $data );
-    }
-
-    /**
-     * If a child class wants to send extra data
-     *
-     * @return mixed
-     */
-    protected function get_extra_data() {
-        if ( is_callable( $this->extra_data ) ) {
-            return call_user_func( $this->extra_data );
-        }
-
-        if ( is_array( $this->extra_data ) ) {
-            return $this->extra_data;
-        }
-
-        return array();
-    }
-
-    /**
-     * Explain the user which data we collect
-     *
-     * @return array
-     */
-    protected function data_we_collect() {
-        $data = array(
-            'Server environment details (php, mysql, server, WordPress versions)',
-            'Number of users in your site',
-            'Site language',
-            'Number of active and inactive plugins',
-            'Site name and URL',
-            'Your name and email address',
-        );
-
-        if ($this->plugin_data) { 
-            array_splice($data, 4, 0, ["active plugins' name"]);
-        }
-
-        return $data;
-    }
-
-    /**
-     * Check if the user has opted into tracking
-     *
-     * @return bool
-     */
-    public function tracking_allowed() {
-        $allow_tracking = get_option( $this->client->slug . '_allow_tracking', 'no' );
-
-        return $allow_tracking == 'yes';
-    }
-
-    /**
-     * Get the last time a tracking was sent
-     *
-     * @return false|string
-     */
-    private function get_last_send() {
-        return get_option( $this->client->slug . '_tracking_last_send', false );
-    }
-
-    /**
-     * Check if the notice has been dismissed or enabled
-     *
-     * @return boolean
-     */
-    public function notice_dismissed() {
-        $hide_notice = get_option( $this->client->slug . '_tracking_notice', null );
-
-        if ( 'hide' == $hide_notice ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if the current server is localhost
-     *
-     * @return boolean
-     */
-    private function is_local_server() {
-
-        $host       = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : 'localhost';
-        $ip         = isset( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : '127.0.0.1';
-        $is_local   = false;
-
-        if( in_array( $ip,array( '127.0.0.1', '::1' ) )
-            || ! strpos( $host, '.' )
-            || in_array( strrchr( $host, '.' ), array( '.test', '.testing', '.local', '.localhost', '.localdomain' ) )
-        ) {
-            $is_local = true;
-        }
-
-        return apply_filters( 'appsero_is_local', $is_local );
-    }
-
-    /**
-     * Schedule the event weekly
-     *
-     * @return void
-     */
-    private function schedule_event() {
-        $hook_name = $this->client->slug . '_tracker_send_event';
-
-        if ( ! wp_next_scheduled( $hook_name ) ) {
-            wp_schedule_event( time(), 'weekly', $hook_name );
-        }
-    }
-
-    /**
-     * Clear any scheduled hook
-     *
-     * @return void
-     */
-    private function clear_schedule_event() {
-        wp_clear_scheduled_hook( $this->client->slug . '_tracker_send_event' );
-    }
-
-    /**
-     * Display the admin notice to users that have not opted-in or out
-     *
-     * @return void
-     */
-    public function admin_notice() {
-
-        if ( $this->notice_dismissed() ) {
-            return;
-        }
-
-        if ( $this->tracking_allowed() ) {
-            return;
-        }
-
-        if ( ! current_user_can( 'manage_options' ) ) {
-            return;
-        }
-
-        // don't show tracking if a local server
-        if ( $this->is_local_server() ) {
-            return;
-        }
-
-        $optin_url  = add_query_arg( $this->client->slug . '_tracker_optin', 'true' );
-        $optout_url = add_query_arg( $this->client->slug . '_tracker_optout', 'true' );
-
-        if ( empty( $this->notice ) ) {
-            $notice = sprintf( $this->client->__trans( 'Want to help make <strong>%1$s</strong> even more awesome? Allow %1$s to collect non-sensitive diagnostic data and usage information.' ), $this->client->name );
-        } else {
-            $notice = $this->notice;
-        }
-
-        $policy_url = 'https://' . 'appsero.com/privacy-policy/';
-
-        $notice .= ' (<a class="' . $this->client->slug . '-insights-data-we-collect" href="#">' . $this->client->__trans( 'what we collect' ) . '</a>)';
-        $notice .= '<p class="description" style="display:none;">' . implode( ', ', $this->data_we_collect() ) . '. No sensitive data is tracked. ';
-        $notice .= 'We are using Appsero to collect your data. <a href="' . $policy_url . '" target="_blank">Learn more</a> about how Appsero collects and handle your data.</p>';
-
-        echo '<div class="updated"><p>';
-            echo $notice;
-            echo '</p><p class="submit">';
-            echo '&nbsp;<a href="' . esc_url( $optin_url ) . '" class="button button--primary button--big">' . $this->client->__trans( 'Allow' ) . '</a>';
-            echo '&nbsp;<a href="' . esc_url( $optout_url ) . '" class="button button--secondary button--big">' .
-                 $this->client->__trans( 'No thanks' ) . '</a>';
-        echo '</p></div>';
-
-        echo "<script type='text/javascript'>jQuery('." . $this->client->slug . "-insights-data-we-collect').on('click', function(e) {
+			$data['plugins'] = $plugins_data;
+		}
+
+		// Add metadata
+		if ( $extra = $this->get_extra_data() ) {
+			$data['extra'] = $extra;
+		}
+
+		// Check this has previously skipped tracking
+		$skipped = get_option( $this->client->slug . '_tracking_skipped' );
+
+		if ( $skipped === 'yes' ) {
+			delete_option( $this->client->slug . '_tracking_skipped' );
+
+			$data['tracking_skipped'] = true;
+		}
+
+		return apply_filters( $this->client->slug . '_tracker_data', $data );
+	}
+
+	/**
+	 * If a child class wants to send extra data
+	 *
+	 * @return mixed
+	 */
+	protected function get_extra_data() {
+		if ( is_callable( $this->extra_data ) ) {
+			return call_user_func( $this->extra_data );
+		}
+
+		if ( is_array( $this->extra_data ) ) {
+			return $this->extra_data;
+		}
+
+		return array();
+	}
+
+	/**
+	 * Explain the user which data we collect
+	 *
+	 * @return array
+	 */
+	protected function data_we_collect() {
+		$data = array(
+			'Server environment details (php, mysql, server, WordPress versions)',
+			'Number of users in your site',
+			'Site language',
+			'Number of active and inactive plugins',
+			'Site name and URL',
+			'Your name and email address',
+		);
+
+		if ($this->plugin_data) { 
+			array_splice($data, 4, 0, ["active plugins' name"]);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Check if the user has opted into tracking
+	 *
+	 * @return bool
+	 */
+	public function tracking_allowed() {
+		$allow_tracking = get_option( $this->client->slug . '_allow_tracking', 'no' );
+
+		return $allow_tracking == 'yes';
+	}
+
+	/**
+	 * Get the last time a tracking was sent
+	 *
+	 * @return false|string
+	 */
+	private function get_last_send() {
+		return get_option( $this->client->slug . '_tracking_last_send', false );
+	}
+
+	/**
+	 * Check if the notice has been dismissed or enabled
+	 *
+	 * @return boolean
+	 */
+	public function notice_dismissed() {
+		$hide_notice = get_option( $this->client->slug . '_tracking_notice', null );
+
+		if ( 'hide' == $hide_notice ) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check if the current server is localhost
+	 *
+	 * @return boolean
+	 */
+	private function is_local_server() {
+
+		$host       = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : 'localhost';
+		$ip         = isset( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : '127.0.0.1';
+		$is_local   = false;
+
+		if( in_array( $ip,array( '127.0.0.1', '::1' ) )
+			|| ! strpos( $host, '.' )
+			|| in_array( strrchr( $host, '.' ), array( '.test', '.testing', '.local', '.localhost', '.localdomain' ) )
+		) {
+			$is_local = true;
+		}
+
+		return apply_filters( 'appsero_is_local', $is_local );
+	}
+
+	/**
+	 * Schedule the event weekly
+	 *
+	 * @return void
+	 */
+	private function schedule_event() {
+		$hook_name = $this->client->slug . '_tracker_send_event';
+
+		if ( ! wp_next_scheduled( $hook_name ) ) {
+			wp_schedule_event( time(), 'weekly', $hook_name );
+		}
+	}
+
+	/**
+	 * Clear any scheduled hook
+	 *
+	 * @return void
+	 */
+	private function clear_schedule_event() {
+		wp_clear_scheduled_hook( $this->client->slug . '_tracker_send_event' );
+	}
+
+	/**
+	 * Display the admin notice to users that have not opted-in or out
+	 *
+	 * @return void
+	 */
+	public function admin_notice() {
+
+		if ( $this->notice_dismissed() ) {
+			return;
+		}
+
+		if ( $this->tracking_allowed() ) {
+			return;
+		}
+
+		if ( ! current_user_can( 'manage_options' ) ) {
+			return;
+		}
+
+		// don't show tracking if a local server
+		if ( $this->is_local_server() ) {
+			return;
+		}
+
+		$optin_url  = add_query_arg( $this->client->slug . '_tracker_optin', 'true' );
+		$optout_url = add_query_arg( $this->client->slug . '_tracker_optout', 'true' );
+
+		if ( empty( $this->notice ) ) {
+			$notice = sprintf( $this->client->__trans( 'Want to help make <strong>%1$s</strong> even more awesome? Allow %1$s to collect non-sensitive diagnostic data and usage information.' ), $this->client->name );
+		} else {
+			$notice = $this->notice;
+		}
+
+		$policy_url = 'https://' . 'appsero.com/privacy-policy/';
+
+		$notice .= ' (<a class="' . $this->client->slug . '-insights-data-we-collect" href="#">' . $this->client->__trans( 'what we collect' ) . '</a>)';
+		$notice .= '<p class="description" style="display:none;">' . implode( ', ', $this->data_we_collect() ) . '. No sensitive data is tracked. ';
+		$notice .= 'We are using Appsero to collect your data. <a href="' . $policy_url . '" target="_blank">Learn more</a> about how Appsero collects and handle your data.</p>';
+
+		echo '<div class="updated"><p>';
+			echo $notice;
+			echo '</p><p class="submit">';
+			echo '&nbsp;<a href="' . esc_url( $optin_url ) . '" class="button button--primary button--big">' . $this->client->__trans( 'Allow' ) . '</a>';
+			echo '&nbsp;<a href="' . esc_url( $optout_url ) . '" class="button button--secondary button--big">' .
+				 $this->client->__trans( 'No thanks' ) . '</a>';
+		echo '</p></div>';
+
+		echo "<script type='text/javascript'>jQuery('." . $this->client->slug . "-insights-data-we-collect').on('click', function(e) {
                 e.preventDefault();
                 jQuery(this).parents('.updated').find('p.description').slideToggle('fast');
             });
             </script>
         ";
-    }
-
-    /**
-     * handle the optin/optout
-     *
-     * @return void
-     */
-    public function handle_optin_optout() {
-
-        if ( isset( $_GET[ $this->client->slug . '_tracker_optin' ] ) && $_GET[ $this->client->slug . '_tracker_optin' ] == 'true' ) {
-            $this->optin();
-
-            wp_redirect( remove_query_arg( $this->client->slug . '_tracker_optin' ) );
-            exit;
-        }
-
-        if ( isset( $_GET[ $this->client->slug . '_tracker_optout' ] ) && $_GET[ $this->client->slug . '_tracker_optout' ] == 'true' ) {
-            $this->optout();
-
-            wp_redirect( remove_query_arg( $this->client->slug . '_tracker_optout' ) );
-            exit;
-        }
-    }
-
-    /**
-     * Tracking optin
-     *
-     * @return void
-     */
-    public function optin() {
-        update_option( $this->client->slug . '_allow_tracking', 'yes' );
-        update_option( $this->client->slug . '_tracking_notice', 'hide' );
-
-        $this->clear_schedule_event();
-        $this->schedule_event();
-        $this->send_tracking_data();
-    }
-
-    /**
-     * Optout from tracking
-     *
-     * @return void
-     */
-    public function optout() {
-        update_option( $this->client->slug . '_allow_tracking', 'no' );
-        update_option( $this->client->slug . '_tracking_notice', 'hide' );
-
-        $this->send_tracking_skipped_request();
-
-        $this->clear_schedule_event();
-    }
-
-    /**
-     * Get the number of post counts
-     *
-     * @param  string  $post_type
-     *
-     * @return integer
-     */
-    public function get_post_count( $post_type ) {
-        global $wpdb;
-
-        return (int) $wpdb->get_var( "SELECT count(ID) FROM $wpdb->posts WHERE post_type = '$post_type' and post_status = 'publish'");
-    }
-
-    /**
-     * Get server related info.
-     *
-     * @return array
-     */
-    private static function get_server_info() {
-        global $wpdb;
-
-        $server_data = array();
-
-        if ( isset( $_SERVER['SERVER_SOFTWARE'] ) && ! empty( $_SERVER['SERVER_SOFTWARE'] ) ) {
-            $server_data['software'] = $_SERVER['SERVER_SOFTWARE'];
-        }
-
-        if ( function_exists( 'phpversion' ) ) {
-            $server_data['php_version'] = phpversion();
-        }
-
-        $server_data['mysql_version']        = $wpdb->db_version();
-
-        $server_data['php_max_upload_size']  = size_format( wp_max_upload_size() );
-        $server_data['php_default_timezone'] = date_default_timezone_get();
-        $server_data['php_soap']             = class_exists( 'SoapClient' ) ? 'Yes' : 'No';
-        $server_data['php_fsockopen']        = function_exists( 'fsockopen' ) ? 'Yes' : 'No';
-        $server_data['php_curl']             = function_exists( 'curl_init' ) ? 'Yes' : 'No';
-
-        return $server_data;
-    }
-
-    /**
-     * Get WordPress related data.
-     *
-     * @return array
-     */
-    private function get_wp_info() {
-        $wp_data = array();
-
-        $wp_data['memory_limit'] = WP_MEMORY_LIMIT;
-        $wp_data['debug_mode']   = ( defined('WP_DEBUG') && WP_DEBUG ) ? 'Yes' : 'No';
-        $wp_data['locale']       = get_locale();
-        $wp_data['version']      = get_bloginfo( 'version' );
-        $wp_data['multisite']    = is_multisite() ? 'Yes' : 'No';
-        $wp_data['theme_slug']   = get_stylesheet();
-
-        $theme = wp_get_theme( $wp_data['theme_slug'] );
-
-        $wp_data['theme_name']    = $theme->get( 'Name' );
-        $wp_data['theme_version'] = $theme->get( 'Version' );
-        $wp_data['theme_uri']     = $theme->get( 'ThemeURI' );
-        $wp_data['theme_author']  = $theme->get( 'Author' );
-
-        return $wp_data;
-    }
-
-    /**
-     * Get the list of active and inactive plugins
-     *
-     * @return array
-     */
-    private function get_all_plugins() {
-        // Ensure get_plugins function is loaded
-        if ( ! function_exists( 'get_plugins' ) ) {
-            include ABSPATH . '/wp-admin/includes/plugin.php';
-        }
-
-        $plugins             = get_plugins();
-        $active_plugins_keys = get_option( 'active_plugins', array() );
-        $active_plugins      = array();
-
-        foreach ( $plugins as $k => $v ) {
-            // Take care of formatting the data how we want it.
-            $formatted = array();
-            $formatted['name'] = strip_tags( $v['Name'] );
-
-            if ( isset( $v['Version'] ) ) {
-                $formatted['version'] = strip_tags( $v['Version'] );
-            }
-
-            if ( isset( $v['Author'] ) ) {
-                $formatted['author'] = strip_tags( $v['Author'] );
-            }
-
-            if ( isset( $v['Network'] ) ) {
-                $formatted['network'] = strip_tags( $v['Network'] );
-            }
-
-            if ( isset( $v['PluginURI'] ) ) {
-                $formatted['plugin_uri'] = strip_tags( $v['PluginURI'] );
-            }
-
-            if ( in_array( $k, $active_plugins_keys ) ) {
-                // Remove active plugins from list so we can show active and inactive separately
-                unset( $plugins[$k] );
-                $active_plugins[$k] = $formatted;
-            } else {
-                $plugins[$k] = $formatted;
-            }
-        }
-
-        return array( 'active_plugins' => $active_plugins, 'inactive_plugins' => $plugins );
-    }
-
-    /**
-     * Get user totals based on user role.
-     *
-     * @return array
-     */
-    public function get_user_counts() {
-        $user_count          = array();
-        $user_count_data     = count_users();
-        $user_count['total'] = $user_count_data['total_users'];
-
-        // Get user count based on user role
-        foreach ( $user_count_data['avail_roles'] as $role => $count ) {
-            if ( ! $count ) {
-                continue;
-            }
+	}
+
+	/**
+	 * handle the optin/optout
+	 *
+	 * @return void
+	 */
+	public function handle_optin_optout() {
+
+		if ( isset( $_GET[ $this->client->slug . '_tracker_optin' ] ) && $_GET[ $this->client->slug . '_tracker_optin' ] == 'true' ) {
+			$this->optin();
+
+			wp_redirect( remove_query_arg( $this->client->slug . '_tracker_optin' ) );
+			exit;
+		}
+
+		if ( isset( $_GET[ $this->client->slug . '_tracker_optout' ] ) && $_GET[ $this->client->slug . '_tracker_optout' ] == 'true' ) {
+			$this->optout();
+
+			wp_redirect( remove_query_arg( $this->client->slug . '_tracker_optout' ) );
+			exit;
+		}
+	}
+
+	/**
+	 * Tracking optin
+	 *
+	 * @return void
+	 */
+	public function optin() {
+		update_option( $this->client->slug . '_allow_tracking', 'yes' );
+		update_option( $this->client->slug . '_tracking_notice', 'hide' );
+
+		$this->clear_schedule_event();
+		$this->schedule_event();
+		$this->send_tracking_data();
+	}
+
+	/**
+	 * Optout from tracking
+	 *
+	 * @return void
+	 */
+	public function optout() {
+		update_option( $this->client->slug . '_allow_tracking', 'no' );
+		update_option( $this->client->slug . '_tracking_notice', 'hide' );
+
+		$this->send_tracking_skipped_request();
+
+		$this->clear_schedule_event();
+	}
+
+	/**
+	 * Get the number of post counts
+	 *
+	 * @param  string  $post_type
+	 *
+	 * @return integer
+	 */
+	public function get_post_count( $post_type ) {
+		global $wpdb;
+
+		return (int) $wpdb->get_var( "SELECT count(ID) FROM $wpdb->posts WHERE post_type = '$post_type' and post_status = 'publish'");
+	}
+
+	/**
+	 * Get server related info.
+	 *
+	 * @return array
+	 */
+	private static function get_server_info() {
+		global $wpdb;
+
+		$server_data = array();
+
+		if ( isset( $_SERVER['SERVER_SOFTWARE'] ) && ! empty( $_SERVER['SERVER_SOFTWARE'] ) ) {
+			$server_data['software'] = $_SERVER['SERVER_SOFTWARE'];
+		}
+
+		if ( function_exists( 'phpversion' ) ) {
+			$server_data['php_version'] = phpversion();
+		}
+
+		$server_data['mysql_version']        = $wpdb->db_version();
+
+		$server_data['php_max_upload_size']  = size_format( wp_max_upload_size() );
+		$server_data['php_default_timezone'] = date_default_timezone_get();
+		$server_data['php_soap']             = class_exists( 'SoapClient' ) ? 'Yes' : 'No';
+		$server_data['php_fsockopen']        = function_exists( 'fsockopen' ) ? 'Yes' : 'No';
+		$server_data['php_curl']             = function_exists( 'curl_init' ) ? 'Yes' : 'No';
+
+		return $server_data;
+	}
+
+	/**
+	 * Get WordPress related data.
+	 *
+	 * @return array
+	 */
+	private function get_wp_info() {
+		$wp_data = array();
+
+		$wp_data['memory_limit'] = WP_MEMORY_LIMIT;
+		$wp_data['debug_mode']   = ( defined('WP_DEBUG') && WP_DEBUG ) ? 'Yes' : 'No';
+		$wp_data['locale']       = get_locale();
+		$wp_data['version']      = get_bloginfo( 'version' );
+		$wp_data['multisite']    = is_multisite() ? 'Yes' : 'No';
+		$wp_data['theme_slug']   = get_stylesheet();
+
+		$theme = wp_get_theme( $wp_data['theme_slug'] );
+
+		$wp_data['theme_name']    = $theme->get( 'Name' );
+		$wp_data['theme_version'] = $theme->get( 'Version' );
+		$wp_data['theme_uri']     = $theme->get( 'ThemeURI' );
+		$wp_data['theme_author']  = $theme->get( 'Author' );
+
+		return $wp_data;
+	}
+
+	/**
+	 * Get the list of active and inactive plugins
+	 *
+	 * @return array
+	 */
+	private function get_all_plugins() {
+		// Ensure get_plugins function is loaded
+		if ( ! function_exists( 'get_plugins' ) ) {
+			include ABSPATH . '/wp-admin/includes/plugin.php';
+		}
+
+		$plugins             = get_plugins();
+		$active_plugins_keys = get_option( 'active_plugins', array() );
+		$active_plugins      = array();
+
+		foreach ( $plugins as $k => $v ) {
+			// Take care of formatting the data how we want it.
+			$formatted = array();
+			$formatted['name'] = strip_tags( $v['Name'] );
+
+			if ( isset( $v['Version'] ) ) {
+				$formatted['version'] = strip_tags( $v['Version'] );
+			}
+
+			if ( isset( $v['Author'] ) ) {
+				$formatted['author'] = strip_tags( $v['Author'] );
+			}
+
+			if ( isset( $v['Network'] ) ) {
+				$formatted['network'] = strip_tags( $v['Network'] );
+			}
+
+			if ( isset( $v['PluginURI'] ) ) {
+				$formatted['plugin_uri'] = strip_tags( $v['PluginURI'] );
+			}
+
+			if ( in_array( $k, $active_plugins_keys ) ) {
+				// Remove active plugins from list so we can show active and inactive separately
+				unset( $plugins[$k] );
+				$active_plugins[$k] = $formatted;
+			} else {
+				$plugins[$k] = $formatted;
+			}
+		}
+
+		return array( 'active_plugins' => $active_plugins, 'inactive_plugins' => $plugins );
+	}
+
+	/**
+	 * Get user totals based on user role.
+	 *
+	 * @return array
+	 */
+	public function get_user_counts() {
+		$user_count          = array();
+		$user_count_data     = count_users();
+		$user_count['total'] = $user_count_data['total_users'];
+
+		// Get user count based on user role
+		foreach ( $user_count_data['avail_roles'] as $role => $count ) {
+			if ( ! $count ) {
+				continue;
+			}
+
+			$user_count[ $role ] = $count;
+		}
+
+		return $user_count;
+	}
+
+	/**
+	 * Add weekly cron schedule
+	 *
+	 * @param array  $schedules
+	 *
+	 * @return array
+	 */
+	public function add_weekly_schedule( $schedules ) {
+
+		$schedules['weekly'] = array(
+			'interval' => DAY_IN_SECONDS * 7,
+			'display'  => 'Once Weekly',
+		);
 
-            $user_count[ $role ] = $count;
-        }
-
-        return $user_count;
-    }
-
-    /**
-     * Add weekly cron schedule
-     *
-     * @param array  $schedules
-     *
-     * @return array
-     */
-    public function add_weekly_schedule( $schedules ) {
-
-        $schedules['weekly'] = array(
-            'interval' => DAY_IN_SECONDS * 7,
-            'display'  => 'Once Weekly',
-        );
-
-        return $schedules;
-    }
-
-    /**
-     * Plugin activation hook
-     *
-     * @return void
-     */
-    public function activate_plugin() {
-        $allowed = get_option( $this->client->slug . '_allow_tracking', 'no' );
-
-        // if it wasn't allowed before, do nothing
-        if ( 'yes' !== $allowed ) {
-            return;
-        }
-
-        // re-schedule and delete the last sent time so we could force send again
-        $hook_name = $this->client->slug . '_tracker_send_event';
-        if ( ! wp_next_scheduled( $hook_name ) ) {
-            wp_schedule_event( time(), 'weekly', $hook_name );
-        }
-
-        delete_option( $this->client->slug . '_tracking_last_send' );
-
-        $this->send_tracking_data( true );
-    }
-
-    /**
-     * Clear our options upon deactivation
-     *
-     * @return void
-     */
-    public function deactivation_cleanup() {
-        $this->clear_schedule_event();
-
-        if ( 'theme' == $this->client->type ) {
-            delete_option( $this->client->slug . '_tracking_last_send' );
-            delete_option( $this->client->slug . '_allow_tracking' );
-        }
-
-        delete_option( $this->client->slug . '_tracking_notice' );
-    }
-
-    /**
-     * Hook into action links and modify the deactivate link
-     *
-     * @param  array  $links
-     *
-     * @return array
-     */
-    public function plugin_action_links( $links ) {
-
-        if ( array_key_exists( 'deactivate', $links ) ) {
-            $links['deactivate'] = str_replace( '<a', '<a class="' . $this->client->slug . '-deactivate-link"', $links['deactivate'] );
-        }
-
-        return $links;
-    }
-
-    /**
-     * Plugin uninstall reasons
-     *
-     * @return array
-     */
-    private function get_uninstall_reasons() {
-        $reasons = array(
+		return $schedules;
+	}
+
+	/**
+	 * Plugin activation hook
+	 *
+	 * @return void
+	 */
+	public function activate_plugin() {
+		$allowed = get_option( $this->client->slug . '_allow_tracking', 'no' );
+
+		// if it wasn't allowed before, do nothing
+		if ( 'yes' !== $allowed ) {
+			return;
+		}
+
+		// re-schedule and delete the last sent time so we could force send again
+		$hook_name = $this->client->slug . '_tracker_send_event';
+		if ( ! wp_next_scheduled( $hook_name ) ) {
+			wp_schedule_event( time(), 'weekly', $hook_name );
+		}
+
+		delete_option( $this->client->slug . '_tracking_last_send' );
+
+		$this->send_tracking_data( true );
+	}
+
+	/**
+	 * Clear our options upon deactivation
+	 *
+	 * @return void
+	 */
+	public function deactivation_cleanup() {
+		$this->clear_schedule_event();
+
+		if ( 'theme' == $this->client->type ) {
+			delete_option( $this->client->slug . '_tracking_last_send' );
+			delete_option( $this->client->slug . '_allow_tracking' );
+		}
+
+		delete_option( $this->client->slug . '_tracking_notice' );
+	}
+
+	/**
+	 * Hook into action links and modify the deactivate link
+	 *
+	 * @param  array  $links
+	 *
+	 * @return array
+	 */
+	public function plugin_action_links( $links ) {
+
+		if ( array_key_exists( 'deactivate', $links ) ) {
+			$links['deactivate'] = str_replace( '<a', '<a class="' . $this->client->slug . '-deactivate-link"', $links['deactivate'] );
+		}
+
+		return $links;
+	}
+
+	/**
+	 * Plugin uninstall reasons
+	 *
+	 * @return array
+	 */
+	private function get_uninstall_reasons() {
+		$reasons = array(
 			array(
 				'id'          => 'could-not-understand',
 				'text'        => $this->client->__trans( "Couldn't understand" ),
 				'placeholder' => $this->client->__trans( 'Would you like us to assist you?' ),
-                'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><g fill="none"><g fill="#3B86FF"><path d="M11.5 0C17.9 0 23 5.1 23 11.5 23 17.9 17.9 23 11.5 23 10.6 23 9.6 22.9 8.8 22.7L8.8 22.6C9.3 22.5 9.7 22.3 10 21.9 10.3 21.6 10.4 21.3 10.4 20.9 10.8 21 11.1 21 11.5 21 16.7 21 21 16.7 21 11.5 21 6.3 16.7 2 11.5 2 6.3 2 2 6.3 2 11.5 2 13 2.3 14.3 2.9 15.6 2.7 16 2.4 16.3 2.2 16.8L2.1 17.1 2.1 17.3C2 17.5 2 17.7 2 18 0.7 16.1 0 13.9 0 11.5 0 5.1 5.1 0 11.5 0ZM6 13.6C6 13.7 6.1 13.8 6.1 13.9 6.3 14.5 6.2 15.7 6.1 16.4 6.1 16.6 6 16.9 6 17.1 6 17.1 6.1 17.1 6.1 17.1 7.1 16.9 8.2 16 9.3 15.5 9.8 15.2 10.4 15 10.9 15 11.2 15 11.4 15 11.6 15.2 11.9 15.4 12.1 16 11.6 16.4 11.5 16.5 11.3 16.6 11.1 16.7 10.5 17 9.9 17.4 9.3 17.7 9 17.9 9 18.1 9.1 18.5 9.2 18.9 9.3 19.4 9.3 19.8 9.4 20.3 9.3 20.8 9 21.2 8.8 21.5 8.5 21.6 8.1 21.7 7.9 21.8 7.6 21.9 7.3 21.9L6.5 22C6.3 22 6 21.9 5.8 21.9 5 21.8 4.4 21.5 3.9 20.9 3.3 20.4 3.1 19.6 3 18.8L3 18.5C3 18.2 3 17.9 3.1 17.7L3.1 17.6C3.2 17.1 3.5 16.7 3.7 16.3 4 15.9 4.2 15.4 4.3 15 4.4 14.6 4.4 14.5 4.6 14.2 4.6 13.9 4.7 13.7 4.9 13.6 5.2 13.2 5.7 13.2 6 13.6ZM11.7 11.2C13.1 11.2 14.3 11.7 15.2 12.9 15.3 13 15.4 13.1 15.4 13.2 15.4 13.4 15.3 13.8 15.2 13.8 15 13.9 14.9 13.8 14.8 13.7 14.6 13.5 14.4 13.2 14.1 13.1 13.5 12.6 12.8 12.3 12 12.2 10.7 12.1 9.5 12.3 8.4 12.8 8.3 12.8 8.2 12.8 8.1 12.8 7.9 12.8 7.8 12.4 7.8 12.2 7.7 12.1 7.8 11.9 8 11.8 8.4 11.7 8.8 11.5 9.2 11.4 10 11.2 10.9 11.1 11.7 11.2ZM16.3 5.9C17.3 5.9 18 6.6 18 7.6 18 8.5 17.3 9.3 16.3 9.3 15.4 9.3 14.7 8.5 14.7 7.6 14.7 6.6 15.4 5.9 16.3 5.9ZM8.3 5C9.2 5 9.9 5.8 9.9 6.7 9.9 7.7 9.2 8.4 8.2 8.4 7.3 8.4 6.6 7.7 6.6 6.7 6.6 5.8 7.3 5 8.3 5Z"/></g></g></svg>'
+				'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><g fill="none"><g fill="#3B86FF"><path d="M11.5 0C17.9 0 23 5.1 23 11.5 23 17.9 17.9 23 11.5 23 10.6 23 9.6 22.9 8.8 22.7L8.8 22.6C9.3 22.5 9.7 22.3 10 21.9 10.3 21.6 10.4 21.3 10.4 20.9 10.8 21 11.1 21 11.5 21 16.7 21 21 16.7 21 11.5 21 6.3 16.7 2 11.5 2 6.3 2 2 6.3 2 11.5 2 13 2.3 14.3 2.9 15.6 2.7 16 2.4 16.3 2.2 16.8L2.1 17.1 2.1 17.3C2 17.5 2 17.7 2 18 0.7 16.1 0 13.9 0 11.5 0 5.1 5.1 0 11.5 0ZM6 13.6C6 13.7 6.1 13.8 6.1 13.9 6.3 14.5 6.2 15.7 6.1 16.4 6.1 16.6 6 16.9 6 17.1 6 17.1 6.1 17.1 6.1 17.1 7.1 16.9 8.2 16 9.3 15.5 9.8 15.2 10.4 15 10.9 15 11.2 15 11.4 15 11.6 15.2 11.9 15.4 12.1 16 11.6 16.4 11.5 16.5 11.3 16.6 11.1 16.7 10.5 17 9.9 17.4 9.3 17.7 9 17.9 9 18.1 9.1 18.5 9.2 18.9 9.3 19.4 9.3 19.8 9.4 20.3 9.3 20.8 9 21.2 8.8 21.5 8.5 21.6 8.1 21.7 7.9 21.8 7.6 21.9 7.3 21.9L6.5 22C6.3 22 6 21.9 5.8 21.9 5 21.8 4.4 21.5 3.9 20.9 3.3 20.4 3.1 19.6 3 18.8L3 18.5C3 18.2 3 17.9 3.1 17.7L3.1 17.6C3.2 17.1 3.5 16.7 3.7 16.3 4 15.9 4.2 15.4 4.3 15 4.4 14.6 4.4 14.5 4.6 14.2 4.6 13.9 4.7 13.7 4.9 13.6 5.2 13.2 5.7 13.2 6 13.6ZM11.7 11.2C13.1 11.2 14.3 11.7 15.2 12.9 15.3 13 15.4 13.1 15.4 13.2 15.4 13.4 15.3 13.8 15.2 13.8 15 13.9 14.9 13.8 14.8 13.7 14.6 13.5 14.4 13.2 14.1 13.1 13.5 12.6 12.8 12.3 12 12.2 10.7 12.1 9.5 12.3 8.4 12.8 8.3 12.8 8.2 12.8 8.1 12.8 7.9 12.8 7.8 12.4 7.8 12.2 7.7 12.1 7.8 11.9 8 11.8 8.4 11.7 8.8 11.5 9.2 11.4 10 11.2 10.9 11.1 11.7 11.2ZM16.3 5.9C17.3 5.9 18 6.6 18 7.6 18 8.5 17.3 9.3 16.3 9.3 15.4 9.3 14.7 8.5 14.7 7.6 14.7 6.6 15.4 5.9 16.3 5.9ZM8.3 5C9.2 5 9.9 5.8 9.9 6.7 9.9 7.7 9.2 8.4 8.2 8.4 7.3 8.4 6.6 7.7 6.6 6.7 6.6 5.8 7.3 5 8.3 5Z"/></g></g></svg>'
 			),
 			array(
 				'id'          => 'found-better-plugin',
 				'text'        => $this->client->__trans( 'Found a better plugin' ),
 				'placeholder' => $this->client->__trans( 'Which plugin?' ),
-                'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><g fill="none"><g fill="#3B86FF"><path d="M17.1 14L22.4 19.3C23.2 20.2 23.2 21.5 22.4 22.4 21.5 23.2 20.2 23.2 19.3 22.4L19.3 22.4 14 17.1C15.3 16.3 16.3 15.3 17.1 14L17.1 14ZM8.6 0C13.4 0 17.3 3.9 17.3 8.6 17.3 13.4 13.4 17.2 8.6 17.2 3.9 17.2 0 13.4 0 8.6 0 3.9 3.9 0 8.6 0ZM8.6 2.2C5.1 2.2 2.2 5.1 2.2 8.6 2.2 12.2 5.1 15.1 8.6 15.1 12.2 15.1 15.1 12.2 15.1 8.6 15.1 5.1 12.2 2.2 8.6 2.2ZM8.6 3.6L8.6 5C6.6 5 5 6.6 5 8.6L5 8.6 3.6 8.6C3.6 5.9 5.9 3.6 8.6 3.6L8.6 3.6Z"/></g></g></svg>',
+				'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><g fill="none"><g fill="#3B86FF"><path d="M17.1 14L22.4 19.3C23.2 20.2 23.2 21.5 22.4 22.4 21.5 23.2 20.2 23.2 19.3 22.4L19.3 22.4 14 17.1C15.3 16.3 16.3 15.3 17.1 14L17.1 14ZM8.6 0C13.4 0 17.3 3.9 17.3 8.6 17.3 13.4 13.4 17.2 8.6 17.2 3.9 17.2 0 13.4 0 8.6 0 3.9 3.9 0 8.6 0ZM8.6 2.2C5.1 2.2 2.2 5.1 2.2 8.6 2.2 12.2 5.1 15.1 8.6 15.1 12.2 15.1 15.1 12.2 15.1 8.6 15.1 5.1 12.2 2.2 8.6 2.2ZM8.6 3.6L8.6 5C6.6 5 5 6.6 5 8.6L5 8.6 3.6 8.6C3.6 5.9 5.9 3.6 8.6 3.6L8.6 3.6Z"/></g></g></svg>',
 			),
 			array(
 				'id'          => 'not-have-that-feature',
 				'text'        => $this->client->__trans( "Missing a specific feature" ),
 				'placeholder' => $this->client->__trans( 'Could you tell us more about that feature?' ),
-                'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="17" viewBox="0 0 24 17"><g fill="none"><g fill="#3B86FF"><path d="M19.4 0C19.7 0.6 19.8 1.3 19.8 2 19.8 3.2 19.4 4.4 18.5 5.3 17.6 6.2 16.5 6.7 15.2 6.7 15.2 6.7 15.2 6.7 15.2 6.7 14 6.7 12.9 6.2 12 5.3 11.2 4.4 10.7 3.3 10.7 2 10.7 1.3 10.8 0.6 11.1 0L7.6 0 7 0 6.5 0 6.5 5.7C6.3 5.6 5.9 5.3 5.6 5.1 5 4.6 4.3 4.3 3.5 4.3 3.5 4.3 3.5 4.3 3.4 4.3 1.6 4.4 0 5.9 0 7.9 0 8.6 0.2 9.2 0.5 9.7 1.1 10.8 2.2 11.5 3.5 11.5 4.3 11.5 5 11.2 5.6 10.8 6 10.5 6.3 10.3 6.5 10.2L6.5 10.2 6.5 17 6.5 17 7 17 7.6 17 22.5 17C23.3 17 24 16.3 24 15.5L24 0 19.4 0Z"/></g></g></svg>',
+				'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="17" viewBox="0 0 24 17"><g fill="none"><g fill="#3B86FF"><path d="M19.4 0C19.7 0.6 19.8 1.3 19.8 2 19.8 3.2 19.4 4.4 18.5 5.3 17.6 6.2 16.5 6.7 15.2 6.7 15.2 6.7 15.2 6.7 15.2 6.7 14 6.7 12.9 6.2 12 5.3 11.2 4.4 10.7 3.3 10.7 2 10.7 1.3 10.8 0.6 11.1 0L7.6 0 7 0 6.5 0 6.5 5.7C6.3 5.6 5.9 5.3 5.6 5.1 5 4.6 4.3 4.3 3.5 4.3 3.5 4.3 3.5 4.3 3.4 4.3 1.6 4.4 0 5.9 0 7.9 0 8.6 0.2 9.2 0.5 9.7 1.1 10.8 2.2 11.5 3.5 11.5 4.3 11.5 5 11.2 5.6 10.8 6 10.5 6.3 10.3 6.5 10.2L6.5 10.2 6.5 17 6.5 17 7 17 7.6 17 22.5 17C23.3 17 24 16.3 24 15.5L24 0 19.4 0Z"/></g></g></svg>',
 			),
 			array(
 				'id'          => 'is-not-working',
 				'text'        => $this->client->__trans( 'Not working' ),
 				'placeholder' => $this->client->__trans( 'Could you tell us a bit more whats not working?' ),
-                'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><g fill="none"><g fill="#3B86FF"><path d="M11.5 0C17.9 0 23 5.1 23 11.5 23 17.9 17.9 23 11.5 23 5.1 23 0 17.9 0 11.5 0 5.1 5.1 0 11.5 0ZM11.8 14.4C11.2 14.4 10.7 14.8 10.7 15.4 10.7 16 11.2 16.4 11.8 16.4 12.4 16.4 12.8 16 12.8 15.4 12.8 14.8 12.4 14.4 11.8 14.4ZM12 7C10.1 7 9.1 8.1 9 9.6L10.5 9.6C10.5 8.8 11.1 8.3 11.9 8.3 12.7 8.3 13.2 8.8 13.2 9.5 13.2 10.1 13 10.4 12.2 10.9 11.3 11.4 10.9 12 11 12.9L11 13.4 12.5 13.4 12.5 13C12.5 12.4 12.7 12.1 13.5 11.6 14.4 11.1 14.9 10.4 14.9 9.4 14.9 8 13.7 7 12 7Z"/></g></g></svg>',
+				'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><g fill="none"><g fill="#3B86FF"><path d="M11.5 0C17.9 0 23 5.1 23 11.5 23 17.9 17.9 23 11.5 23 5.1 23 0 17.9 0 11.5 0 5.1 5.1 0 11.5 0ZM11.8 14.4C11.2 14.4 10.7 14.8 10.7 15.4 10.7 16 11.2 16.4 11.8 16.4 12.4 16.4 12.8 16 12.8 15.4 12.8 14.8 12.4 14.4 11.8 14.4ZM12 7C10.1 7 9.1 8.1 9 9.6L10.5 9.6C10.5 8.8 11.1 8.3 11.9 8.3 12.7 8.3 13.2 8.8 13.2 9.5 13.2 10.1 13 10.4 12.2 10.9 11.3 11.4 10.9 12 11 12.9L11 13.4 12.5 13.4 12.5 13C12.5 12.4 12.7 12.1 13.5 11.6 14.4 11.1 14.9 10.4 14.9 9.4 14.9 8 13.7 7 12 7Z"/></g></g></svg>',
 			),
 			array(
 				'id'          => 'looking-for-other',
 				'text'        => $this->client->__trans( "Not what I was looking" ),
 				'placeholder' => $this->client->__trans( 'Could you tell us a bit more?' ),
-                'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="17" viewBox="0 0 24 17"><g fill="none"><g fill="#3B86FF"><path d="M23.5 9C23.5 9 23.5 8.9 23.5 8.9 23.5 8.9 23.5 8.9 23.5 8.9 23.4 8.6 23.2 8.3 23 8 22.2 6.5 20.6 3.7 19.8 2.6 18.8 1.3 17.7 0 16.1 0 15.7 0 15.3 0.1 14.9 0.2 13.8 0.6 12.6 1.2 12.3 2.7L11.7 2.7C11.4 1.2 10.2 0.6 9.1 0.2 8.7 0.1 8.3 0 7.9 0 6.3 0 5.2 1.3 4.2 2.6 3.4 3.7 1.8 6.5 1 8 0.8 8.3 0.6 8.6 0.5 8.9 0.5 8.9 0.5 8.9 0.5 8.9 0.5 8.9 0.5 9 0.5 9 0.2 9.7 0 10.5 0 11.3 0 14.4 2.5 17 5.5 17 7.3 17 8.8 16.1 9.8 14.8L14.2 14.8C15.2 16.1 16.7 17 18.5 17 21.5 17 24 14.4 24 11.3 24 10.5 23.8 9.7 23.5 9ZM5.5 15C3.6 15 2 13.2 2 11 2 8.8 3.6 7 5.5 7 7.4 7 9 8.8 9 11 9 13.2 7.4 15 5.5 15ZM18.5 15C16.6 15 15 13.2 15 11 15 8.8 16.6 7 18.5 7 20.4 7 22 8.8 22 11 22 13.2 20.4 15 18.5 15Z"/></g></g></svg>',
+				'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="17" viewBox="0 0 24 17"><g fill="none"><g fill="#3B86FF"><path d="M23.5 9C23.5 9 23.5 8.9 23.5 8.9 23.5 8.9 23.5 8.9 23.5 8.9 23.4 8.6 23.2 8.3 23 8 22.2 6.5 20.6 3.7 19.8 2.6 18.8 1.3 17.7 0 16.1 0 15.7 0 15.3 0.1 14.9 0.2 13.8 0.6 12.6 1.2 12.3 2.7L11.7 2.7C11.4 1.2 10.2 0.6 9.1 0.2 8.7 0.1 8.3 0 7.9 0 6.3 0 5.2 1.3 4.2 2.6 3.4 3.7 1.8 6.5 1 8 0.8 8.3 0.6 8.6 0.5 8.9 0.5 8.9 0.5 8.9 0.5 8.9 0.5 8.9 0.5 9 0.5 9 0.2 9.7 0 10.5 0 11.3 0 14.4 2.5 17 5.5 17 7.3 17 8.8 16.1 9.8 14.8L14.2 14.8C15.2 16.1 16.7 17 18.5 17 21.5 17 24 14.4 24 11.3 24 10.5 23.8 9.7 23.5 9ZM5.5 15C3.6 15 2 13.2 2 11 2 8.8 3.6 7 5.5 7 7.4 7 9 8.8 9 11 9 13.2 7.4 15 5.5 15ZM18.5 15C16.6 15 15 13.2 15 11 15 8.8 16.6 7 18.5 7 20.4 7 22 8.8 22 11 22 13.2 20.4 15 18.5 15Z"/></g></g></svg>',
 			),
 			array(
 				'id'          => 'did-not-work-as-expected',
 				'text'        => $this->client->__trans( "Didn't work as expected" ),
 				'placeholder' => $this->client->__trans( 'What did you expect?' ),
-                'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><g fill="none"><g fill="#3B86FF"><path d="M11.5 0C17.9 0 23 5.1 23 11.5 23 17.9 17.9 23 11.5 23 5.1 23 0 17.9 0 11.5 0 5.1 5.1 0 11.5 0ZM11.5 2C6.3 2 2 6.3 2 11.5 2 16.7 6.3 21 11.5 21 16.7 21 21 16.7 21 11.5 21 6.3 16.7 2 11.5 2ZM12.5 12.9L12.7 5 10.2 5 10.5 12.9 12.5 12.9ZM11.5 17.4C12.4 17.4 13 16.8 13 15.9 13 15 12.4 14.4 11.5 14.4 10.6 14.4 10 15 10 15.9 10 16.8 10.6 17.4 11.5 17.4Z"/></g></g></svg>',
+				'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><g fill="none"><g fill="#3B86FF"><path d="M11.5 0C17.9 0 23 5.1 23 11.5 23 17.9 17.9 23 11.5 23 5.1 23 0 17.9 0 11.5 0 5.1 5.1 0 11.5 0ZM11.5 2C6.3 2 2 6.3 2 11.5 2 16.7 6.3 21 11.5 21 16.7 21 21 16.7 21 11.5 21 6.3 16.7 2 11.5 2ZM12.5 12.9L12.7 5 10.2 5 10.5 12.9 12.5 12.9ZM11.5 17.4C12.4 17.4 13 16.8 13 15.9 13 15 12.4 14.4 11.5 14.4 10.6 14.4 10 15 10 15.9 10 16.8 10.6 17.4 11.5 17.4Z"/></g></g></svg>',
 			),
 			array(
 				'id'          => 'other',
 				'text'        => $this->client->__trans( 'Others' ),
 				'placeholder' => $this->client->__trans( 'Could you tell us a bit more?' ),
-                'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="23" viewBox="0 0 24 6"><g fill="none"><g fill="#3B86FF"><path d="M3 0C4.7 0 6 1.3 6 3 6 4.7 4.7 6 3 6 1.3 6 0 4.7 0 3 0 1.3 1.3 0 3 0ZM12 0C13.7 0 15 1.3 15 3 15 4.7 13.7 6 12 6 10.3 6 9 4.7 9 3 9 1.3 10.3 0 12 0ZM21 0C22.7 0 24 1.3 24 3 24 4.7 22.7 6 21 6 19.3 6 18 4.7 18 3 18 1.3 19.3 0 21 0Z"/></g></g></svg>',
+				'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="23" viewBox="0 0 24 6"><g fill="none"><g fill="#3B86FF"><path d="M3 0C4.7 0 6 1.3 6 3 6 4.7 4.7 6 3 6 1.3 6 0 4.7 0 3 0 1.3 1.3 0 3 0ZM12 0C13.7 0 15 1.3 15 3 15 4.7 13.7 6 12 6 10.3 6 9 4.7 9 3 9 1.3 10.3 0 12 0ZM21 0C22.7 0 24 1.3 24 3 24 4.7 22.7 6 21 6 19.3 6 18 4.7 18 3 18 1.3 19.3 0 21 0Z"/></g></g></svg>',
 			),
 		);
 
-        return $reasons;
-    }
+		return $reasons;
+	}
 
-    /**
-     * Plugin deactivation uninstall reason submission
-     *
-     * @return void
-     */
-    public function uninstall_reason_submission() {
+	/**
+	 * Plugin deactivation uninstall reason submission
+	 *
+	 * @return void
+	 */
+	public function uninstall_reason_submission() {
 
-        if ( ! isset( $_POST['reason_id'] ) ) {
-            wp_send_json_error();
-        }
+		if ( ! isset( $_POST['reason_id'] ) ) {
+			wp_send_json_error();
+		}
 
-        if ( ! wp_verify_nonce( $_POST['nonce'], 'appsero-security-nonce' ) ) {
-            wp_send_json_error( 'Nonce verification failed' );
-        }
+		if ( ! wp_verify_nonce( $_POST['nonce'], 'appsero-security-nonce' ) ) {
+			wp_send_json_error( 'Nonce verification failed' );
+		}
 
-        $data                = $this->get_tracking_data();
-        $data['reason_id']   = sanitize_text_field( $_POST['reason_id'] );
-        $data['reason_info'] = isset( $_REQUEST['reason_info'] ) ? trim( stripslashes( $_REQUEST['reason_info'] ) ) : '';
+		$data                = $this->get_tracking_data();
+		$data['reason_id']   = sanitize_text_field( $_POST['reason_id'] );
+		$data['reason_info'] = isset( $_REQUEST['reason_info'] ) ? trim( stripslashes( $_REQUEST['reason_info'] ) ) : '';
 
-        $this->client->send_request( $data, 'deactivate' );
+		$this->client->send_request( $data, 'deactivate' );
 
-        wp_send_json_success();
-    }
+		wp_send_json_success();
+	}
 
-    /**
-     * Handle the plugin deactivation feedback
-     *
-     * @return void
-     */
-    public function deactivate_scripts() {
-        global $pagenow;
+	/**
+	 * Handle the plugin deactivation feedback
+	 *
+	 * @return void
+	 */
+	public function deactivate_scripts() {
+		global $pagenow;
 
-        if ( 'plugins.php' != $pagenow ) {
-            return;
-        }
+		if ( 'plugins.php' != $pagenow ) {
+			return;
+		}
 
-        $this->deactivation_modal_styles();
-        $reasons = $this->get_uninstall_reasons();
-        $custom_reasons = apply_filters( 'appsero_custom_deactivation_reasons', array() );
-        ?>
+		$this->deactivation_modal_styles();
+		$reasons = $this->get_uninstall_reasons();
+		$custom_reasons = apply_filters( 'appsero_custom_deactivation_reasons', array() );
+		?>
 
         <div class="wd-dr-modal" id="<?php echo $this->client->slug; ?>-wd-dr-modal">
             <div class="wd-dr-modal-wrap">
@@ -846,12 +846,12 @@ 
                     <div class="wd-dr-modal-reason-input"><textarea></textarea></div>
                     <p class="wd-dr-modal-reasons-bottom">
                        <?php
-                       echo sprintf(
-	                       $this->client->__trans( 'We share your data with <a href="%1$s" target="_blank">Appsero</a> to troubleshoot problems &amp; make product improvements. <a href="%2$s" target="_blank">Learn more</a> about how Appsero handles your data.'),
-	                       esc_url( 'https://appsero.com/' ),
-                           esc_url( 'https://appsero.com/privacy-policy' )
-                       );
-                       ?>
+					   echo sprintf(
+						   $this->client->__trans( 'We share your data with <a href="%1$s" target="_blank">Appsero</a> to troubleshoot problems &amp; make product improvements. <a href="%2$s" target="_blank">Learn more</a> about how Appsero handles your data.'),
+						   esc_url( 'https://appsero.com/' ),
+						   esc_url( 'https://appsero.com/privacy-policy' )
+					   );
+					   ?>
                     </p>
                 </div>
 
@@ -947,84 +947,84 @@ 
         </script>
 
         <?php
-    }
-
-    /**
-     * Run after theme deactivated
-     * @param  string $new_name
-     * @param  object $new_theme
-     * @param  object $old_theme
-     * @return void
-     */
-    public function theme_deactivated( $new_name, $new_theme, $old_theme ) {
-        // Make sure this is appsero theme
-        if ( $old_theme->get_template() == $this->client->slug ) {
-            $this->client->send_request( $this->get_tracking_data(), 'deactivate' );
-        }
-    }
-
-    /**
-     * Get user IP Address
-     */
-    private function get_user_ip_address() {
-        $response = wp_remote_get( 'https://icanhazip.com/' );
-
-        if ( is_wp_error( $response ) ) {
-            return '';
-        }
-
-        $ip = trim( wp_remote_retrieve_body( $response ) );
-
-        if ( ! filter_var( $ip, FILTER_VALIDATE_IP ) ) {
-            return '';
-        }
-
-        return $ip;
-    }
-
-    /**
-     * Get site name
-     */
-    private function get_site_name() {
-        $site_name = get_bloginfo( 'name' );
-
-        if ( empty( $site_name ) ) {
-            $site_name = get_bloginfo( 'description' );
-            $site_name = wp_trim_words( $site_name, 3, '' );
-        }
-
-        if ( empty( $site_name ) ) {
-            $site_name = esc_url( home_url() );
-        }
-
-        return $site_name;
-    }
-
-    /**
-     * Send request to appsero if user skip to send tracking data
-     */
-    private function send_tracking_skipped_request() {
-        $skipped = get_option( $this->client->slug . '_tracking_skipped' );
-
-        $data = array(
-            'hash'               => $this->client->hash,
-            'previously_skipped' => false,
-        );
-
-        if ( $skipped === 'yes' ) {
-            $data['previously_skipped'] = true;
-        } else {
-            update_option( $this->client->slug . '_tracking_skipped', 'yes' );
-        }
-
-        $this->client->send_request( $data, 'tracking-skipped' );
-    }
-
-    /**
-     * Deactivation modal styles
-     */
-    private function deactivation_modal_styles() {
-        ?>
+	}
+
+	/**
+	 * Run after theme deactivated
+	 * @param  string $new_name
+	 * @param  object $new_theme
+	 * @param  object $old_theme
+	 * @return void
+	 */
+	public function theme_deactivated( $new_name, $new_theme, $old_theme ) {
+		// Make sure this is appsero theme
+		if ( $old_theme->get_template() == $this->client->slug ) {
+			$this->client->send_request( $this->get_tracking_data(), 'deactivate' );
+		}
+	}
+
+	/**
+	 * Get user IP Address
+	 */
+	private function get_user_ip_address() {
+		$response = wp_remote_get( 'https://icanhazip.com/' );
+
+		if ( is_wp_error( $response ) ) {
+			return '';
+		}
+
+		$ip = trim( wp_remote_retrieve_body( $response ) );
+
+		if ( ! filter_var( $ip, FILTER_VALIDATE_IP ) ) {
+			return '';
+		}
+
+		return $ip;
+	}
+
+	/**
+	 * Get site name
+	 */
+	private function get_site_name() {
+		$site_name = get_bloginfo( 'name' );
+
+		if ( empty( $site_name ) ) {
+			$site_name = get_bloginfo( 'description' );
+			$site_name = wp_trim_words( $site_name, 3, '' );
+		}
+
+		if ( empty( $site_name ) ) {
+			$site_name = esc_url( home_url() );
+		}
+
+		return $site_name;
+	}
+
+	/**
+	 * Send request to appsero if user skip to send tracking data
+	 */
+	private function send_tracking_skipped_request() {
+		$skipped = get_option( $this->client->slug . '_tracking_skipped' );
+
+		$data = array(
+			'hash'               => $this->client->hash,
+			'previously_skipped' => false,
+		);
+
+		if ( $skipped === 'yes' ) {
+			$data['previously_skipped'] = true;
+		} else {
+			update_option( $this->client->slug . '_tracking_skipped', 'yes' );
+		}
+
+		$this->client->send_request( $data, 'tracking-skipped' );
+	}
+
+	/**
+	 * Deactivation modal styles
+	 */
+	private function deactivation_modal_styles() {
+		?>
         <style type="text/css">
             .wd-dr-modal {
                 position: fixed;
@@ -1180,6 +1180,6 @@ 
             }
         </style>
         <?php
-    }
+	}
 
 }

Spacing +183 added lines, -183 removed lines

@@ -51,13 +51,13 @@ 
      * @param null $name
      * @param null $file
      */
-    public function __construct( $client, $name = null, $file = null ) {
+    public function __construct($client, $name = null, $file = null) {
 
-        if ( is_string( $client ) && ! empty( $name ) && ! empty( $file ) ) {
-            $client = new Client( $client, $name, $file );
+        if (is_string($client) && ! empty($name) && ! empty($file)) {
+            $client = new Client($client, $name, $file);
         }
 
-        if ( is_object( $client ) && is_a( $client, 'Appsero\Client' ) ) {
+        if (is_object($client) && is_a($client, 'Appsero\Client')) {
             $this->client = $client;
         }
     }
@@ -91,7 +91,7 @@ 
      *
      * @return \self
      */
-    public function add_extra( $data = array() ) {
+    public function add_extra($data = array()) {
         $this->extra_data = $data;
 
         return $this;
@@ -104,7 +104,7 @@ 
      *
      * @return \self
      */
-    public function notice($text='' ) {
+    public function notice($text = '') {
         $this->notice = $text;
 
         return $this;
@@ -116,9 +116,9 @@ 
      * @return void
      */
     public function init() {
-        if ( $this->client->type == 'plugin' ) {
+        if ($this->client->type == 'plugin') {
             $this->init_plugin();
-        } else if ( $this->client->type == 'theme' ) {
+        } else if ($this->client->type == 'theme') {
             $this->init_theme();
         }
     }
@@ -131,8 +131,8 @@ 
     public function init_theme() {
         $this->init_common();
 
-        add_action( 'switch_theme', array( $this, 'deactivation_cleanup' ) );
-        add_action( 'switch_theme', array( $this, 'theme_deactivated' ), 12, 3 );
+        add_action('switch_theme', array($this, 'deactivation_cleanup'));
+        add_action('switch_theme', array($this, 'theme_deactivated'), 12, 3);
     }
 
     /**
@@ -142,15 +142,15 @@ 
      */
     public function init_plugin() {
         // plugin deactivate popup
-        if ( ! $this->is_local_server() ) {
-            add_filter( 'plugin_action_links_' . $this->client->basename, array( $this, 'plugin_action_links' ) );
-            add_action( 'admin_footer', array( $this, 'deactivate_scripts' ) );
+        if ( ! $this->is_local_server()) {
+            add_filter('plugin_action_links_'.$this->client->basename, array($this, 'plugin_action_links'));
+            add_action('admin_footer', array($this, 'deactivate_scripts'));
         }
 
         $this->init_common();
 
-        register_activation_hook( $this->client->file, array( $this, 'activate_plugin' ) );
-        register_deactivation_hook( $this->client->file, array( $this, 'deactivation_cleanup' ) );
+        register_activation_hook($this->client->file, array($this, 'activate_plugin'));
+        register_deactivation_hook($this->client->file, array($this, 'deactivation_cleanup'));
     }
 
     /**
@@ -160,19 +160,19 @@ 
      */
     protected function init_common() {
 
-        if ( $this->show_notice ) {
+        if ($this->show_notice) {
             // tracking notice
-            add_action( 'admin_notices', array( $this, 'admin_notice' ) );
+            add_action('admin_notices', array($this, 'admin_notice'));
         }
 
-        add_action( 'admin_init', array( $this, 'handle_optin_optout' ) );
+        add_action('admin_init', array($this, 'handle_optin_optout'));
 
         // uninstall reason
-        add_action( 'wp_ajax_' . $this->client->slug . '_submit-uninstall-reason', array( $this, 'uninstall_reason_submission' ) );
+        add_action('wp_ajax_'.$this->client->slug.'_submit-uninstall-reason', array($this, 'uninstall_reason_submission'));
 
         // cron events
-        add_filter( 'cron_schedules', array( $this, 'add_weekly_schedule' ) );
-        add_action( $this->client->slug . '_tracker_send_event', array( $this, 'send_tracking_data' ) );
+        add_filter('cron_schedules', array($this, 'add_weekly_schedule'));
+        add_action($this->client->slug.'_tracker_send_event', array($this, 'send_tracking_data'));
         // add_action( 'admin_init', array( $this, 'send_tracking_data' ) ); // test
     }
 
@@ -183,23 +183,23 @@ 
      *
      * @return void
      */
-    public function send_tracking_data( $override = false ) {
-        if ( ! $this->tracking_allowed() && ! $override ) {
+    public function send_tracking_data($override = false) {
+        if ( ! $this->tracking_allowed() && ! $override) {
             return;
         }
 
         // Send a maximum of once per week
         $last_send = $this->get_last_send();
 
-        if ( $last_send && $last_send > strtotime( '-1 week' ) ) {
+        if ($last_send && $last_send > strtotime('-1 week')) {
             return;
         }
 
         $tracking_data = $this->get_tracking_data();
 
-        $response = $this->client->send_request( $tracking_data, 'track' );
+        $response = $this->client->send_request($tracking_data, 'track');
 
-        update_option( $this->client->slug . '_tracking_last_send', time() );
+        update_option($this->client->slug.'_tracking_last_send', time());
     }
 
     /**
@@ -210,34 +210,34 @@ 
     protected function get_tracking_data() {
         $all_plugins = $this->get_all_plugins();
 
-        $users = get_users( array(
+        $users = get_users(array(
             'role'    => 'administrator',
             'orderby' => 'ID',
             'order'   => 'ASC',
             'number'  => 1,
             'paged'   => 1,
-        ) );
+        ));
 
-        $admin_user =  ( is_array( $users ) && ! empty( $users ) ) ? $users[0] : false;
+        $admin_user = (is_array($users) && ! empty($users)) ? $users[0] : false;
         $first_name = $last_name = '';
 
-        if ( $admin_user ) {
+        if ($admin_user) {
             $first_name = $admin_user->first_name ? $admin_user->first_name : $admin_user->display_name;
             $last_name  = $admin_user->last_name;
         }
 
         $data = array(
-            'url'              => esc_url( home_url() ),
+            'url'              => esc_url(home_url()),
             'site'             => $this->get_site_name(),
-            'admin_email'      => get_option( 'admin_email' ),
+            'admin_email'      => get_option('admin_email'),
             'first_name'       => $first_name,
             'last_name'        => $last_name,
             'hash'             => $this->client->hash,
             'server'           => $this->get_server_info(),
             'wp'               => $this->get_wp_info(),
             'users'            => $this->get_user_counts(),
-            'active_plugins'   => count( $all_plugins['active_plugins'] ),
-            'inactive_plugins' => count( $all_plugins['inactive_plugins'] ),
+            'active_plugins'   => count($all_plugins['active_plugins']),
+            'inactive_plugins' => count($all_plugins['inactive_plugins']),
             'ip_address'       => $this->get_user_ip_address(),
             'project_version'  => $this->client->project_version,
             'tracking_skipped' => false,
@@ -251,11 +251,11 @@ 
 
             foreach ($all_plugins['active_plugins'] as $slug => $plugin) {
                 $slug = strstr($slug, '/', true);
-                if (! $slug) {
+                if ( ! $slug) {
                     continue;
                 }
 
-                $plugins_data[ $slug ] = array(
+                $plugins_data[$slug] = array(
                     'name' => isset($plugin['name']) ? $plugin['name'] : '',
                     'version' => isset($plugin['version']) ? $plugin['version'] : '',
                 );
@@ -269,20 +269,20 @@ 
         }
 
         // Add metadata
-        if ( $extra = $this->get_extra_data() ) {
+        if ($extra = $this->get_extra_data()) {
             $data['extra'] = $extra;
         }
 
         // Check this has previously skipped tracking
-        $skipped = get_option( $this->client->slug . '_tracking_skipped' );
+        $skipped = get_option($this->client->slug.'_tracking_skipped');
 
-        if ( $skipped === 'yes' ) {
-            delete_option( $this->client->slug . '_tracking_skipped' );
+        if ($skipped === 'yes') {
+            delete_option($this->client->slug.'_tracking_skipped');
 
             $data['tracking_skipped'] = true;
         }
 
-        return apply_filters( $this->client->slug . '_tracker_data', $data );
+        return apply_filters($this->client->slug.'_tracker_data', $data);
     }
 
     /**
@@ -291,11 +291,11 @@ 
      * @return mixed
      */
     protected function get_extra_data() {
-        if ( is_callable( $this->extra_data ) ) {
-            return call_user_func( $this->extra_data );
+        if (is_callable($this->extra_data)) {
+            return call_user_func($this->extra_data);
         }
 
-        if ( is_array( $this->extra_data ) ) {
+        if (is_array($this->extra_data)) {
             return $this->extra_data;
         }
 
@@ -330,7 +330,7 @@ 
      * @return bool
      */
     public function tracking_allowed() {
-        $allow_tracking = get_option( $this->client->slug . '_allow_tracking', 'no' );
+        $allow_tracking = get_option($this->client->slug.'_allow_tracking', 'no');
 
         return $allow_tracking == 'yes';
     }
@@ -341,7 +341,7 @@ 
      * @return false|string
      */
     private function get_last_send() {
-        return get_option( $this->client->slug . '_tracking_last_send', false );
+        return get_option($this->client->slug.'_tracking_last_send', false);
     }
 
     /**
@@ -350,9 +350,9 @@ 
      * @return boolean
      */
     public function notice_dismissed() {
-        $hide_notice = get_option( $this->client->slug . '_tracking_notice', null );
+        $hide_notice = get_option($this->client->slug.'_tracking_notice', null);
 
-        if ( 'hide' == $hide_notice ) {
+        if ('hide' == $hide_notice) {
             return true;
         }
 
@@ -366,18 +366,18 @@ 
      */
     private function is_local_server() {
 
-        $host       = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : 'localhost';
-        $ip         = isset( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : '127.0.0.1';
+        $host       = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
+        $ip         = isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '127.0.0.1';
         $is_local   = false;
 
-        if( in_array( $ip,array( '127.0.0.1', '::1' ) )
-            || ! strpos( $host, '.' )
-            || in_array( strrchr( $host, '.' ), array( '.test', '.testing', '.local', '.localhost', '.localdomain' ) )
+        if (in_array($ip, array('127.0.0.1', '::1'))
+            || ! strpos($host, '.')
+            || in_array(strrchr($host, '.'), array('.test', '.testing', '.local', '.localhost', '.localdomain'))
         ) {
             $is_local = true;
         }
 
-        return apply_filters( 'appsero_is_local', $is_local );
+        return apply_filters('appsero_is_local', $is_local);
     }
 
     /**
@@ -386,10 +386,10 @@ 
      * @return void
      */
     private function schedule_event() {
-        $hook_name = $this->client->slug . '_tracker_send_event';
+        $hook_name = $this->client->slug.'_tracker_send_event';
 
-        if ( ! wp_next_scheduled( $hook_name ) ) {
-            wp_schedule_event( time(), 'weekly', $hook_name );
+        if ( ! wp_next_scheduled($hook_name)) {
+            wp_schedule_event(time(), 'weekly', $hook_name);
         }
     }
 
@@ -399,7 +399,7 @@ 
      * @return void
      */
     private function clear_schedule_event() {
-        wp_clear_scheduled_hook( $this->client->slug . '_tracker_send_event' );
+        wp_clear_scheduled_hook($this->client->slug.'_tracker_send_event');
     }
 
     /**
@@ -409,47 +409,47 @@ 
      */
     public function admin_notice() {
 
-        if ( $this->notice_dismissed() ) {
+        if ($this->notice_dismissed()) {
             return;
         }
 
-        if ( $this->tracking_allowed() ) {
+        if ($this->tracking_allowed()) {
             return;
         }
 
-        if ( ! current_user_can( 'manage_options' ) ) {
+        if ( ! current_user_can('manage_options')) {
             return;
         }
 
         // don't show tracking if a local server
-        if ( $this->is_local_server() ) {
+        if ($this->is_local_server()) {
             return;
         }
 
-        $optin_url  = add_query_arg( $this->client->slug . '_tracker_optin', 'true' );
-        $optout_url = add_query_arg( $this->client->slug . '_tracker_optout', 'true' );
+        $optin_url  = add_query_arg($this->client->slug.'_tracker_optin', 'true');
+        $optout_url = add_query_arg($this->client->slug.'_tracker_optout', 'true');
 
-        if ( empty( $this->notice ) ) {
-            $notice = sprintf( $this->client->__trans( 'Want to help make <strong>%1$s</strong> even more awesome? Allow %1$s to collect non-sensitive diagnostic data and usage information.' ), $this->client->name );
+        if (empty($this->notice)) {
+            $notice = sprintf($this->client->__trans('Want to help make <strong>%1$s</strong> even more awesome? Allow %1$s to collect non-sensitive diagnostic data and usage information.'), $this->client->name);
         } else {
             $notice = $this->notice;
         }
 
-        $policy_url = 'https://' . 'appsero.com/privacy-policy/';
+        $policy_url = 'https://'.'appsero.com/privacy-policy/';
 
-        $notice .= ' (<a class="' . $this->client->slug . '-insights-data-we-collect" href="#">' . $this->client->__trans( 'what we collect' ) . '</a>)';
-        $notice .= '<p class="description" style="display:none;">' . implode( ', ', $this->data_we_collect() ) . '. No sensitive data is tracked. ';
-        $notice .= 'We are using Appsero to collect your data. <a href="' . $policy_url . '" target="_blank">Learn more</a> about how Appsero collects and handle your data.</p>';
+        $notice .= ' (<a class="'.$this->client->slug.'-insights-data-we-collect" href="#">'.$this->client->__trans('what we collect').'</a>)';
+        $notice .= '<p class="description" style="display:none;">'.implode(', ', $this->data_we_collect()).'. No sensitive data is tracked. ';
+        $notice .= 'We are using Appsero to collect your data. <a href="'.$policy_url.'" target="_blank">Learn more</a> about how Appsero collects and handle your data.</p>';
 
         echo '<div class="updated"><p>';
             echo $notice;
             echo '</p><p class="submit">';
-            echo '&nbsp;<a href="' . esc_url( $optin_url ) . '" class="button button--primary button--big">' . $this->client->__trans( 'Allow' ) . '</a>';
-            echo '&nbsp;<a href="' . esc_url( $optout_url ) . '" class="button button--secondary button--big">' .
-                 $this->client->__trans( 'No thanks' ) . '</a>';
+            echo '&nbsp;<a href="'.esc_url($optin_url).'" class="button button--primary button--big">'.$this->client->__trans('Allow').'</a>';
+            echo '&nbsp;<a href="'.esc_url($optout_url).'" class="button button--secondary button--big">'.
+                 $this->client->__trans('No thanks').'</a>';
         echo '</p></div>';
 
-        echo "<script type='text/javascript'>jQuery('." . $this->client->slug . "-insights-data-we-collect').on('click', function(e) {
+        echo "<script type='text/javascript'>jQuery('.".$this->client->slug."-insights-data-we-collect').on('click', function(e) {
                 e.preventDefault();
                 jQuery(this).parents('.updated').find('p.description').slideToggle('fast');
             });
@@ -464,17 +464,17 @@ 
      */
     public function handle_optin_optout() {
 
-        if ( isset( $_GET[ $this->client->slug . '_tracker_optin' ] ) && $_GET[ $this->client->slug . '_tracker_optin' ] == 'true' ) {
+        if (isset($_GET[$this->client->slug.'_tracker_optin']) && $_GET[$this->client->slug.'_tracker_optin'] == 'true') {
             $this->optin();
 
-            wp_redirect( remove_query_arg( $this->client->slug . '_tracker_optin' ) );
+            wp_redirect(remove_query_arg($this->client->slug.'_tracker_optin'));
             exit;
         }
 
-        if ( isset( $_GET[ $this->client->slug . '_tracker_optout' ] ) && $_GET[ $this->client->slug . '_tracker_optout' ] == 'true' ) {
+        if (isset($_GET[$this->client->slug.'_tracker_optout']) && $_GET[$this->client->slug.'_tracker_optout'] == 'true') {
             $this->optout();
 
-            wp_redirect( remove_query_arg( $this->client->slug . '_tracker_optout' ) );
+            wp_redirect(remove_query_arg($this->client->slug.'_tracker_optout'));
             exit;
         }
     }
@@ -485,8 +485,8 @@ 
      * @return void
      */
     public function optin() {
-        update_option( $this->client->slug . '_allow_tracking', 'yes' );
-        update_option( $this->client->slug . '_tracking_notice', 'hide' );
+        update_option($this->client->slug.'_allow_tracking', 'yes');
+        update_option($this->client->slug.'_tracking_notice', 'hide');
 
         $this->clear_schedule_event();
         $this->schedule_event();
@@ -499,8 +499,8 @@ 
      * @return void
      */
     public function optout() {
-        update_option( $this->client->slug . '_allow_tracking', 'no' );
-        update_option( $this->client->slug . '_tracking_notice', 'hide' );
+        update_option($this->client->slug.'_allow_tracking', 'no');
+        update_option($this->client->slug.'_tracking_notice', 'hide');
 
         $this->send_tracking_skipped_request();
 
@@ -514,10 +514,10 @@ 
      *
      * @return integer
      */
-    public function get_post_count( $post_type ) {
+    public function get_post_count($post_type) {
         global $wpdb;
 
-        return (int) $wpdb->get_var( "SELECT count(ID) FROM $wpdb->posts WHERE post_type = '$post_type' and post_status = 'publish'");
+        return (int) $wpdb->get_var("SELECT count(ID) FROM $wpdb->posts WHERE post_type = '$post_type' and post_status = 'publish'");
     }
 
     /**
@@ -530,21 +530,21 @@ 
 
         $server_data = array();
 
-        if ( isset( $_SERVER['SERVER_SOFTWARE'] ) && ! empty( $_SERVER['SERVER_SOFTWARE'] ) ) {
+        if (isset($_SERVER['SERVER_SOFTWARE']) && ! empty($_SERVER['SERVER_SOFTWARE'])) {
             $server_data['software'] = $_SERVER['SERVER_SOFTWARE'];
         }
 
-        if ( function_exists( 'phpversion' ) ) {
+        if (function_exists('phpversion')) {
             $server_data['php_version'] = phpversion();
         }
 
         $server_data['mysql_version']        = $wpdb->db_version();
 
-        $server_data['php_max_upload_size']  = size_format( wp_max_upload_size() );
+        $server_data['php_max_upload_size']  = size_format(wp_max_upload_size());
         $server_data['php_default_timezone'] = date_default_timezone_get();
-        $server_data['php_soap']             = class_exists( 'SoapClient' ) ? 'Yes' : 'No';
-        $server_data['php_fsockopen']        = function_exists( 'fsockopen' ) ? 'Yes' : 'No';
-        $server_data['php_curl']             = function_exists( 'curl_init' ) ? 'Yes' : 'No';
+        $server_data['php_soap']             = class_exists('SoapClient') ? 'Yes' : 'No';
+        $server_data['php_fsockopen']        = function_exists('fsockopen') ? 'Yes' : 'No';
+        $server_data['php_curl']             = function_exists('curl_init') ? 'Yes' : 'No';
 
         return $server_data;
     }
@@ -558,18 +558,18 @@ 
         $wp_data = array();
 
         $wp_data['memory_limit'] = WP_MEMORY_LIMIT;
-        $wp_data['debug_mode']   = ( defined('WP_DEBUG') && WP_DEBUG ) ? 'Yes' : 'No';
+        $wp_data['debug_mode']   = (defined('WP_DEBUG') && WP_DEBUG) ? 'Yes' : 'No';
         $wp_data['locale']       = get_locale();
-        $wp_data['version']      = get_bloginfo( 'version' );
+        $wp_data['version']      = get_bloginfo('version');
         $wp_data['multisite']    = is_multisite() ? 'Yes' : 'No';
         $wp_data['theme_slug']   = get_stylesheet();
 
-        $theme = wp_get_theme( $wp_data['theme_slug'] );
+        $theme = wp_get_theme($wp_data['theme_slug']);
 
-        $wp_data['theme_name']    = $theme->get( 'Name' );
-        $wp_data['theme_version'] = $theme->get( 'Version' );
-        $wp_data['theme_uri']     = $theme->get( 'ThemeURI' );
-        $wp_data['theme_author']  = $theme->get( 'Author' );
+        $wp_data['theme_name']    = $theme->get('Name');
+        $wp_data['theme_version'] = $theme->get('Version');
+        $wp_data['theme_uri']     = $theme->get('ThemeURI');
+        $wp_data['theme_author']  = $theme->get('Author');
 
         return $wp_data;
     }
@@ -581,45 +581,45 @@ 
      */
     private function get_all_plugins() {
         // Ensure get_plugins function is loaded
-        if ( ! function_exists( 'get_plugins' ) ) {
-            include ABSPATH . '/wp-admin/includes/plugin.php';
+        if ( ! function_exists('get_plugins')) {
+            include ABSPATH.'/wp-admin/includes/plugin.php';
         }
 
         $plugins             = get_plugins();
-        $active_plugins_keys = get_option( 'active_plugins', array() );
+        $active_plugins_keys = get_option('active_plugins', array());
         $active_plugins      = array();
 
-        foreach ( $plugins as $k => $v ) {
+        foreach ($plugins as $k => $v) {
             // Take care of formatting the data how we want it.
             $formatted = array();
-            $formatted['name'] = strip_tags( $v['Name'] );
+            $formatted['name'] = strip_tags($v['Name']);
 
-            if ( isset( $v['Version'] ) ) {
-                $formatted['version'] = strip_tags( $v['Version'] );
+            if (isset($v['Version'])) {
+                $formatted['version'] = strip_tags($v['Version']);
             }
 
-            if ( isset( $v['Author'] ) ) {
-                $formatted['author'] = strip_tags( $v['Author'] );
+            if (isset($v['Author'])) {
+                $formatted['author'] = strip_tags($v['Author']);
             }
 
-            if ( isset( $v['Network'] ) ) {
-                $formatted['network'] = strip_tags( $v['Network'] );
+            if (isset($v['Network'])) {
+                $formatted['network'] = strip_tags($v['Network']);
             }
 
-            if ( isset( $v['PluginURI'] ) ) {
-                $formatted['plugin_uri'] = strip_tags( $v['PluginURI'] );
+            if (isset($v['PluginURI'])) {
+                $formatted['plugin_uri'] = strip_tags($v['PluginURI']);
             }
 
-            if ( in_array( $k, $active_plugins_keys ) ) {
+            if (in_array($k, $active_plugins_keys)) {
                 // Remove active plugins from list so we can show active and inactive separately
-                unset( $plugins[$k] );
+                unset($plugins[$k]);
                 $active_plugins[$k] = $formatted;
             } else {
                 $plugins[$k] = $formatted;
             }
         }
 
-        return array( 'active_plugins' => $active_plugins, 'inactive_plugins' => $plugins );
+        return array('active_plugins' => $active_plugins, 'inactive_plugins' => $plugins);
     }
 
     /**
@@ -633,12 +633,12 @@ 
         $user_count['total'] = $user_count_data['total_users'];
 
         // Get user count based on user role
-        foreach ( $user_count_data['avail_roles'] as $role => $count ) {
-            if ( ! $count ) {
+        foreach ($user_count_data['avail_roles'] as $role => $count) {
+            if ( ! $count) {
                 continue;
             }
 
-            $user_count[ $role ] = $count;
+            $user_count[$role] = $count;
         }
 
         return $user_count;
@@ -651,7 +651,7 @@ 
      *
      * @return array
      */
-    public function add_weekly_schedule( $schedules ) {
+    public function add_weekly_schedule($schedules) {
 
         $schedules['weekly'] = array(
             'interval' => DAY_IN_SECONDS * 7,
@@ -667,22 +667,22 @@ 
      * @return void
      */
     public function activate_plugin() {
-        $allowed = get_option( $this->client->slug . '_allow_tracking', 'no' );
+        $allowed = get_option($this->client->slug.'_allow_tracking', 'no');
 
         // if it wasn't allowed before, do nothing
-        if ( 'yes' !== $allowed ) {
+        if ('yes' !== $allowed) {
             return;
         }
 
         // re-schedule and delete the last sent time so we could force send again
-        $hook_name = $this->client->slug . '_tracker_send_event';
-        if ( ! wp_next_scheduled( $hook_name ) ) {
-            wp_schedule_event( time(), 'weekly', $hook_name );
+        $hook_name = $this->client->slug.'_tracker_send_event';
+        if ( ! wp_next_scheduled($hook_name)) {
+            wp_schedule_event(time(), 'weekly', $hook_name);
         }
 
-        delete_option( $this->client->slug . '_tracking_last_send' );
+        delete_option($this->client->slug.'_tracking_last_send');
 
-        $this->send_tracking_data( true );
+        $this->send_tracking_data(true);
     }
 
     /**
@@ -693,12 +693,12 @@ 
     public function deactivation_cleanup() {
         $this->clear_schedule_event();
 
-        if ( 'theme' == $this->client->type ) {
-            delete_option( $this->client->slug . '_tracking_last_send' );
-            delete_option( $this->client->slug . '_allow_tracking' );
+        if ('theme' == $this->client->type) {
+            delete_option($this->client->slug.'_tracking_last_send');
+            delete_option($this->client->slug.'_allow_tracking');
         }
 
-        delete_option( $this->client->slug . '_tracking_notice' );
+        delete_option($this->client->slug.'_tracking_notice');
     }
 
     /**
@@ -708,10 +708,10 @@ 
      *
      * @return array
      */
-    public function plugin_action_links( $links ) {
+    public function plugin_action_links($links) {
 
-        if ( array_key_exists( 'deactivate', $links ) ) {
-            $links['deactivate'] = str_replace( '<a', '<a class="' . $this->client->slug . '-deactivate-link"', $links['deactivate'] );
+        if (array_key_exists('deactivate', $links)) {
+            $links['deactivate'] = str_replace('<a', '<a class="'.$this->client->slug.'-deactivate-link"', $links['deactivate']);
         }
 
         return $links;
@@ -726,44 +726,44 @@ 
         $reasons = array(
 			array(
 				'id'          => 'could-not-understand',
-				'text'        => $this->client->__trans( "Couldn't understand" ),
-				'placeholder' => $this->client->__trans( 'Would you like us to assist you?' ),
+				'text'        => $this->client->__trans("Couldn't understand"),
+				'placeholder' => $this->client->__trans('Would you like us to assist you?'),
                 'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><g fill="none"><g fill="#3B86FF"><path d="M11.5 0C17.9 0 23 5.1 23 11.5 23 17.9 17.9 23 11.5 23 10.6 23 9.6 22.9 8.8 22.7L8.8 22.6C9.3 22.5 9.7 22.3 10 21.9 10.3 21.6 10.4 21.3 10.4 20.9 10.8 21 11.1 21 11.5 21 16.7 21 21 16.7 21 11.5 21 6.3 16.7 2 11.5 2 6.3 2 2 6.3 2 11.5 2 13 2.3 14.3 2.9 15.6 2.7 16 2.4 16.3 2.2 16.8L2.1 17.1 2.1 17.3C2 17.5 2 17.7 2 18 0.7 16.1 0 13.9 0 11.5 0 5.1 5.1 0 11.5 0ZM6 13.6C6 13.7 6.1 13.8 6.1 13.9 6.3 14.5 6.2 15.7 6.1 16.4 6.1 16.6 6 16.9 6 17.1 6 17.1 6.1 17.1 6.1 17.1 7.1 16.9 8.2 16 9.3 15.5 9.8 15.2 10.4 15 10.9 15 11.2 15 11.4 15 11.6 15.2 11.9 15.4 12.1 16 11.6 16.4 11.5 16.5 11.3 16.6 11.1 16.7 10.5 17 9.9 17.4 9.3 17.7 9 17.9 9 18.1 9.1 18.5 9.2 18.9 9.3 19.4 9.3 19.8 9.4 20.3 9.3 20.8 9 21.2 8.8 21.5 8.5 21.6 8.1 21.7 7.9 21.8 7.6 21.9 7.3 21.9L6.5 22C6.3 22 6 21.9 5.8 21.9 5 21.8 4.4 21.5 3.9 20.9 3.3 20.4 3.1 19.6 3 18.8L3 18.5C3 18.2 3 17.9 3.1 17.7L3.1 17.6C3.2 17.1 3.5 16.7 3.7 16.3 4 15.9 4.2 15.4 4.3 15 4.4 14.6 4.4 14.5 4.6 14.2 4.6 13.9 4.7 13.7 4.9 13.6 5.2 13.2 5.7 13.2 6 13.6ZM11.7 11.2C13.1 11.2 14.3 11.7 15.2 12.9 15.3 13 15.4 13.1 15.4 13.2 15.4 13.4 15.3 13.8 15.2 13.8 15 13.9 14.9 13.8 14.8 13.7 14.6 13.5 14.4 13.2 14.1 13.1 13.5 12.6 12.8 12.3 12 12.2 10.7 12.1 9.5 12.3 8.4 12.8 8.3 12.8 8.2 12.8 8.1 12.8 7.9 12.8 7.8 12.4 7.8 12.2 7.7 12.1 7.8 11.9 8 11.8 8.4 11.7 8.8 11.5 9.2 11.4 10 11.2 10.9 11.1 11.7 11.2ZM16.3 5.9C17.3 5.9 18 6.6 18 7.6 18 8.5 17.3 9.3 16.3 9.3 15.4 9.3 14.7 8.5 14.7 7.6 14.7 6.6 15.4 5.9 16.3 5.9ZM8.3 5C9.2 5 9.9 5.8 9.9 6.7 9.9 7.7 9.2 8.4 8.2 8.4 7.3 8.4 6.6 7.7 6.6 6.7 6.6 5.8 7.3 5 8.3 5Z"/></g></g></svg>'
 			),
 			array(
 				'id'          => 'found-better-plugin',
-				'text'        => $this->client->__trans( 'Found a better plugin' ),
-				'placeholder' => $this->client->__trans( 'Which plugin?' ),
+				'text'        => $this->client->__trans('Found a better plugin'),
+				'placeholder' => $this->client->__trans('Which plugin?'),
                 'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><g fill="none"><g fill="#3B86FF"><path d="M17.1 14L22.4 19.3C23.2 20.2 23.2 21.5 22.4 22.4 21.5 23.2 20.2 23.2 19.3 22.4L19.3 22.4 14 17.1C15.3 16.3 16.3 15.3 17.1 14L17.1 14ZM8.6 0C13.4 0 17.3 3.9 17.3 8.6 17.3 13.4 13.4 17.2 8.6 17.2 3.9 17.2 0 13.4 0 8.6 0 3.9 3.9 0 8.6 0ZM8.6 2.2C5.1 2.2 2.2 5.1 2.2 8.6 2.2 12.2 5.1 15.1 8.6 15.1 12.2 15.1 15.1 12.2 15.1 8.6 15.1 5.1 12.2 2.2 8.6 2.2ZM8.6 3.6L8.6 5C6.6 5 5 6.6 5 8.6L5 8.6 3.6 8.6C3.6 5.9 5.9 3.6 8.6 3.6L8.6 3.6Z"/></g></g></svg>',
 			),
 			array(
 				'id'          => 'not-have-that-feature',
-				'text'        => $this->client->__trans( "Missing a specific feature" ),
-				'placeholder' => $this->client->__trans( 'Could you tell us more about that feature?' ),
+				'text'        => $this->client->__trans("Missing a specific feature"),
+				'placeholder' => $this->client->__trans('Could you tell us more about that feature?'),
                 'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="17" viewBox="0 0 24 17"><g fill="none"><g fill="#3B86FF"><path d="M19.4 0C19.7 0.6 19.8 1.3 19.8 2 19.8 3.2 19.4 4.4 18.5 5.3 17.6 6.2 16.5 6.7 15.2 6.7 15.2 6.7 15.2 6.7 15.2 6.7 14 6.7 12.9 6.2 12 5.3 11.2 4.4 10.7 3.3 10.7 2 10.7 1.3 10.8 0.6 11.1 0L7.6 0 7 0 6.5 0 6.5 5.7C6.3 5.6 5.9 5.3 5.6 5.1 5 4.6 4.3 4.3 3.5 4.3 3.5 4.3 3.5 4.3 3.4 4.3 1.6 4.4 0 5.9 0 7.9 0 8.6 0.2 9.2 0.5 9.7 1.1 10.8 2.2 11.5 3.5 11.5 4.3 11.5 5 11.2 5.6 10.8 6 10.5 6.3 10.3 6.5 10.2L6.5 10.2 6.5 17 6.5 17 7 17 7.6 17 22.5 17C23.3 17 24 16.3 24 15.5L24 0 19.4 0Z"/></g></g></svg>',
 			),
 			array(
 				'id'          => 'is-not-working',
-				'text'        => $this->client->__trans( 'Not working' ),
-				'placeholder' => $this->client->__trans( 'Could you tell us a bit more whats not working?' ),
+				'text'        => $this->client->__trans('Not working'),
+				'placeholder' => $this->client->__trans('Could you tell us a bit more whats not working?'),
                 'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><g fill="none"><g fill="#3B86FF"><path d="M11.5 0C17.9 0 23 5.1 23 11.5 23 17.9 17.9 23 11.5 23 5.1 23 0 17.9 0 11.5 0 5.1 5.1 0 11.5 0ZM11.8 14.4C11.2 14.4 10.7 14.8 10.7 15.4 10.7 16 11.2 16.4 11.8 16.4 12.4 16.4 12.8 16 12.8 15.4 12.8 14.8 12.4 14.4 11.8 14.4ZM12 7C10.1 7 9.1 8.1 9 9.6L10.5 9.6C10.5 8.8 11.1 8.3 11.9 8.3 12.7 8.3 13.2 8.8 13.2 9.5 13.2 10.1 13 10.4 12.2 10.9 11.3 11.4 10.9 12 11 12.9L11 13.4 12.5 13.4 12.5 13C12.5 12.4 12.7 12.1 13.5 11.6 14.4 11.1 14.9 10.4 14.9 9.4 14.9 8 13.7 7 12 7Z"/></g></g></svg>',
 			),
 			array(
 				'id'          => 'looking-for-other',
-				'text'        => $this->client->__trans( "Not what I was looking" ),
-				'placeholder' => $this->client->__trans( 'Could you tell us a bit more?' ),
+				'text'        => $this->client->__trans("Not what I was looking"),
+				'placeholder' => $this->client->__trans('Could you tell us a bit more?'),
                 'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="17" viewBox="0 0 24 17"><g fill="none"><g fill="#3B86FF"><path d="M23.5 9C23.5 9 23.5 8.9 23.5 8.9 23.5 8.9 23.5 8.9 23.5 8.9 23.4 8.6 23.2 8.3 23 8 22.2 6.5 20.6 3.7 19.8 2.6 18.8 1.3 17.7 0 16.1 0 15.7 0 15.3 0.1 14.9 0.2 13.8 0.6 12.6 1.2 12.3 2.7L11.7 2.7C11.4 1.2 10.2 0.6 9.1 0.2 8.7 0.1 8.3 0 7.9 0 6.3 0 5.2 1.3 4.2 2.6 3.4 3.7 1.8 6.5 1 8 0.8 8.3 0.6 8.6 0.5 8.9 0.5 8.9 0.5 8.9 0.5 8.9 0.5 8.9 0.5 9 0.5 9 0.2 9.7 0 10.5 0 11.3 0 14.4 2.5 17 5.5 17 7.3 17 8.8 16.1 9.8 14.8L14.2 14.8C15.2 16.1 16.7 17 18.5 17 21.5 17 24 14.4 24 11.3 24 10.5 23.8 9.7 23.5 9ZM5.5 15C3.6 15 2 13.2 2 11 2 8.8 3.6 7 5.5 7 7.4 7 9 8.8 9 11 9 13.2 7.4 15 5.5 15ZM18.5 15C16.6 15 15 13.2 15 11 15 8.8 16.6 7 18.5 7 20.4 7 22 8.8 22 11 22 13.2 20.4 15 18.5 15Z"/></g></g></svg>',
 			),
 			array(
 				'id'          => 'did-not-work-as-expected',
-				'text'        => $this->client->__trans( "Didn't work as expected" ),
-				'placeholder' => $this->client->__trans( 'What did you expect?' ),
+				'text'        => $this->client->__trans("Didn't work as expected"),
+				'placeholder' => $this->client->__trans('What did you expect?'),
                 'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><g fill="none"><g fill="#3B86FF"><path d="M11.5 0C17.9 0 23 5.1 23 11.5 23 17.9 17.9 23 11.5 23 5.1 23 0 17.9 0 11.5 0 5.1 5.1 0 11.5 0ZM11.5 2C6.3 2 2 6.3 2 11.5 2 16.7 6.3 21 11.5 21 16.7 21 21 16.7 21 11.5 21 6.3 16.7 2 11.5 2ZM12.5 12.9L12.7 5 10.2 5 10.5 12.9 12.5 12.9ZM11.5 17.4C12.4 17.4 13 16.8 13 15.9 13 15 12.4 14.4 11.5 14.4 10.6 14.4 10 15 10 15.9 10 16.8 10.6 17.4 11.5 17.4Z"/></g></g></svg>',
 			),
 			array(
 				'id'          => 'other',
-				'text'        => $this->client->__trans( 'Others' ),
-				'placeholder' => $this->client->__trans( 'Could you tell us a bit more?' ),
+				'text'        => $this->client->__trans('Others'),
+				'placeholder' => $this->client->__trans('Could you tell us a bit more?'),
                 'icon'        => '<svg xmlns="http://www.w3.org/2000/svg" width="24" height="23" viewBox="0 0 24 6"><g fill="none"><g fill="#3B86FF"><path d="M3 0C4.7 0 6 1.3 6 3 6 4.7 4.7 6 3 6 1.3 6 0 4.7 0 3 0 1.3 1.3 0 3 0ZM12 0C13.7 0 15 1.3 15 3 15 4.7 13.7 6 12 6 10.3 6 9 4.7 9 3 9 1.3 10.3 0 12 0ZM21 0C22.7 0 24 1.3 24 3 24 4.7 22.7 6 21 6 19.3 6 18 4.7 18 3 18 1.3 19.3 0 21 0Z"/></g></g></svg>',
 			),
 		);
@@ -778,19 +778,19 @@ 
      */
     public function uninstall_reason_submission() {
 
-        if ( ! isset( $_POST['reason_id'] ) ) {
+        if ( ! isset($_POST['reason_id'])) {
             wp_send_json_error();
         }
 
-        if ( ! wp_verify_nonce( $_POST['nonce'], 'appsero-security-nonce' ) ) {
-            wp_send_json_error( 'Nonce verification failed' );
+        if ( ! wp_verify_nonce($_POST['nonce'], 'appsero-security-nonce')) {
+            wp_send_json_error('Nonce verification failed');
         }
 
         $data                = $this->get_tracking_data();
-        $data['reason_id']   = sanitize_text_field( $_POST['reason_id'] );
-        $data['reason_info'] = isset( $_REQUEST['reason_info'] ) ? trim( stripslashes( $_REQUEST['reason_info'] ) ) : '';
+        $data['reason_id']   = sanitize_text_field($_POST['reason_id']);
+        $data['reason_info'] = isset($_REQUEST['reason_info']) ? trim(stripslashes($_REQUEST['reason_info'])) : '';
 
-        $this->client->send_request( $data, 'deactivate' );
+        $this->client->send_request($data, 'deactivate');
 
         wp_send_json_success();
     }
@@ -803,25 +803,25 @@ 
     public function deactivate_scripts() {
         global $pagenow;
 
-        if ( 'plugins.php' != $pagenow ) {
+        if ('plugins.php' != $pagenow) {
             return;
         }
 
         $this->deactivation_modal_styles();
         $reasons = $this->get_uninstall_reasons();
-        $custom_reasons = apply_filters( 'appsero_custom_deactivation_reasons', array() );
+        $custom_reasons = apply_filters('appsero_custom_deactivation_reasons', array());
         ?>
 
         <div class="wd-dr-modal" id="<?php echo $this->client->slug; ?>-wd-dr-modal">
             <div class="wd-dr-modal-wrap">
                 <div class="wd-dr-modal-header">
-                    <h3><?php $this->client->_etrans( 'Goodbyes are always hard. If you have a moment, please let us know how we can improve.' ); ?></h3>
+                    <h3><?php $this->client->_etrans('Goodbyes are always hard. If you have a moment, please let us know how we can improve.'); ?></h3>
                 </div>
 
                 <div class="wd-dr-modal-body">
                     <ul class="wd-de-reasons">
-                        <?php foreach ( $reasons as $reason ) { ?>
-                            <li data-placeholder="<?php echo esc_attr( $reason['placeholder'] ); ?>">
+                        <?php foreach ($reasons as $reason) { ?>
+                            <li data-placeholder="<?php echo esc_attr($reason['placeholder']); ?>">
                                 <label>
                                     <input type="radio" name="selected-reason" value="<?php echo $reason['id']; ?>">
                                     <div class="wd-de-reason-icon"><?php echo $reason['icon']; ?></div>
@@ -830,10 +830,10 @@ 
                             </li>
                         <?php } ?>
                     </ul>
-                    <?php if ( $custom_reasons && is_array( $custom_reasons ) ) : ?>
+                    <?php if ($custom_reasons && is_array($custom_reasons)) : ?>
                     <ul class="wd-de-reasons wd-de-others-reasons">
-                        <?php foreach ( $custom_reasons as $reason ) { ?>
-                            <li data-placeholder="<?php echo esc_attr( $reason['placeholder'] ); ?>" data-customreason="true">
+                        <?php foreach ($custom_reasons as $reason) { ?>
+                            <li data-placeholder="<?php echo esc_attr($reason['placeholder']); ?>" data-customreason="true">
                                 <label>
                                     <input type="radio" name="selected-reason" value="<?php echo $reason['id']; ?>">
                                     <div class="wd-de-reason-icon"><?php echo $reason['icon']; ?></div>
@@ -847,18 +847,18 @@ 
                     <p class="wd-dr-modal-reasons-bottom">
                        <?php
                        echo sprintf(
-	                       $this->client->__trans( 'We share your data with <a href="%1$s" target="_blank">Appsero</a> to troubleshoot problems &amp; make product improvements. <a href="%2$s" target="_blank">Learn more</a> about how Appsero handles your data.'),
-	                       esc_url( 'https://appsero.com/' ),
-                           esc_url( 'https://appsero.com/privacy-policy' )
+	                       $this->client->__trans('We share your data with <a href="%1$s" target="_blank">Appsero</a> to troubleshoot problems &amp; make product improvements. <a href="%2$s" target="_blank">Learn more</a> about how Appsero handles your data.'),
+	                       esc_url('https://appsero.com/'),
+                           esc_url('https://appsero.com/privacy-policy')
                        );
                        ?>
                     </p>
                 </div>
 
                 <div class="wd-dr-modal-footer">
-                    <a href="#" class="dont-bother-me wd-dr-button-secondary"><?php $this->client->_etrans( "Skip & Deactivate" ); ?></a>
-                    <button class="wd-dr-button-secondary wd-dr-cancel-modal"><?php $this->client->_etrans( 'Cancel' ); ?></button>
-                    <button class="wd-dr-submit-modal"><?php $this->client->_etrans( 'Submit & Deactivate' ); ?></button>
+                    <a href="#" class="dont-bother-me wd-dr-button-secondary"><?php $this->client->_etrans("Skip & Deactivate"); ?></a>
+                    <button class="wd-dr-button-secondary wd-dr-cancel-modal"><?php $this->client->_etrans('Cancel'); ?></button>
+                    <button class="wd-dr-submit-modal"><?php $this->client->_etrans('Submit & Deactivate'); ?></button>
                 </div>
             </div>
         </div>
@@ -928,7 +928,7 @@ 
                             url: ajaxurl,
                             type: 'POST',
                             data: {
-                                nonce: '<?php echo wp_create_nonce( 'appsero-security-nonce' ); ?>',
+                                nonce: '<?php echo wp_create_nonce('appsero-security-nonce'); ?>',
                                 action: '<?php echo $this->client->slug; ?>_submit-uninstall-reason',
                                 reason_id: ( 0 === $radio.length ) ? 'none' : $radio.val(),
                                 reason_info: ( 0 !== $input.length ) ? $input.val().trim() : ''
@@ -956,10 +956,10 @@ 
      * @param  object $old_theme
      * @return void
      */
-    public function theme_deactivated( $new_name, $new_theme, $old_theme ) {
+    public function theme_deactivated($new_name, $new_theme, $old_theme) {
         // Make sure this is appsero theme
-        if ( $old_theme->get_template() == $this->client->slug ) {
-            $this->client->send_request( $this->get_tracking_data(), 'deactivate' );
+        if ($old_theme->get_template() == $this->client->slug) {
+            $this->client->send_request($this->get_tracking_data(), 'deactivate');
         }
     }
 
@@ -967,15 +967,15 @@ 
      * Get user IP Address
      */
     private function get_user_ip_address() {
-        $response = wp_remote_get( 'https://icanhazip.com/' );
+        $response = wp_remote_get('https://icanhazip.com/');
 
-        if ( is_wp_error( $response ) ) {
+        if (is_wp_error($response)) {
             return '';
         }
 
-        $ip = trim( wp_remote_retrieve_body( $response ) );
+        $ip = trim(wp_remote_retrieve_body($response));
 
-        if ( ! filter_var( $ip, FILTER_VALIDATE_IP ) ) {
+        if ( ! filter_var($ip, FILTER_VALIDATE_IP)) {
             return '';
         }
 
@@ -986,15 +986,15 @@ 
      * Get site name
      */
     private function get_site_name() {
-        $site_name = get_bloginfo( 'name' );
+        $site_name = get_bloginfo('name');
 
-        if ( empty( $site_name ) ) {
-            $site_name = get_bloginfo( 'description' );
-            $site_name = wp_trim_words( $site_name, 3, '' );
+        if (empty($site_name)) {
+            $site_name = get_bloginfo('description');
+            $site_name = wp_trim_words($site_name, 3, '');
         }
 
-        if ( empty( $site_name ) ) {
-            $site_name = esc_url( home_url() );
+        if (empty($site_name)) {
+            $site_name = esc_url(home_url());
         }
 
         return $site_name;
@@ -1004,20 +1004,20 @@ 
      * Send request to appsero if user skip to send tracking data
      */
     private function send_tracking_skipped_request() {
-        $skipped = get_option( $this->client->slug . '_tracking_skipped' );
+        $skipped = get_option($this->client->slug.'_tracking_skipped');
 
         $data = array(
             'hash'               => $this->client->hash,
             'previously_skipped' => false,
         );
 
-        if ( $skipped === 'yes' ) {
+        if ($skipped === 'yes') {
             $data['previously_skipped'] = true;
         } else {
-            update_option( $this->client->slug . '_tracking_skipped', 'yes' );
+            update_option($this->client->slug.'_tracking_skipped', 'yes');
         }
 
-        $this->client->send_request( $data, 'tracking-skipped' );
+        $this->client->send_request($data, 'tracking-skipped');
     }
 
     /**

languages/event_espresso-translations-js.php

Spacing +704 added lines, -704 removed lines

@@ -2,137 +2,137 @@ 
 /* THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY. */
 $generated_i18n_strings = array(
 	// Reference: packages/ui-components/src/Pagination/constants.ts:6
-	__( '2', 'event_espresso' ),
+	__('2', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:7
-	__( '6', 'event_espresso' ),
+	__('6', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:8
-	__( '12', 'event_espresso' ),
+	__('12', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:9
-	__( '24', 'event_espresso' ),
+	__('24', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:10
-	__( '48', 'event_espresso' ),
+	__('48', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/AvatarImage.tsx:27
-	__( 'contact avatar', 'event_espresso' ),
+	__('contact avatar', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/OrderByControl.tsx:12
-	__( 'Order by', 'event_espresso' ),
+	__('Order by', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/RegStatusControl.tsx:17
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectStatus.tsx:13
-	__( 'Select Registration Status', 'event_espresso' ),
+	__('Select Registration Status', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/SortOrderControl.tsx:14
-	__( 'Ascending', 'event_espresso' ),
+	__('Ascending', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/SortOrderControl.tsx:18
-	__( 'Descending', 'event_espresso' ),
+	__('Descending', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/SortOrderControl.tsx:24
-	__( 'Sort order:', 'event_espresso' ),
+	__('Sort order:', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/AttendeesDisplay.tsx:41
-	__( 'There was some error fetching attendees list', 'event_espresso' ),
+	__('There was some error fetching attendees list', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/AttendeesDisplay.tsx:47
-	__( 'To get started, select what event you want to show attendees from in the block settings.', 'event_espresso' ),
+	__('To get started, select what event you want to show attendees from in the block settings.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/AttendeesDisplay.tsx:53
-	__( 'There are no attendees for selected options.', 'event_espresso' ),
+	__('There are no attendees for selected options.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/ArchiveSettings.tsx:12
-	__( 'Display on Archives', 'event_espresso' ),
+	__('Display on Archives', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/ArchiveSettings.tsx:17
-	__( 'Attendees are shown whenever this post is listed in an archive view.', 'event_espresso' ),
+	__('Attendees are shown whenever this post is listed in an archive view.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/ArchiveSettings.tsx:18
-	__( 'Attendees are hidden whenever this post is listed in an archive view.', 'event_espresso' ),
+	__('Attendees are hidden whenever this post is listed in an archive view.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/AttendeeLimit.tsx:29
-	__( 'Number of Attendees to Display:', 'event_espresso' ),
+	__('Number of Attendees to Display:', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/AttendeeLimit.tsx:34
 	/* translators: %d attendees count */
-	_n_noop( 'Used to adjust the number of attendees displayed (There is %d total attendee for the current filter settings).', 'Used to adjust the number of attendees displayed (There are %d total attendees for the current filter settings).', 'event_espresso' ),
+	_n_noop('Used to adjust the number of attendees displayed (There is %d total attendee for the current filter settings).', 'Used to adjust the number of attendees displayed (There are %d total attendees for the current filter settings).', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/GravatarSettings.tsx:27
-	__( 'Display Gravatar', 'event_espresso' ),
+	__('Display Gravatar', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/GravatarSettings.tsx:32
-	__( 'Gravatar images are shown for each attendee.', 'event_espresso' ),
+	__('Gravatar images are shown for each attendee.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/GravatarSettings.tsx:33
-	__( 'No gravatar images are shown for each attendee.', 'event_espresso' ),
+	__('No gravatar images are shown for each attendee.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/GravatarSettings.tsx:38
-	__( 'Size of Gravatar', 'event_espresso' ),
+	__('Size of Gravatar', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectDatetime.tsx:22
-	__( 'Select Datetime', 'event_espresso' ),
+	__('Select Datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectEvent.tsx:22
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectEvent.tsx:22
-	__( 'Select Event', 'event_espresso' ),
+	__('Select Event', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:11
-	__( 'Attendee id', 'event_espresso' ),
+	__('Attendee id', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:15
-	__( 'Last name only', 'event_espresso' ),
+	__('Last name only', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:19
-	__( 'First name only', 'event_espresso' ),
+	__('First name only', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:23
-	__( 'First, then Last name', 'event_espresso' ),
+	__('First, then Last name', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:27
-	__( 'Last, then First name', 'event_espresso' ),
+	__('Last, then First name', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:41
-	__( 'Order Attendees by:', 'event_espresso' ),
+	__('Order Attendees by:', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectTicket.tsx:22
-	__( 'Select Ticket', 'event_espresso' ),
+	__('Select Ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/index.tsx:21
-	__( 'Filter By Settings', 'event_espresso' ),
+	__('Filter By Settings', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/index.tsx:36
-	__( 'Gravatar Setttings', 'event_espresso' ),
+	__('Gravatar Setttings', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/index.tsx:39
-	__( 'Archive Settings', 'event_espresso' ),
+	__('Archive Settings', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:10
-	__( 'Event Attendees', 'event_espresso' ),
+	__('Event Attendees', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:11
-	__( 'Displays a list of people that have registered for the specified event', 'event_espresso' ),
+	__('Displays a list of people that have registered for the specified event', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:14
 	// Reference: domains/core/admin/blocks/src/event/index.tsx:12
 	// Reference: packages/edtr-services/src/constants.ts:25
-	__( 'event', 'event_espresso' ),
+	__('event', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:14
-	__( 'attendees', 'event_espresso' ),
+	__('attendees', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:14
-	__( 'list', 'event_espresso' ),
+	__('list', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/DisplayField.tsx:41
-	__( 'An unknown error occurred while fetching event details.', 'event_espresso' ),
+	__('An unknown error occurred while fetching event details.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:10
 	// Reference: domains/core/admin/blocks/src/services/utils.ts:24
 	// Reference: packages/utils/src/list/index.ts:14
-	__( 'Select…', 'event_espresso' ),
+	__('Select…', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:15
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:75
@@ -141,7 +141,7 @@ 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:198
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:49
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:40
-	__( 'Name', 'event_espresso' ),
+	__('Name', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:19
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:80
@@ -149,404 +149,404 @@ 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:203
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:55
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:47
-	__( 'Description', 'event_espresso' ),
+	__('Description', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:23
-	__( 'Short description', 'event_espresso' ),
+	__('Short description', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:35
-	__( 'Select Field', 'event_espresso' ),
+	__('Select Field', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:27
-	__( 'Text Color', 'event_espresso' ),
+	__('Text Color', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:32
-	__( 'Background Color', 'event_espresso' ),
+	__('Background Color', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:41
 	// Reference: packages/form-builder/src/FormElement/Tabs/FormElementTabs.tsx:22
 	// Reference: packages/form-builder/src/FormSection/Tabs/FormSectionTabs.tsx:21
-	__( 'Settings', 'event_espresso' ),
+	__('Settings', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:45
-	__( 'Typography', 'event_espresso' ),
+	__('Typography', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:48
-	__( 'Color', 'event_espresso' ),
+	__('Color', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/index.tsx:12
-	__( 'field', 'event_espresso' ),
+	__('field', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/index.tsx:8
-	__( 'Event Field', 'event_espresso' ),
+	__('Event Field', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/index.tsx:9
-	__( 'Displays the selected field of an event', 'event_espresso' ),
+	__('Displays the selected field of an event', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/services/utils.ts:17
-	__( 'Error', 'event_espresso' ),
+	__('Error', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/services/utils.ts:9
-	__( 'Loading…', 'event_espresso' ),
+	__('Loading…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventDescription.tsx:33
-	__( 'Event Description', 'event_espresso' ),
+	__('Event Description', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/ActiveStatus.tsx:28
-	__( 'Active status', 'event_espresso' ),
+	__('Active status', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/AltRegPage.tsx:12
-	__( 'Alternative Registration Page', 'event_espresso' ),
+	__('Alternative Registration Page', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/DefaultRegistrationStatus.tsx:25
-	__( 'Default Registration Status', 'event_espresso' ),
+	__('Default Registration Status', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/Donations.tsx:8
-	__( 'Donations Enabled', 'event_espresso' ),
+	__('Donations Enabled', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/Donations.tsx:8
-	__( 'Donations Disabled', 'event_espresso' ),
+	__('Donations Disabled', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/EventManager.tsx:16
-	__( 'Event Manager', 'event_espresso' ),
+	__('Event Manager', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/EventPhoneNumber.tsx:15
-	__( 'Event Phone Number', 'event_espresso' ),
+	__('Event Phone Number', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/MaxRegistrations.tsx:13
-	__( 'Max Registrations per Transaction', 'event_espresso' ),
+	__('Max Registrations per Transaction', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/TicketSelector.tsx:8
-	__( 'Ticket Selector Enabled', 'event_espresso' ),
+	__('Ticket Selector Enabled', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/TicketSelector.tsx:8
-	__( 'Ticket Selector Disabled', 'event_espresso' ),
+	__('Ticket Selector Disabled', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/index.tsx:41
-	__( 'Event Details', 'event_espresso' ),
+	__('Event Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/index.tsx:47
-	__( 'Registration Options', 'event_espresso' ),
+	__('Registration Options', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/DateFormSteps.tsx:10
-	__( 'primary information about the date', 'event_espresso' ),
+	__('primary information about the date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/DateFormSteps.tsx:10
-	__( 'Date Details', 'event_espresso' ),
+	__('Date Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/DateFormSteps.tsx:11
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:16
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:16
-	__( 'relations between tickets and dates', 'event_espresso' ),
+	__('relations between tickets and dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/DateFormSteps.tsx:11
-	__( 'Assign Tickets', 'event_espresso' ),
+	__('Assign Tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/FooterButtons.tsx:22
-	__( 'Save and assign tickets', 'event_espresso' ),
+	__('Save and assign tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/Modal.tsx:27
 	/* translators: %s datetime id */
-	__( 'Edit datetime %s', 'event_espresso' ),
+	__('Edit datetime %s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/Modal.tsx:30
-	__( 'New Datetime', 'event_espresso' ),
+	__('New Datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:110
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:108
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:233
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:108
-	__( 'Details', 'event_espresso' ),
+	__('Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:114
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:112
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:81
-	__( 'Capacity', 'event_espresso' ),
+	__('Capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:119
-	__( 'The maximum number of registrants that can attend the event at this particular date.', 'event_espresso' ),
+	__('The maximum number of registrants that can attend the event at this particular date.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:123
-	__( 'Set to 0 to close registration or leave blank for no limit.', 'event_espresso' ),
+	__('Set to 0 to close registration or leave blank for no limit.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:129
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:171
-	__( 'Trash', 'event_espresso' ),
+	__('Trash', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:71
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:45
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:194
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:45
-	__( 'Basics', 'event_espresso' ),
+	__('Basics', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:88
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:63
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:63
-	__( 'Dates', 'event_espresso' ),
+	__('Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:92
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:51
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:215
-	__( 'Start Date', 'event_espresso' ),
+	__('Start Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:99
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:65
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:222
-	__( 'End Date', 'event_espresso' ),
+	__('End Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DateRegistrationsLink.tsx:13
-	__( 'view ALL registrations for this date.', 'event_espresso' ),
+	__('view ALL registrations for this date.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DateSoldLink.tsx:13
-	__( 'view approved registrations for this date.', 'event_espresso' ),
+	__('view approved registrations for this date.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DatesList.tsx:35
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/TableView.tsx:33
-	__( 'Event Dates', 'event_espresso' ),
+	__('Event Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DatesList.tsx:38
-	__( 'loading event dates…', 'event_espresso' ),
+	__('loading event dates…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DatesListButtons.tsx:22
-	__( 'Add a date or a ticket in order to use Ticket Assignment Manager', 'event_espresso' ),
+	__('Add a date or a ticket in order to use Ticket Assignment Manager', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DatesListButtons.tsx:32
-	__( 'Ticket Assignments', 'event_espresso' ),
+	__('Ticket Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/AssignTicketsButton.tsx:25
-	__( 'Number of related tickets', 'event_espresso' ),
+	__('Number of related tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/AssignTicketsButton.tsx:26
-	__( 'There are no tickets assigned to this datetime. Please click the ticket icon to update the assignments.', 'event_espresso' ),
+	__('There are no tickets assigned to this datetime. Please click the ticket icon to update the assignments.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/AssignTicketsButton.tsx:34
-	__( 'assign tickets', 'event_espresso' ),
+	__('assign tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DateMainMenu.tsx:21
-	__( 'event date main menu', 'event_espresso' ),
+	__('event date main menu', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DateMainMenu.tsx:33
-	__( 'edit datetime', 'event_espresso' ),
+	__('edit datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DateMainMenu.tsx:34
-	__( 'copy datetime', 'event_espresso' ),
+	__('copy datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:15
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:48
-	__( 'delete permanently', 'event_espresso' ),
+	__('delete permanently', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:15
-	__( 'trash datetime', 'event_espresso' ),
+	__('trash datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:18
-	__( 'Permanently Delete Datetime?', 'event_espresso' ),
+	__('Permanently Delete Datetime?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:18
-	__( 'Move Datetime to Trash?', 'event_espresso' ),
+	__('Move Datetime to Trash?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:20
-	__( 'Are you sure you want to permanently delete this datetime? This action is permanent and can not be undone.', 'event_espresso' ),
+	__('Are you sure you want to permanently delete this datetime? This action is permanent and can not be undone.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:23
-	__( 'Are you sure you want to move this datetime to the trash? You can "untrash" this datetime later if you need to.', 'event_espresso' ),
+	__('Are you sure you want to move this datetime to the trash? You can "untrash" this datetime later if you need to.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:33
-	__( 'delete', 'event_espresso' ),
+	__('delete', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/actions/Actions.tsx:36
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:40
 	// Reference: packages/ui-components/src/bulkEdit/BulkActions.tsx:43
-	__( 'bulk actions', 'event_espresso' ),
+	__('bulk actions', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/actions/Actions.tsx:40
-	__( 'edit datetime details', 'event_espresso' ),
+	__('edit datetime details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/actions/Actions.tsx:44
-	__( 'delete datetimes', 'event_espresso' ),
+	__('delete datetimes', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/actions/Actions.tsx:44
-	__( 'trash datetimes', 'event_espresso' ),
+	__('trash datetimes', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/delete/Delete.tsx:14
-	__( 'Are you sure you want to permanently delete these datetimes? This action can NOT be undone!', 'event_espresso' ),
+	__('Are you sure you want to permanently delete these datetimes? This action can NOT be undone!', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/delete/Delete.tsx:15
-	__( 'Are you sure you want to trash these datetimes?', 'event_espresso' ),
+	__('Are you sure you want to trash these datetimes?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/delete/Delete.tsx:16
-	__( 'Delete datetimes permanently', 'event_espresso' ),
+	__('Delete datetimes permanently', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/delete/Delete.tsx:16
-	__( 'Trash datetimes', 'event_espresso' ),
+	__('Trash datetimes', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/EditDetails.tsx:21
-	__( 'Bulk edit date details', 'event_espresso' ),
+	__('Bulk edit date details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/EditDetails.tsx:22
-	__( 'any changes will be applied to ALL of the selected dates.', 'event_espresso' ),
+	__('any changes will be applied to ALL of the selected dates.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/formValidation.ts:12
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/formValidation.ts:12
-	__( 'Name must be at least three characters', 'event_espresso' ),
+	__('Name must be at least three characters', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:67
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:67
-	__( 'Shift dates', 'event_espresso' ),
+	__('Shift dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:92
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:92
-	__( 'earlier', 'event_espresso' ),
+	__('earlier', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:96
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:96
-	__( 'later', 'event_espresso' ),
+	__('later', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCapacity.tsx:31
 	/* translators: click to edit capacity<linebreak>(registration limit)… */
-	__( 'click to edit capacity%s(registration limit)…', 'event_espresso' ),
+	__('click to edit capacity%s(registration limit)…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:31
 	// Reference: packages/ee-components/src/SimpleTicketCard/SimpleTicketCard.tsx:27
 	// Reference: packages/ui-components/src/CalendarDateSwitcher/CalendarDateSwitcher.tsx:34
-	__( 'starts', 'event_espresso' ),
+	__('starts', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:32
 	// Reference: packages/ee-components/src/SimpleTicketCard/SimpleTicketCard.tsx:34
 	// Reference: packages/ui-components/src/CalendarDateSwitcher/CalendarDateSwitcher.tsx:47
-	__( 'ends', 'event_espresso' ),
+	__('ends', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:32
-	__( 'started', 'event_espresso' ),
+	__('started', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:32
-	__( 'ended', 'event_espresso' ),
+	__('ended', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:46
-	__( 'Edit Event Date', 'event_espresso' ),
+	__('Edit Event Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:50
-	__( 'edit start and end dates', 'event_espresso' ),
+	__('edit start and end dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateDetailsPanel.tsx:16
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketDetailsPanel.tsx:16
-	__( 'sold', 'event_espresso' ),
+	__('sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateDetailsPanel.tsx:21
-	__( 'capacity', 'event_espresso' ),
+	__('capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateDetailsPanel.tsx:27
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketDetailsPanel.tsx:26
-	__( 'reg list', 'event_espresso' ),
+	__('reg list', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/Details.tsx:43
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/Details.tsx:35
-	__( 'add description…', 'event_espresso' ),
+	__('add description…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/Details.tsx:44
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/Details.tsx:36
-	__( 'Edit description', 'event_espresso' ),
+	__('Edit description', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/Details.tsx:45
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/Details.tsx:37
-	__( 'click to edit description…', 'event_espresso' ),
+	__('click to edit description…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:10
-	__( 'Move Date to Trash', 'event_espresso' ),
+	__('Move Date to Trash', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:13
 	// Reference: packages/constants/src/datetime.ts:6
-	__( 'Active', 'event_espresso' ),
+	__('Active', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:14
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:13
-	__( 'Trashed', 'event_espresso' ),
+	__('Trashed', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:15
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:14
 	// Reference: packages/constants/src/datetime.ts:8
-	__( 'Expired', 'event_espresso' ),
+	__('Expired', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:16
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:16
-	__( 'Sold Out', 'event_espresso' ),
+	__('Sold Out', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:17
 	// Reference: packages/constants/src/datetime.ts:12
-	__( 'Upcoming', 'event_espresso' ),
+	__('Upcoming', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:7
-	__( 'Edit Event Date Details', 'event_espresso' ),
+	__('Edit Event Date Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:8
-	__( 'View Registrations for this Date', 'event_espresso' ),
+	__('View Registrations for this Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:9
-	__( 'Manage Ticket Assignments', 'event_espresso' ),
+	__('Manage Ticket Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/editable/EditableName.tsx:41
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/editable/EditableName.tsx:41
-	__( 'click to edit title…', 'event_espresso' ),
+	__('click to edit title…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/editable/EditableName.tsx:42
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/editable/EditableName.tsx:42
-	__( 'add title…', 'event_espresso' ),
+	__('add title…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/ActiveDatesFilters.tsx:17
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/ActiveTicketsFilters.tsx:17
-	__( 'ON', 'event_espresso' ),
+	__('ON', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:10
-	__( 'end dates only', 'event_espresso' ),
+	__('end dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:11
-	__( 'start and end dates', 'event_espresso' ),
+	__('start and end dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:16
-	__( 'dates above 90% capacity', 'event_espresso' ),
+	__('dates above 90% capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:17
-	__( 'dates above 75% capacity', 'event_espresso' ),
+	__('dates above 75% capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:18
-	__( 'dates above 50% capacity', 'event_espresso' ),
+	__('dates above 50% capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:19
-	__( 'dates below 50% capacity', 'event_espresso' ),
+	__('dates below 50% capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:23
-	__( 'all dates', 'event_espresso' ),
+	__('all dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:24
-	__( 'all active and upcoming', 'event_espresso' ),
+	__('all active and upcoming', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:25
-	__( 'active dates only', 'event_espresso' ),
+	__('active dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:26
-	__( 'upcoming dates only', 'event_espresso' ),
+	__('upcoming dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:27
-	__( 'next active or upcoming only', 'event_espresso' ),
+	__('next active or upcoming only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:28
-	__( 'sold out dates only', 'event_espresso' ),
+	__('sold out dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:29
-	__( 'recently expired dates', 'event_espresso' ),
+	__('recently expired dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:30
-	__( 'all expired dates', 'event_espresso' ),
+	__('all expired dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:31
-	__( 'trashed dates only', 'event_espresso' ),
+	__('trashed dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:35
 	// Reference: packages/dates/src/components/DateRangePicker/DateRangePickerLegend.tsx:9
 	// Reference: packages/dates/src/components/DateRangePicker/index.tsx:61
-	__( 'start date', 'event_espresso' ),
+	__('start date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:36
-	__( 'name', 'event_espresso' ),
+	__('name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:37
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:31
@@ -554,180 +554,180 @@ 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/HeaderCell.tsx:27
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:31
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:23
-	__( 'ID', 'event_espresso' ),
+	__('ID', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:38
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:47
-	__( 'custom order', 'event_espresso' ),
+	__('custom order', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:42
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:51
-	__( 'display', 'event_espresso' ),
+	__('display', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:43
-	__( 'recurrence', 'event_espresso' ),
+	__('recurrence', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:44
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:53
-	__( 'sales', 'event_espresso' ),
+	__('sales', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:45
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:55
-	__( 'sort by', 'event_espresso' ),
+	__('sort by', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:46
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:54
 	// Reference: packages/ee-components/src/EntityList/EntityListFilterBar.tsx:46
-	__( 'search', 'event_espresso' ),
+	__('search', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:47
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:56
-	__( 'status', 'event_espresso' ),
+	__('status', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:9
-	__( 'start dates only', 'event_espresso' ),
+	__('start dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/AddSingleDate.tsx:26
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/NewDateModal.tsx:12
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/OptionsModalButton.tsx:18
-	__( 'Add New Date', 'event_espresso' ),
+	__('Add New Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/AddSingleDate.tsx:26
-	__( 'Add Single Date', 'event_espresso' ),
+	__('Add Single Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/AddSingleDate.tsx:44
-	__( 'Add a single date that only occurs once', 'event_espresso' ),
+	__('Add a single date that only occurs once', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/AddSingleDate.tsx:46
-	__( 'Single Date', 'event_espresso' ),
+	__('Single Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:106
-	__( 'Reg list', 'event_espresso' ),
+	__('Reg list', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:107
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:111
-	__( 'Regs', 'event_espresso' ),
+	__('Regs', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:122
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:126
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:59
-	__( 'Actions', 'event_espresso' ),
+	__('Actions', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:52
-	__( 'Start', 'event_espresso' ),
+	__('Start', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:66
-	__( 'End', 'event_espresso' ),
+	__('End', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:82
-	__( 'Cap', 'event_espresso' ),
+	__('Cap', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:94
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:98
-	__( 'Sold', 'event_espresso' ),
+	__('Sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:33
 	// Reference: packages/form-builder/src/constants.ts:67
-	__( 'Text Input', 'event_espresso' ),
+	__('Text Input', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:34
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:32
-	__( 'Attendee First Name', 'event_espresso' ),
+	__('Attendee First Name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:39
 	/* translators: field name */
-	__( 'Registration form must have a field of type "%1$s" which maps to "%2$s"', 'event_espresso' ),
+	__('Registration form must have a field of type "%1$s" which maps to "%2$s"', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:40
 	// Reference: packages/form-builder/src/constants.ts:82
-	__( 'Email Address', 'event_espresso' ),
+	__('Email Address', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:41
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:40
-	__( 'Attendee Email Address', 'event_espresso' ),
+	__('Attendee Email Address', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:49
-	__( 'Please add the required fields', 'event_espresso' ),
+	__('Please add the required fields', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/RegistrationForm.tsx:12
-	__( 'Registration Form', 'event_espresso' ),
+	__('Registration Form', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:13
-	__( 'primary registrant', 'event_espresso' ),
+	__('primary registrant', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:17
-	__( 'purchaser', 'event_espresso' ),
+	__('purchaser', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:21
-	__( 'registrants', 'event_espresso' ),
+	__('registrants', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:36
-	__( 'Attendee Last Name', 'event_espresso' ),
+	__('Attendee Last Name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:44
-	__( 'Attendee Address', 'event_espresso' ),
+	__('Attendee Address', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:9
-	__( 'all', 'event_espresso' ),
+	__('all', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ErrorMessage.tsx:18
-	__( 'Tickets must always have at least one date assigned to them but one or more of the tickets below does not have any. 
-Please correct the assignments for the highlighted cells.', 'event_espresso' ),
+	__('Tickets must always have at least one date assigned to them but one or more of the tickets below does not have any. 
+Please correct the assignments for the highlighted cells.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ErrorMessage.tsx:22
-	__( 'Event Dates must always have at least one Ticket assigned to them but one or more of the Event Dates below does not have any. 
-Please correct the assignments for the highlighted cells.', 'event_espresso' ),
+	__('Event Dates must always have at least one Ticket assigned to them but one or more of the Event Dates below does not have any. 
+Please correct the assignments for the highlighted cells.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ErrorMessage.tsx:32
-	__( 'Please Update Assignments', 'event_espresso' ),
+	__('Please Update Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ModalContainer.tsx:26
-	__( 'There seem to be some dates/tickets which have no tickets/dates assigned. Do you want to fix them now?', 'event_espresso' ),
+	__('There seem to be some dates/tickets which have no tickets/dates assigned. Do you want to fix them now?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ModalContainer.tsx:29
-	__( 'Alert!', 'event_espresso' ),
+	__('Alert!', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ModalContainer.tsx:42
 	/* translators: 1 entity id, 2 entity name */
-	__( 'Ticket Assignment Manager for Datetime: %1$s - %2$s', 'event_espresso' ),
+	__('Ticket Assignment Manager for Datetime: %1$s - %2$s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ModalContainer.tsx:49
 	/* translators: 1 entity id, 2 entity name */
-	__( 'Ticket Assignment Manager for Ticket: %1$s - %2$s', 'event_espresso' ),
+	__('Ticket Assignment Manager for Ticket: %1$s - %2$s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/TicketAssignmentsManagerModal.tsx:28
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/Table.tsx:13
-	__( 'Ticket Assignment Manager', 'event_espresso' ),
+	__('Ticket Assignment Manager', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:10
-	__( 'existing relation', 'event_espresso' ),
+	__('existing relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:15
-	__( 'remove existing relation', 'event_espresso' ),
+	__('remove existing relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:20
-	__( 'add new relation', 'event_espresso' ),
+	__('add new relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:25
-	__( 'invalid relation', 'event_espresso' ),
+	__('invalid relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:29
-	__( 'no relation', 'event_espresso' ),
+	__('no relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/BodyCell.tsx:23
-	__( 'assign ticket', 'event_espresso' ),
+	__('assign ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/useGetHeaderRows.tsx:15
-	__( 'Assignments', 'event_espresso' ),
+	__('Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/useGetHeaderRows.tsx:16
-	__( 'Event Dates are listed below', 'event_espresso' ),
+	__('Event Dates are listed below', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/useGetHeaderRows.tsx:17
-	__( 'Tickets are listed along the top', 'event_espresso' ),
+	__('Tickets are listed along the top', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/useGetHeaderRows.tsx:18
-	__( 'Click the cell buttons to toggle assigments', 'event_espresso' ),
+	__('Click the cell buttons to toggle assigments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/useSubmitButtonProps.ts:29
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/FooterButtons.tsx:16
@@ -736,1547 +736,1547 @@ 
 	// Reference: packages/tpc/src/buttons/useSubmitButtonProps.tsx:29
 	// Reference: packages/ui-components/src/Modal/useSubmitButtonProps.tsx:13
 	// Reference: packages/ui-components/src/Stepper/buttons/Submit.tsx:7
-	__( 'Submit', 'event_espresso' ),
+	__('Submit', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/DatesByMonthControl.tsx:20
-	__( 'All Dates', 'event_espresso' ),
+	__('All Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/DatesByMonthControl.tsx:27
-	__( 'dates by month', 'event_espresso' ),
+	__('dates by month', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/ShowExpiredTicketsControl.tsx:16
-	__( 'show expired tickets', 'event_espresso' ),
+	__('show expired tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/ShowTrashedDatesControl.tsx:13
-	__( 'show trashed dates', 'event_espresso' ),
+	__('show trashed dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/ShowTrashedTicketsControl.tsx:16
-	__( 'show trashed tickets', 'event_espresso' ),
+	__('show trashed tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/Container.tsx:38
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actions/Actions.tsx:25
-	__( 'Default tickets', 'event_espresso' ),
+	__('Default tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/ModalBody.tsx:63
 	// Reference: packages/edtr-services/src/constants.ts:26
-	__( 'ticket', 'event_espresso' ),
+	__('ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/FooterButtons.tsx:26
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/FooterButtons.tsx:33
-	__( 'Set ticket prices', 'event_espresso' ),
+	__('Set ticket prices', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/FooterButtons.tsx:31
-	__( 'Skip prices - Save', 'event_espresso' ),
+	__('Skip prices - Save', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/FooterButtons.tsx:37
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/FooterButtons.tsx:57
-	__( 'Ticket details', 'event_espresso' ),
+	__('Ticket details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/FooterButtons.tsx:38
-	__( 'Save', 'event_espresso' ),
+	__('Save', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/Modal.tsx:22
 	/* translators: %s ticket id */
-	__( 'Edit ticket %s', 'event_espresso' ),
+	__('Edit ticket %s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/Modal.tsx:25
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/Modal.tsx:30
-	__( 'New Ticket Details', 'event_espresso' ),
+	__('New Ticket Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:10
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:10
-	__( 'primary information about the ticket', 'event_espresso' ),
+	__('primary information about the ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:10
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:10
-	__( 'Ticket Details', 'event_espresso' ),
+	__('Ticket Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:12
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:12
-	__( 'apply ticket price modifiers and taxes', 'event_espresso' ),
+	__('apply ticket price modifiers and taxes', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:14
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:14
-	__( 'Price Calculator', 'event_espresso' ),
+	__('Price Calculator', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:16
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:16
-	__( 'Assign Dates', 'event_espresso' ),
+	__('Assign Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/FooterButtons.tsx:39
-	__( 'Skip prices - assign dates', 'event_espresso' ),
+	__('Skip prices - assign dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/FooterButtons.tsx:50
-	__( 'Save and assign dates', 'event_espresso' ),
+	__('Save and assign dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/Modal.tsx:26
 	/* translators: 1 ticket name, 2 ticket id */
-	__( 'Edit ticket "%1$s" - %2$s', 'event_espresso' ),
+	__('Edit ticket "%1$s" - %2$s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:101
-	__( 'The maximum number of this ticket available for sale.', 'event_espresso' ),
+	__('The maximum number of this ticket available for sale.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:103
-	__( 'Set to 0 to stop sales, or leave blank for no limit.', 'event_espresso' ),
+	__('Set to 0 to stop sales, or leave blank for no limit.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:114
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:121
-	__( 'Number of Uses', 'event_espresso' ),
+	__('Number of Uses', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:120
-	__( 'Controls the total number of times this ticket can be used, regardless of the number of dates it is assigned to.', 'event_espresso' ),
+	__('Controls the total number of times this ticket can be used, regardless of the number of dates it is assigned to.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:124
-	__( 'Example: A ticket might have access to 4 different dates, but setting this field to 2 would mean that the ticket could only be used twice. Leave blank for no limit.', 'event_espresso' ),
+	__('Example: A ticket might have access to 4 different dates, but setting this field to 2 would mean that the ticket could only be used twice. Leave blank for no limit.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:132
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:129
-	__( 'Minimum Quantity', 'event_espresso' ),
+	__('Minimum Quantity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:137
-	__( 'The minimum quantity that can be selected for this ticket. Use this to create ticket bundles or graduated pricing.', 'event_espresso' ),
+	__('The minimum quantity that can be selected for this ticket. Use this to create ticket bundles or graduated pricing.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:141
-	__( 'Leave blank for no minimum.', 'event_espresso' ),
+	__('Leave blank for no minimum.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:147
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:137
-	__( 'Maximum Quantity', 'event_espresso' ),
+	__('Maximum Quantity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:153
-	__( 'The maximum quantity that can be selected for this ticket. Use this to create ticket bundles or graduated pricing.', 'event_espresso' ),
+	__('The maximum quantity that can be selected for this ticket. Use this to create ticket bundles or graduated pricing.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:157
-	__( 'Leave blank for no maximum.', 'event_espresso' ),
+	__('Leave blank for no maximum.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:163
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:146
-	__( 'Required Ticket', 'event_espresso' ),
+	__('Required Ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:165
-	__( 'If enabled, the ticket must be selected and will appear first in frontend ticket lists.', 'event_espresso' ),
+	__('If enabled, the ticket must be selected and will appear first in frontend ticket lists.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:177
-	__( 'Visibility', 'event_espresso' ),
+	__('Visibility', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:211
-	__( 'Ticket Sales', 'event_espresso' ),
+	__('Ticket Sales', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:95
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:112
-	__( 'Quantity For Sale', 'event_espresso' ),
+	__('Quantity For Sale', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketRegistrationsLink.tsx:13
-	__( 'total registrations.', 'event_espresso' ),
+	__('total registrations.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketRegistrationsLink.tsx:14
-	__( 'view ALL registrations for this ticket.', 'event_espresso' ),
+	__('view ALL registrations for this ticket.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketSoldLink.tsx:13
-	__( 'view approved registrations for this ticket.', 'event_espresso' ),
+	__('view approved registrations for this ticket.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketsList.tsx:36
-	__( 'Available Tickets', 'event_espresso' ),
+	__('Available Tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketsList.tsx:39
-	__( 'loading tickets…', 'event_espresso' ),
+	__('loading tickets…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/AssignDatesButton.tsx:26
-	__( 'Number of related dates', 'event_espresso' ),
+	__('Number of related dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/AssignDatesButton.tsx:27
-	__( 'There are no event dates assigned to this ticket. Please click the calendar icon to update the assignments.', 'event_espresso' ),
+	__('There are no event dates assigned to this ticket. Please click the calendar icon to update the assignments.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/AssignDatesButton.tsx:37
-	__( 'assign dates', 'event_espresso' ),
+	__('assign dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:19
-	__( 'Permanently Delete Ticket?', 'event_espresso' ),
+	__('Permanently Delete Ticket?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:19
-	__( 'Move Ticket to Trash?', 'event_espresso' ),
+	__('Move Ticket to Trash?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:22
-	__( 'Are you sure you want to permanently delete this ticket? This action is permanent and can not be undone.', 'event_espresso' ),
+	__('Are you sure you want to permanently delete this ticket? This action is permanent and can not be undone.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:48
 	// Reference: packages/ee-components/src/SimpleTicketCard/actions/Trash.tsx:6
-	__( 'trash ticket', 'event_espresso' ),
+	__('trash ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/TicketMainMenu.tsx:25
-	__( 'ticket main menu', 'event_espresso' ),
+	__('ticket main menu', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/TicketMainMenu.tsx:38
 	// Reference: packages/ee-components/src/SimpleTicketCard/actions/Edit.tsx:15
-	__( 'edit ticket', 'event_espresso' ),
+	__('edit ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/TicketMainMenu.tsx:39
-	__( 'copy ticket', 'event_espresso' ),
+	__('copy ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:44
-	__( 'edit ticket details', 'event_espresso' ),
+	__('edit ticket details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:48
-	__( 'delete tickets', 'event_espresso' ),
+	__('delete tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:48
-	__( 'trash tickets', 'event_espresso' ),
+	__('trash tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:52
-	__( 'edit ticket prices', 'event_espresso' ),
+	__('edit ticket prices', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/delete/Delete.tsx:14
-	__( 'Are you sure you want to permanently delete these tickets? This action can NOT be undone!', 'event_espresso' ),
+	__('Are you sure you want to permanently delete these tickets? This action can NOT be undone!', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/delete/Delete.tsx:15
-	__( 'Are you sure you want to trash these tickets?', 'event_espresso' ),
+	__('Are you sure you want to trash these tickets?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/delete/Delete.tsx:16
-	__( 'Delete tickets permanently', 'event_espresso' ),
+	__('Delete tickets permanently', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/delete/Delete.tsx:16
-	__( 'Trash tickets', 'event_espresso' ),
+	__('Trash tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/EditDetails.tsx:21
-	__( 'Bulk edit ticket details', 'event_espresso' ),
+	__('Bulk edit ticket details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/EditDetails.tsx:22
-	__( 'any changes will be applied to ALL of the selected tickets.', 'event_espresso' ),
+	__('any changes will be applied to ALL of the selected tickets.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/EditPrices.tsx:19
-	__( 'Bulk edit ticket prices', 'event_espresso' ),
+	__('Bulk edit ticket prices', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/EditModeButtons.tsx:20
-	__( 'Edit all prices together', 'event_espresso' ),
+	__('Edit all prices together', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/EditModeButtons.tsx:21
-	__( 'Edit all the selected ticket prices dynamically', 'event_espresso' ),
+	__('Edit all the selected ticket prices dynamically', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/EditModeButtons.tsx:25
-	__( 'Edit prices individually', 'event_espresso' ),
+	__('Edit prices individually', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/EditModeButtons.tsx:26
-	__( 'Edit prices for each ticket individually', 'event_espresso' ),
+	__('Edit prices for each ticket individually', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/FooterButtons.tsx:14
 	// Reference: packages/ee-components/src/bulkEdit/details/Submit.tsx:34
 	// Reference: packages/form/src/ResetButton.tsx:18
 	// Reference: packages/tpc/src/buttons/useResetButtonProps.tsx:12
-	__( 'Reset', 'event_espresso' ),
+	__('Reset', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/FooterButtons.tsx:15
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:76
 	// Reference: packages/ui-components/src/Modal/useCancelButtonProps.tsx:10
-	__( 'Cancel', 'event_espresso' ),
+	__('Cancel', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/editSeparately/TPCInstance.tsx:26
 	/* translators: %s ticket name */
-	__( 'Edit prices for Ticket: %s', 'event_espresso' ),
+	__('Edit prices for Ticket: %s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:30
-	__( 'sales start', 'event_espresso' ),
+	__('sales start', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:33
-	__( 'sales began', 'event_espresso' ),
+	__('sales began', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:35
-	__( 'sales ended', 'event_espresso' ),
+	__('sales ended', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:36
-	__( 'sales end', 'event_espresso' ),
+	__('sales end', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:50
-	__( 'Edit Ticket Sale Dates', 'event_espresso' ),
+	__('Edit Ticket Sale Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:54
-	__( 'edit ticket sales start and end dates', 'event_espresso' ),
+	__('edit ticket sales start and end dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketDetailsPanel.tsx:21
-	__( 'quantity', 'event_espresso' ),
+	__('quantity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketQuantity.tsx:28
 	// Reference: packages/edtr-services/src/apollo/mutations/tickets/useUpdateTicketQtyByCapacity.ts:78
-	__( 'Ticket quantity has been adjusted because it cannot be more than the related event date capacity.', 'event_espresso' ),
+	__('Ticket quantity has been adjusted because it cannot be more than the related event date capacity.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketQuantity.tsx:51
-	__( 'edit quantity of tickets available…', 'event_espresso' ),
+	__('edit quantity of tickets available…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:10
-	__( 'Move Ticket to Trash', 'event_espresso' ),
+	__('Move Ticket to Trash', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:15
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:52
-	__( 'On Sale', 'event_espresso' ),
+	__('On Sale', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:17
-	__( 'Pending', 'event_espresso' ),
+	__('Pending', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:7
-	__( 'Edit Ticket Details', 'event_espresso' ),
+	__('Edit Ticket Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:8
-	__( 'Manage Date Assignments', 'event_espresso' ),
+	__('Manage Date Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:9
 	// Reference: packages/tpc/src/components/table/Table.tsx:43
-	__( 'Ticket Price Calculator', 'event_espresso' ),
+	__('Ticket Price Calculator', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/editable/EditablePrice.tsx:39
-	__( 'edit ticket total…', 'event_espresso' ),
+	__('edit ticket total…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/editable/EditablePrice.tsx:53
-	__( 'set price…', 'event_espresso' ),
+	__('set price…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/IsChainedButton.tsx:23
-	__( 'tickets list is linked to dates list and is showing tickets for above dates only', 'event_espresso' ),
+	__('tickets list is linked to dates list and is showing tickets for above dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/IsChainedButton.tsx:24
-	__( 'tickets list is unlinked and is showing tickets for all event dates', 'event_espresso' ),
+	__('tickets list is unlinked and is showing tickets for all event dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:10
-	__( 'ticket sales start and end dates', 'event_espresso' ),
+	__('ticket sales start and end dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:15
-	__( 'tickets with 90% or more sold', 'event_espresso' ),
+	__('tickets with 90% or more sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:16
-	__( 'tickets with 75% or more sold', 'event_espresso' ),
+	__('tickets with 75% or more sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:17
-	__( 'tickets with 50% or more sold', 'event_espresso' ),
+	__('tickets with 50% or more sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:19
-	__( 'tickets with less than 50% sold', 'event_espresso' ),
+	__('tickets with less than 50% sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:28
-	__( 'all tickets for all dates', 'event_espresso' ),
+	__('all tickets for all dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:29
-	__( 'all on sale and sale pending', 'event_espresso' ),
+	__('all on sale and sale pending', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:30
-	__( 'on sale tickets only', 'event_espresso' ),
+	__('on sale tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:31
-	__( 'sale pending tickets only', 'event_espresso' ),
+	__('sale pending tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:32
-	__( 'next on sale or sale pending only', 'event_espresso' ),
+	__('next on sale or sale pending only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:33
-	__( 'sold out tickets only', 'event_espresso' ),
+	__('sold out tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:34
-	__( 'expired tickets only', 'event_espresso' ),
+	__('expired tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:35
-	__( 'trashed tickets only', 'event_espresso' ),
+	__('trashed tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:40
-	__( 'all tickets for above dates', 'event_espresso' ),
+	__('all tickets for above dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:44
-	__( 'ticket sale date', 'event_espresso' ),
+	__('ticket sale date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:45
-	__( 'ticket name', 'event_espresso' ),
+	__('ticket name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:46
-	__( 'ticket ID', 'event_espresso' ),
+	__('ticket ID', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:52
-	__( 'link', 'event_espresso' ),
+	__('link', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:8
-	__( 'ticket sales start date only', 'event_espresso' ),
+	__('ticket sales start date only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:9
-	__( 'ticket sales end date only', 'event_espresso' ),
+	__('ticket sales end date only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/newTicketOptions/AddSingleTicket.tsx:18
-	__( 'Add New Ticket', 'event_espresso' ),
+	__('Add New Ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/newTicketOptions/AddSingleTicket.tsx:32
-	__( 'Add a single ticket and assign the dates to it', 'event_espresso' ),
+	__('Add a single ticket and assign the dates to it', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/newTicketOptions/AddSingleTicket.tsx:34
-	__( 'Single Ticket', 'event_espresso' ),
+	__('Single Ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/TableView.tsx:39
-	__( 'Tickets', 'event_espresso' ),
+	__('Tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:110
-	__( 'Registrations', 'event_espresso' ),
+	__('Registrations', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:51
-	__( 'Goes on Sale', 'event_espresso' ),
+	__('Goes on Sale', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:65
-	__( 'Sale Ends', 'event_espresso' ),
+	__('Sale Ends', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:66
-	__( 'Ends', 'event_espresso' ),
+	__('Ends', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:78
-	__( 'Price', 'event_espresso' ),
+	__('Price', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:88
-	__( 'Quantity', 'event_espresso' ),
+	__('Quantity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:105
-	__( 'Select a Venue for the Event', 'event_espresso' ),
+	__('Select a Venue for the Event', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:21
-	__( 'Venue Details', 'event_espresso' ),
+	__('Venue Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:38
-	__( 'unlimited space', 'event_espresso' ),
+	__('unlimited space', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:41
 	/* translators: %d venue capacity */
-	__( 'Space for up to %d people', 'event_espresso' ),
+	__('Space for up to %d people', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:60
-	__( 'no image', 'event_espresso' ),
+	__('no image', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:96
-	__( 'Edit this Venue', 'event_espresso' ),
+	__('Edit this Venue', 'event_espresso'),
 
 	// Reference: domains/core/admin/wpPluginsPage/src/exitSurvey/Popup.tsx:29
-	__( 'Do you have a moment to share why you are deactivating Event Espresso?', 'event_espresso' ),
+	__('Do you have a moment to share why you are deactivating Event Espresso?', 'event_espresso'),
 
 	// Reference: domains/core/admin/wpPluginsPage/src/exitSurvey/Popup.tsx:40
-	__( 'Skip', 'event_espresso' ),
+	__('Skip', 'event_espresso'),
 
 	// Reference: domains/core/admin/wpPluginsPage/src/exitSurvey/Popup.tsx:42
-	__( 'Sure I\'ll help', 'event_espresso' ),
+	__('Sure I\'ll help', 'event_espresso'),
 
 	// Reference: packages/adapters/src/Pagination/Pagination.tsx:23
-	__( 'pagination', 'event_espresso' ),
+	__('pagination', 'event_espresso'),
 
 	// Reference: packages/adapters/src/TagSelector/TagSelector.tsx:113
-	__( 'toggle menu', 'event_espresso' ),
+	__('toggle menu', 'event_espresso'),
 
 	// Reference: packages/constants/src/datetime.ts:10
-	__( 'Postponed', 'event_espresso' ),
+	__('Postponed', 'event_espresso'),
 
 	// Reference: packages/constants/src/datetime.ts:11
-	__( 'SoldOut', 'event_espresso' ),
+	__('SoldOut', 'event_espresso'),
 
 	// Reference: packages/constants/src/datetime.ts:7
 	// Reference: packages/predicates/src/registration/statusOptions.ts:11
-	__( 'Cancelled', 'event_espresso' ),
+	__('Cancelled', 'event_espresso'),
 
 	// Reference: packages/constants/src/datetime.ts:9
-	__( 'Inactive', 'event_espresso' ),
+	__('Inactive', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:25
-	__( 'error creating %s', 'event_espresso' ),
+	__('error creating %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:26
-	__( 'error deleting %s', 'event_espresso' ),
+	__('error deleting %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:27
-	__( 'error updating %s', 'event_espresso' ),
+	__('error updating %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:28
-	__( 'creating %s', 'event_espresso' ),
+	__('creating %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:29
-	__( 'deleting %s', 'event_espresso' ),
+	__('deleting %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:30
-	__( 'updating %s', 'event_espresso' ),
+	__('updating %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:31
-	__( 'successfully created %s', 'event_espresso' ),
+	__('successfully created %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:32
-	__( 'successfully deleted %s', 'event_espresso' ),
+	__('successfully deleted %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:33
-	__( 'successfully updated %s', 'event_espresso' ),
+	__('successfully updated %s', 'event_espresso'),
 
 	// Reference: packages/dates/src/components/DateRangePicker/DateRangePickerLegend.tsx:13
-	__( 'day in range', 'event_espresso' ),
+	__('day in range', 'event_espresso'),
 
 	// Reference: packages/dates/src/components/DateRangePicker/DateRangePickerLegend.tsx:17
 	// Reference: packages/dates/src/components/DateRangePicker/index.tsx:79
-	__( 'end date', 'event_espresso' ),
+	__('end date', 'event_espresso'),
 
 	// Reference: packages/dates/src/components/DateTimePicker.tsx:17
 	// Reference: packages/dates/src/components/TimePicker.tsx:17
 	// Reference: packages/form-builder/src/state/utils.ts:433
-	__( 'time', 'event_espresso' ),
+	__('time', 'event_espresso'),
 
 	// Reference: packages/dates/src/constants.ts:7
-	__( 'End Date & Time must be set later than the Start Date & Time', 'event_espresso' ),
+	__('End Date & Time must be set later than the Start Date & Time', 'event_espresso'),
 
 	// Reference: packages/dates/src/constants.ts:9
-	__( 'Start Date & Time must be set before the End Date & Time', 'event_espresso' ),
+	__('Start Date & Time must be set before the End Date & Time', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:16
-	__( 'month(s)', 'event_espresso' ),
+	__('month(s)', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:17
-	__( 'week(s)', 'event_espresso' ),
+	__('week(s)', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:18
-	__( 'day(s)', 'event_espresso' ),
+	__('day(s)', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:19
-	__( 'hour(s)', 'event_espresso' ),
+	__('hour(s)', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:20
-	__( 'minute(s)', 'event_espresso' ),
+	__('minute(s)', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/apollo/initialization/useCacheRehydration.ts:107
-	__( 'price types initialized', 'event_espresso' ),
+	__('price types initialized', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/apollo/initialization/useCacheRehydration.ts:117
-	__( 'datetimes initialized', 'event_espresso' ),
+	__('datetimes initialized', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/apollo/initialization/useCacheRehydration.ts:127
-	__( 'tickets initialized', 'event_espresso' ),
+	__('tickets initialized', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/apollo/initialization/useCacheRehydration.ts:137
-	__( 'prices initialized', 'event_espresso' ),
+	__('prices initialized', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/apollo/mutations/useReorderEntities.ts:63
-	__( 'order updated', 'event_espresso' ),
+	__('order updated', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/constants.ts:24
-	__( 'datetime', 'event_espresso' ),
+	__('datetime', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/constants.ts:27
-	__( 'price', 'event_espresso' ),
+	__('price', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/constants.ts:28
 	// Reference: packages/tpc/src/inputs/PriceTypeInput.tsx:19
-	__( 'price type', 'event_espresso' ),
+	__('price type', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/utils/dateAndTime.ts:38
 	// Reference: packages/ui-components/src/EditDateRangeButton/EditDateRangeButton.tsx:39
-	__( 'End date has been adjusted', 'event_espresso' ),
+	__('End date has been adjusted', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/utils/dateAndTime.ts:59
-	__( 'Required', 'event_espresso' ),
+	__('Required', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/utils/dateAndTime.ts:64
-	__( 'Start Date is required', 'event_espresso' ),
+	__('Start Date is required', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/utils/dateAndTime.ts:68
-	__( 'End Date is required', 'event_espresso' ),
+	__('End Date is required', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/EntityList/EntityList.tsx:32
-	__( 'no results found', 'event_espresso' ),
+	__('no results found', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/EntityList/EntityList.tsx:33
-	__( 'try changing filter settings', 'event_espresso' ),
+	__('try changing filter settings', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/ActionCheckbox.tsx:38
 	/* translators: %d entity id */
-	__( 'select entity with id %d', 'event_espresso' ),
+	__('select entity with id %d', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/ActionCheckbox.tsx:41
-	__( 'select all entities', 'event_espresso' ),
+	__('select all entities', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/BulkEditDetails.tsx:20
-	__( 'Note: ', 'event_espresso' ),
+	__('Note: ', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/BulkEditDetails.tsx:20
-	__( 'any changes will be applied to ALL of the selected entities.', 'event_espresso' ),
+	__('any changes will be applied to ALL of the selected entities.', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/BulkEditDetails.tsx:27
-	__( 'Bulk edit details', 'event_espresso' ),
+	__('Bulk edit details', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/Submit.tsx:17
-	__( 'Are you sure you want to bulk update the details?', 'event_espresso' ),
+	__('Are you sure you want to bulk update the details?', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/Submit.tsx:18
-	__( 'Bulk update details', 'event_espresso' ),
+	__('Bulk update details', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/filterBar/SortByControl/index.tsx:27
-	__( 'set custom dates order', 'event_espresso' ),
+	__('set custom dates order', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/filterBar/SortByControl/index.tsx:28
-	__( 'set custom tickets order', 'event_espresso' ),
+	__('set custom tickets order', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/filterBar/SortByControl/index.tsx:30
-	__( 'Set Custom Dates Order - this is how dates are ordered on the frontend', 'event_espresso' ),
+	__('Set Custom Dates Order - this is how dates are ordered on the frontend', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/filterBar/SortByControl/index.tsx:31
-	__( 'Set Custom Tickets Order - this is how tickets are ordered on the frontend', 'event_espresso' ),
+	__('Set Custom Tickets Order - this is how tickets are ordered on the frontend', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/FormElementToolbar.tsx:32
-	__( 'delete form element', 'event_espresso' ),
+	__('delete form element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/FormElementToolbar.tsx:49
-	__( 'form element settings', 'event_espresso' ),
+	__('form element settings', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/FormElementToolbar.tsx:59
-	__( 'copy form element', 'event_espresso' ),
+	__('copy form element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/FormElementToolbar.tsx:69
-	__( 'click, hold, and drag to reorder form element', 'event_espresso' ),
+	__('click, hold, and drag to reorder form element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOption.tsx:20
-	__( 'remove option', 'event_espresso' ),
+	__('remove option', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOption.tsx:42
-	__( 'value', 'event_espresso' ),
+	__('value', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOption.tsx:52
-	__( 'label', 'event_espresso' ),
+	__('label', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOption.tsx:63
-	__( 'click, hold, and drag to reorder field option', 'event_espresso' ),
+	__('click, hold, and drag to reorder field option', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOptions.tsx:61
-	__( 'Options are the choices you give people to select from.', 'event_espresso' ),
+	__('Options are the choices you give people to select from.', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOptions.tsx:63
-	__( 'The value is a simple key that will be saved to the database and the label is what is shown to the user.', 'event_espresso' ),
+	__('The value is a simple key that will be saved to the database and the label is what is shown to the user.', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOptions.tsx:96
-	__( 'add new option', 'event_espresso' ),
+	__('add new option', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FormElementTabs.tsx:26
 	// Reference: packages/form-builder/src/FormSection/Tabs/FormSectionTabs.tsx:25
-	__( 'Styles', 'event_espresso' ),
+	__('Styles', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FormElementTabs.tsx:30
-	__( 'Validation', 'event_espresso' ),
+	__('Validation', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/InputType.tsx:18
-	__( 'Change input type', 'event_espresso' ),
+	__('Change input type', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/InputType.tsx:19
-	__( 'Some configurations might be lost. Are you sure you want to change the input type?', 'event_espresso' ),
+	__('Some configurations might be lost. Are you sure you want to change the input type?', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/InputType.tsx:40
-	__( 'type', 'event_espresso' ),
+	__('type', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:26
 	// Reference: packages/form-builder/src/FormSection/Tabs/Settings.tsx:17
-	__( 'public label', 'event_espresso' ),
+	__('public label', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:33
 	// Reference: packages/form-builder/src/FormSection/Tabs/Settings.tsx:22
-	__( 'admin label', 'event_espresso' ),
+	__('admin label', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:40
-	__( 'content', 'event_espresso' ),
+	__('content', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:48
-	__( 'options', 'event_espresso' ),
+	__('options', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:51
-	__( 'placeholder', 'event_espresso' ),
+	__('placeholder', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:57
-	__( 'admin only', 'event_espresso' ),
+	__('admin only', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:62
-	__( 'help text', 'event_espresso' ),
+	__('help text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:71
-	__( 'maps to', 'event_espresso' ),
+	__('maps to', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:15
 	// Reference: packages/form-builder/src/FormSection/Tabs/Styles.tsx:13
-	__( 'css class', 'event_espresso' ),
+	__('css class', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:20
-	__( 'help text css class', 'event_espresso' ),
+	__('help text css class', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:27
-	__( 'size', 'event_espresso' ),
+	__('size', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:35
-	__( 'step', 'event_espresso' ),
+	__('step', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:41
-	__( 'maxlength', 'event_espresso' ),
+	__('maxlength', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:123
-	__( 'min', 'event_espresso' ),
+	__('min', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:128
-	__( 'max', 'event_espresso' ),
+	__('max', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:28
-	__( 'Germany', 'event_espresso' ),
+	__('Germany', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:32
-	__( 'France', 'event_espresso' ),
+	__('France', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:36
-	__( 'United Kingdom', 'event_espresso' ),
+	__('United Kingdom', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:40
-	__( 'United States', 'event_espresso' ),
+	__('United States', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:44
-	__( 'Custom', 'event_espresso' ),
+	__('Custom', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:54
-	__( 'required', 'event_espresso' ),
+	__('required', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:59
-	__( 'required text', 'event_espresso' ),
+	__('required text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:66
-	__( 'autocomplete', 'event_espresso' ),
+	__('autocomplete', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:74
-	__( 'custom format', 'event_espresso' ),
+	__('custom format', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:75
-	__( 'format', 'event_espresso' ),
+	__('format', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:83
-	__( 'pattern', 'event_espresso' ),
+	__('pattern', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:110
-	__( 'add new form element', 'event_espresso' ),
+	__('add new form element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:117
 	// Reference: packages/form/src/renderers/RepeatableRenderer.tsx:52
-	__( 'Add', 'event_espresso' ),
+	__('Add', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:76
-	__( 'Add Form Element', 'event_espresso' ),
+	__('Add Form Element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:85
-	__( 'form element order can be changed after adding by using the drag handles in the form element toolbar', 'event_espresso' ),
+	__('form element order can be changed after adding by using the drag handles in the form element toolbar', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:92
-	__( 'load existing form section', 'event_espresso' ),
+	__('load existing form section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSectionToolbar.tsx:32
-	__( 'delete form section', 'event_espresso' ),
+	__('delete form section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSectionToolbar.tsx:47
-	__( 'form section settings', 'event_espresso' ),
+	__('form section settings', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSectionToolbar.tsx:57
-	__( 'copy form section', 'event_espresso' ),
+	__('copy form section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSectionToolbar.tsx:74
-	__( 'click, hold, and drag to reorder form section', 'event_espresso' ),
+	__('click, hold, and drag to reorder form section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSections.tsx:26
-	__( 'Add Form Section', 'event_espresso' ),
+	__('Add Form Section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:47
-	__( 'save form section for use in other forms', 'event_espresso' ),
+	__('save form section for use in other forms', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:51
-	__( 'save as', 'event_espresso' ),
+	__('save as', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:55
-	__( 'default', 'event_espresso' ),
+	__('default', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:58
-	__( ' a copy of this form section will be automatically added to ALL new events', 'event_espresso' ),
+	__(' a copy of this form section will be automatically added to ALL new events', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:61
-	__( 'shared', 'event_espresso' ),
+	__('shared', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:64
-	__( 'a copy of this form section will be saved for use in other events but not loaded by default', 'event_espresso' ),
+	__('a copy of this form section will be saved for use in other events but not loaded by default', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/Tabs/Settings.tsx:27
-	__( 'show label', 'event_espresso' ),
+	__('show label', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/Tabs/Settings.tsx:33
-	__( 'applies to', 'event_espresso' ),
+	__('applies to', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:102
 	// Reference: packages/form-builder/src/state/utils.ts:436
-	__( 'URL', 'event_espresso' ),
+	__('URL', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:104
-	__( 'adds a text input for entering a URL address', 'event_espresso' ),
+	__('adds a text input for entering a URL address', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:107
-	__( 'Date', 'event_espresso' ),
+	__('Date', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:109
-	__( 'adds a text input that allows users to enter a date directly via keyboard or a datepicker', 'event_espresso' ),
+	__('adds a text input that allows users to enter a date directly via keyboard or a datepicker', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:112
 	// Reference: packages/form-builder/src/state/utils.ts:369
-	__( 'Local Date', 'event_espresso' ),
+	__('Local Date', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:117
-	__( 'Month', 'event_espresso' ),
+	__('Month', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:119
-	__( 'adds a text input that allows users to enter a month and year directly via keyboard or a datepicker', 'event_espresso' ),
+	__('adds a text input that allows users to enter a month and year directly via keyboard or a datepicker', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:122
-	__( 'Time', 'event_espresso' ),
+	__('Time', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:124
-	__( 'adds a text input that allows users to enter a time directly via keyboard or a timepicker', 'event_espresso' ),
+	__('adds a text input that allows users to enter a time directly via keyboard or a timepicker', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:127
-	__( 'Week', 'event_espresso' ),
+	__('Week', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:129
-	__( 'adds a text input that allows users to enter a week and year directly via keyboard or a datepicker', 'event_espresso' ),
+	__('adds a text input that allows users to enter a week and year directly via keyboard or a datepicker', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:132
-	__( 'Day Selector', 'event_espresso' ),
+	__('Day Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:134
-	__( 'adds a dropdown selector that allows users to select the day of the month (01 to 31)', 'event_espresso' ),
+	__('adds a dropdown selector that allows users to select the day of the month (01 to 31)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:137
-	__( 'Month Selector', 'event_espresso' ),
+	__('Month Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:139
-	__( 'adds a dropdown selector that allows users to select the month of the year (01 to 12)', 'event_espresso' ),
+	__('adds a dropdown selector that allows users to select the month of the year (01 to 12)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:142
-	__( 'Year Selector', 'event_espresso' ),
+	__('Year Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:144
-	__( 'adds a dropdown selector that allows users to select the year from a configurable range', 'event_espresso' ),
+	__('adds a dropdown selector that allows users to select the year from a configurable range', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:147
-	__( 'Radio Buttons', 'event_espresso' ),
+	__('Radio Buttons', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:149
-	__( 'adds one or more radio buttons that allow users to only select one option from those provided', 'event_espresso' ),
+	__('adds one or more radio buttons that allow users to only select one option from those provided', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:152
 	// Reference: packages/form-builder/src/state/utils.ts:375
-	__( 'Decimal Number', 'event_espresso' ),
+	__('Decimal Number', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:154
-	__( 'adds a text input that only accepts numbers whose value is a decimal (float)', 'event_espresso' ),
+	__('adds a text input that only accepts numbers whose value is a decimal (float)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:157
 	// Reference: packages/form-builder/src/state/utils.ts:378
-	__( 'Whole Number', 'event_espresso' ),
+	__('Whole Number', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:159
-	__( 'adds a text input that only accepts numbers whose value is an integer (whole number)', 'event_espresso' ),
+	__('adds a text input that only accepts numbers whose value is an integer (whole number)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:162
-	__( 'Number Range', 'event_espresso' ),
+	__('Number Range', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:167
-	__( 'Phone Number', 'event_espresso' ),
+	__('Phone Number', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:172
-	__( 'Dropdown', 'event_espresso' ),
+	__('Dropdown', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:174
-	__( 'adds a dropdown selector that accepts a single value', 'event_espresso' ),
+	__('adds a dropdown selector that accepts a single value', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:177
-	__( 'Multi Select', 'event_espresso' ),
+	__('Multi Select', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:179
-	__( 'adds a dropdown selector that accepts multiple values', 'event_espresso' ),
+	__('adds a dropdown selector that accepts multiple values', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:182
-	__( 'Toggle/Switch', 'event_espresso' ),
+	__('Toggle/Switch', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:184
-	__( 'adds a toggle or a switch to accept true or false value', 'event_espresso' ),
+	__('adds a toggle or a switch to accept true or false value', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:187
-	__( 'Multi Checkbox', 'event_espresso' ),
+	__('Multi Checkbox', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:189
-	__( 'adds checkboxes that allow users to select zero or more options from those provided', 'event_espresso' ),
+	__('adds checkboxes that allow users to select zero or more options from those provided', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:192
-	__( 'Country Selector', 'event_espresso' ),
+	__('Country Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:194
-	__( 'adds a dropdown selector populated with names of countries that are enabled for the site', 'event_espresso' ),
+	__('adds a dropdown selector populated with names of countries that are enabled for the site', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:197
-	__( 'State Selector', 'event_espresso' ),
+	__('State Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:202
-	__( 'Button', 'event_espresso' ),
+	__('Button', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:204
-	__( 'adds a button to the form that can be used for triggering fucntionality (requires custom coding)', 'event_espresso' ),
+	__('adds a button to the form that can be used for triggering fucntionality (requires custom coding)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:207
-	__( 'Reset Button', 'event_espresso' ),
+	__('Reset Button', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:209
-	__( 'adds a button that will reset the form back to its original state.', 'event_espresso' ),
+	__('adds a button that will reset the form back to its original state.', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:55
-	__( 'Form Section', 'event_espresso' ),
+	__('Form Section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:57
-	__( 'Used for creating logical groupings for questions and form elements. Need to add a heading or description? Use the HTML form element.', 'event_espresso' ),
+	__('Used for creating logical groupings for questions and form elements. Need to add a heading or description? Use the HTML form element.', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:62
-	__( 'HTML Block', 'event_espresso' ),
+	__('HTML Block', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:64
-	__( 'allows you to add HTML like headings or text paragraphs to your form', 'event_espresso' ),
+	__('allows you to add HTML like headings or text paragraphs to your form', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:69
-	__( 'adds a text input that only accepts plain text', 'event_espresso' ),
+	__('adds a text input that only accepts plain text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:72
-	__( 'Plain Text Area', 'event_espresso' ),
+	__('Plain Text Area', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:74
-	__( 'adds a textarea block that only accepts plain text', 'event_espresso' ),
+	__('adds a textarea block that only accepts plain text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:77
-	__( 'HTML Text Area', 'event_espresso' ),
+	__('HTML Text Area', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:79
-	__( 'adds a textarea block that accepts text including simple HTML markup', 'event_espresso' ),
+	__('adds a textarea block that accepts text including simple HTML markup', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:84
-	__( 'adds a text input that only accepts a valid email address', 'event_espresso' ),
+	__('adds a text input that only accepts a valid email address', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:87
-	__( 'Email Confirmation', 'event_espresso' ),
+	__('Email Confirmation', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:92
-	__( 'Password', 'event_espresso' ),
+	__('Password', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:94
-	__( 'adds a text input that accepts text but masks what the user enters', 'event_espresso' ),
+	__('adds a text input that accepts text but masks what the user enters', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:97
-	__( 'Password Confirmation', 'event_espresso' ),
+	__('Password Confirmation', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/data/useElementMutator.ts:54
-	__( 'element', 'event_espresso' ),
+	__('element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/data/useSectionMutator.ts:54
-	__( 'section', 'event_espresso' ),
+	__('section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:360
-	__( 'click', 'event_espresso' ),
+	__('click', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:363
-	__( 'checkboxes', 'event_espresso' ),
+	__('checkboxes', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:366
-	__( 'date', 'event_espresso' ),
+	__('date', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:372
-	__( 'day', 'event_espresso' ),
+	__('day', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:381
-	__( 'email address', 'event_espresso' ),
+	__('email address', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:384
-	__( 'confirm email address', 'event_espresso' ),
+	__('confirm email address', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:388
-	__( 'month', 'event_espresso' ),
+	__('month', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:391
-	__( 'password', 'event_espresso' ),
+	__('password', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:394
-	__( 'confirm password', 'event_espresso' ),
+	__('confirm password', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:397
-	__( 'radio buttons', 'event_espresso' ),
+	__('radio buttons', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:400
-	__( 'number range', 'event_espresso' ),
+	__('number range', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:403
-	__( 'selection dropdown', 'event_espresso' ),
+	__('selection dropdown', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:406
-	__( 'country', 'event_espresso' ),
+	__('country', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:409
-	__( 'multi-select dropdown', 'event_espresso' ),
+	__('multi-select dropdown', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:412
-	__( 'state/province', 'event_espresso' ),
+	__('state/province', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:415
-	__( 'on/off switch', 'event_espresso' ),
+	__('on/off switch', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:418
-	__( 'reset', 'event_espresso' ),
+	__('reset', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:421
-	__( 'phone number', 'event_espresso' ),
+	__('phone number', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:424
-	__( 'text', 'event_espresso' ),
+	__('text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:427
-	__( 'simple textarea', 'event_espresso' ),
+	__('simple textarea', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:430
-	__( 'html textarea', 'event_espresso' ),
+	__('html textarea', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:439
-	__( 'week', 'event_espresso' ),
+	__('week', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:442
-	__( 'year', 'event_espresso' ),
+	__('year', 'event_espresso'),
 
 	// Reference: packages/form/src/adapters/WPMediaImage.tsx:12
-	__( 'Select Image', 'event_espresso' ),
+	__('Select Image', 'event_espresso'),
 
 	// Reference: packages/form/src/adapters/WPMediaImage.tsx:44
 	// Reference: packages/rich-text-editor/src/components/AdvancedTextEditor/toolbarButtons/WPMedia.tsx:11
 	// Reference: packages/rich-text-editor/src/rte-old/components/toolbarButtons/WPMedia.tsx:12
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityTemplate.tsx:32
-	__( 'Select', 'event_espresso' ),
+	__('Select', 'event_espresso'),
 
 	// Reference: packages/form/src/renderers/RepeatableRenderer.tsx:36
 	/* translators: %d the entry number */
-	__( 'Entry %d', 'event_espresso' ),
+	__('Entry %d', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:11
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:17
-	__( 'sold out', 'event_espresso' ),
+	__('sold out', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:14
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:14
-	__( 'expired', 'event_espresso' ),
+	__('expired', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:17
-	__( 'upcoming', 'event_espresso' ),
+	__('upcoming', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:20
-	__( 'active', 'event_espresso' ),
+	__('active', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:23
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:11
-	__( 'trashed', 'event_espresso' ),
+	__('trashed', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:26
-	__( 'cancelled', 'event_espresso' ),
+	__('cancelled', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:29
-	__( 'postponed', 'event_espresso' ),
+	__('postponed', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:33
-	__( 'inactive', 'event_espresso' ),
+	__('inactive', 'event_espresso'),
 
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:20
-	__( 'pending', 'event_espresso' ),
+	__('pending', 'event_espresso'),
 
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:23
-	__( 'on sale', 'event_espresso' ),
+	__('on sale', 'event_espresso'),
 
 	// Reference: packages/helpers/src/tickets/ticketVisibilityOptions.ts:6
-	__( 'Where the ticket can be viewed throughout the UI. ', 'event_espresso' ),
+	__('Where the ticket can be viewed throughout the UI. ', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:16
-	__( 'Declined', 'event_espresso' ),
+	__('Declined', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:21
-	__( 'Incomplete', 'event_espresso' ),
+	__('Incomplete', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:26
-	__( 'Not Approved', 'event_espresso' ),
+	__('Not Approved', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:31
-	__( 'Pending Payment', 'event_espresso' ),
+	__('Pending Payment', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:36
-	__( 'Wait List', 'event_espresso' ),
+	__('Wait List', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:6
-	__( 'Approved', 'event_espresso' ),
+	__('Approved', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/AdvancedTextEditor/toolbarButtons/WPMedia.tsx:9
 	// Reference: packages/rich-text-editor/src/rte-old/components/toolbarButtons/WPMedia.tsx:10
-	__( 'Select media', 'event_espresso' ),
+	__('Select media', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/RichTextEditor.tsx:84
-	__( 'Write something…', 'event_espresso' ),
+	__('Write something…', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/Toolbar.tsx:20
-	__( 'RTE Toolbar', 'event_espresso' ),
+	__('RTE Toolbar', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:11
-	__( 'Normal', 'event_espresso' ),
+	__('Normal', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:12
-	__( 'H1', 'event_espresso' ),
+	__('H1', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:13
-	__( 'H2', 'event_espresso' ),
+	__('H2', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:14
-	__( 'H3', 'event_espresso' ),
+	__('H3', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:15
-	__( 'H4', 'event_espresso' ),
+	__('H4', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:16
-	__( 'H5', 'event_espresso' ),
+	__('H5', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:17
-	__( 'H6', 'event_espresso' ),
+	__('H6', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:18
-	__( 'Block quote', 'event_espresso' ),
+	__('Block quote', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:19
-	__( 'Code', 'event_espresso' ),
+	__('Code', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/colorPicker/Component.tsx:36
-	__( 'Set color', 'event_espresso' ),
+	__('Set color', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/colorPicker/Component.tsx:45
-	__( 'Text color', 'event_espresso' ),
+	__('Text color', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/colorPicker/Component.tsx:47
-	__( 'Background color', 'event_espresso' ),
+	__('Background color', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:39
-	__( 'Add image', 'event_espresso' ),
+	__('Add image', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:51
-	__( 'Image URL', 'event_espresso' ),
+	__('Image URL', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:55
-	__( 'Alt text', 'event_espresso' ),
+	__('Alt text', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:56
-	__( 'Width', 'event_espresso' ),
+	__('Width', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:60
-	__( 'Height', 'event_espresso' ),
+	__('Height', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/link/Component.tsx:54
-	__( 'Edit link', 'event_espresso' ),
+	__('Edit link', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/link/Component.tsx:64
-	__( 'URL title', 'event_espresso' ),
+	__('URL title', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/list/Component.tsx:11
-	__( 'Unordered list', 'event_espresso' ),
+	__('Unordered list', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/list/Component.tsx:12
-	__( 'Ordered list', 'event_espresso' ),
+	__('Ordered list', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/list/Component.tsx:13
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/textAlign/Component.tsx:13
-	__( 'Indent', 'event_espresso' ),
+	__('Indent', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/list/Component.tsx:14
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/textAlign/Component.tsx:14
-	__( 'Outdent', 'event_espresso' ),
+	__('Outdent', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/textAlign/Component.tsx:11
-	__( 'Unordered textalign', 'event_espresso' ),
+	__('Unordered textalign', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/textAlign/Component.tsx:12
-	__( 'Ordered textalign', 'event_espresso' ),
+	__('Ordered textalign', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/render/Image/Toolbar.tsx:32
-	__( 'Image toolbar', 'event_espresso' ),
+	__('Image toolbar', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/WithEditMode/WithEditMode.tsx:62
 	// Reference: packages/rich-text-editor/src/rte-old/components/RTEWithEditMode/RTEWithEditMode.tsx:35
-	__( 'Visual editor', 'event_espresso' ),
+	__('Visual editor', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/WithEditMode/WithEditMode.tsx:66
 	// Reference: packages/rich-text-editor/src/rte-old/components/RTEWithEditMode/RTEWithEditMode.tsx:39
-	__( 'HTML editor', 'event_espresso' ),
+	__('HTML editor', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/rte-old/components/toolbarButtons/WPMedia.tsx:68
-	__( 'Add Media', 'event_espresso' ),
+	__('Add Media', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/AddPriceModifierButton.tsx:14
-	__( 'add new price modifier after this row', 'event_espresso' ),
+	__('add new price modifier after this row', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/DeleteAllPricesButton.tsx:14
-	__( 'Delete all prices', 'event_espresso' ),
+	__('Delete all prices', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/DeleteAllPricesButton.tsx:27
-	__( 'Are you sure you want to delete all of this ticket\'s prices and make it free? This action is permanent and can not be undone.', 'event_espresso' ),
+	__('Are you sure you want to delete all of this ticket\'s prices and make it free? This action is permanent and can not be undone.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/DeleteAllPricesButton.tsx:31
-	__( 'Delete all prices?', 'event_espresso' ),
+	__('Delete all prices?', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/DeletePriceModifierButton.tsx:12
-	__( 'delete price modifier', 'event_espresso' ),
+	__('delete price modifier', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/ReverseCalculateButton.tsx:14
-	__( 'Ticket base price is being reverse calculated from bottom to top starting with the ticket total. Entering a new ticket total will reverse calculate the ticket base price after applying all price modifiers in reverse. Click to turn off reverse calculations', 'event_espresso' ),
+	__('Ticket base price is being reverse calculated from bottom to top starting with the ticket total. Entering a new ticket total will reverse calculate the ticket base price after applying all price modifiers in reverse. Click to turn off reverse calculations', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/ReverseCalculateButton.tsx:17
-	__( 'Ticket total is being calculated normally from top to bottom starting from the base price. Entering a new ticket base price will recalculate the ticket total after applying all price modifiers. Click to turn on reverse calculations', 'event_espresso' ),
+	__('Ticket total is being calculated normally from top to bottom starting from the base price. Entering a new ticket base price will recalculate the ticket total after applying all price modifiers. Click to turn on reverse calculations', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/ReverseCalculateButton.tsx:21
-	__( 'Disable reverse calculate', 'event_espresso' ),
+	__('Disable reverse calculate', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/ReverseCalculateButton.tsx:21
-	__( 'Enable reverse calculate', 'event_espresso' ),
+	__('Enable reverse calculate', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/TicketPriceCalculatorButton.tsx:28
-	__( 'ticket price calculator', 'event_espresso' ),
+	__('ticket price calculator', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/taxes/AddDefaultTaxesButton.tsx:9
-	__( 'Add default taxes', 'event_espresso' ),
+	__('Add default taxes', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/taxes/RemoveTaxesButton.tsx:10
-	__( 'Are you sure you want to remove all of this ticket\'s taxes?', 'event_espresso' ),
+	__('Are you sure you want to remove all of this ticket\'s taxes?', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/taxes/RemoveTaxesButton.tsx:14
-	__( 'Remove all taxes?', 'event_espresso' ),
+	__('Remove all taxes?', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/taxes/RemoveTaxesButton.tsx:7
-	__( 'Remove taxes', 'event_espresso' ),
+	__('Remove taxes', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/DefaultPricesInfo.tsx:29
-	__( 'Modify default prices.', 'event_espresso' ),
+	__('Modify default prices.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/DefaultTaxesInfo.tsx:29
-	__( 'New default taxes are available. Click the - Add default taxes - button to add them now.', 'event_espresso' ),
+	__('New default taxes are available. Click the - Add default taxes - button to add them now.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/LockedTicketsBanner.tsx:12
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:74
-	__( 'Price editing is disabled!', 'event_espresso' ),
+	__('Price editing is disabled!', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner/AddDefaultPricesButton.tsx:9
-	__( 'Add default prices', 'event_espresso' ),
+	__('Add default prices', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner/index.tsx:13
-	__( 'This Ticket is Currently Free', 'event_espresso' ),
+	__('This Ticket is Currently Free', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner/index.tsx:21
 	/* translators: %s default prices */
-	__( 'Click the button below to load your %s into the calculator.', 'event_espresso' ),
+	__('Click the button below to load your %s into the calculator.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner/index.tsx:22
-	__( 'default prices', 'event_espresso' ),
+	__('default prices', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner/index.tsx:29
-	__( 'Additional ticket price modifiers can be added or removed.', 'event_espresso' ),
+	__('Additional ticket price modifiers can be added or removed.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner/index.tsx:32
-	__( 'Click the save button below to assign which dates this ticket will be available for purchase on.', 'event_espresso' ),
+	__('Click the save button below to assign which dates this ticket will be available for purchase on.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/TicketPriceCalculatorModal.tsx:22
 	// Reference: packages/ui-components/src/Confirm/ConfirmClose.tsx:7
 	// Reference: packages/ui-components/src/Confirm/useConfirmWithButton.tsx:10
 	// Reference: packages/ui-components/src/Confirm/useConfirmationDialog.tsx:52
-	__( 'Changes will be lost if you proceed.', 'event_espresso' ),
+	__('Changes will be lost if you proceed.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/TicketPriceCalculatorModal.tsx:33
 	/* translators: %s ticket name */
-	__( 'Price Calculator for Ticket: %s', 'event_espresso' ),
+	__('Price Calculator for Ticket: %s', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useFooterRowGenerator.tsx:48
-	__( 'Total', 'event_espresso' ),
+	__('Total', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useFooterRowGenerator.tsx:57
-	__( 'ticket total', 'event_espresso' ),
+	__('ticket total', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:29
-	__( 'Order', 'event_espresso' ),
+	__('Order', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:35
-	__( 'Price Type', 'event_espresso' ),
+	__('Price Type', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:41
-	__( 'Label', 'event_espresso' ),
+	__('Label', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:53
-	__( 'Amount', 'event_espresso' ),
+	__('Amount', 'event_espresso'),
 
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:22
-	__( 'Copy ticket', 'event_espresso' ),
+	__('Copy ticket', 'event_espresso'),
 
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:26
-	__( 'Copy and archive this ticket', 'event_espresso' ),
+	__('Copy and archive this ticket', 'event_espresso'),
 
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:29
-	__( 'OK', 'event_espresso' ),
+	__('OK', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceAmountInput.tsx:34
-	__( 'amount', 'event_espresso' ),
+	__('amount', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceAmountInput.tsx:46
-	__( 'amount…', 'event_espresso' ),
+	__('amount…', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceDescriptionInput.tsx:14
-	__( 'description…', 'event_espresso' ),
+	__('description…', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceDescriptionInput.tsx:9
-	__( 'price description', 'event_espresso' ),
+	__('price description', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceIdInput.tsx:6
-	__( 'price id', 'event_espresso' ),
+	__('price id', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceNameInput.tsx:13
-	__( 'label…', 'event_espresso' ),
+	__('label…', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceNameInput.tsx:8
-	__( 'price name', 'event_espresso' ),
+	__('price name', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceOrderInput.tsx:14
-	__( 'price order', 'event_espresso' ),
+	__('price order', 'event_espresso'),
 
 	// Reference: packages/tpc/src/utils/constants.ts:8
-	__( 'Ticket price modifications are blocked for Tickets that have already been sold to registrants, because doing so would negatively affect internal accounting for the event. If you still need to modify ticket prices, then create a copy of those tickets, edit the prices for the new tickets, and then trash the old tickets.', 'event_espresso' ),
+	__('Ticket price modifications are blocked for Tickets that have already been sold to registrants, because doing so would negatively affect internal accounting for the event. If you still need to modify ticket prices, then create a copy of those tickets, edit the prices for the new tickets, and then trash the old tickets.', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ActiveFilters/ActiveFilters.tsx:8
-	__( 'active filters:', 'event_espresso' ),
+	__('active filters:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ActiveFilters/FilterTag/index.tsx:15
 	/* translators: %s filter name */
-	__( 'remove filter - %s', 'event_espresso' ),
+	__('remove filter - %s', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:72
-	__( 'Address:', 'event_espresso' ),
+	__('Address:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:80
-	__( 'City:', 'event_espresso' ),
+	__('City:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:86
-	__( 'State:', 'event_espresso' ),
+	__('State:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:92
-	__( 'Country:', 'event_espresso' ),
+	__('Country:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:98
-	__( 'Zip:', 'event_espresso' ),
+	__('Zip:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/CalendarDateRange/CalendarDateRange.tsx:37
-	__( 'to', 'event_espresso' ),
+	__('to', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/CalendarPageDate/CalendarPageDate.tsx:54
-	__( 'TO', 'event_espresso' ),
+	__('TO', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/ColorPicker.tsx:60
-	__( 'Custom color', 'event_espresso' ),
+	__('Custom color', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/Swatch.tsx:23
 	/* translators: color name */
-	__( 'Color: %s', 'event_espresso' ),
+	__('Color: %s', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:13
-	__( 'Cyan bluish gray', 'event_espresso' ),
+	__('Cyan bluish gray', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:17
-	__( 'White', 'event_espresso' ),
+	__('White', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:21
-	__( 'Pale pink', 'event_espresso' ),
+	__('Pale pink', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:25
-	__( 'Vivid red', 'event_espresso' ),
+	__('Vivid red', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:29
-	__( 'Luminous vivid orange', 'event_espresso' ),
+	__('Luminous vivid orange', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:33
-	__( 'Luminous vivid amber', 'event_espresso' ),
+	__('Luminous vivid amber', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:37
-	__( 'Light green cyan', 'event_espresso' ),
+	__('Light green cyan', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:41
-	__( 'Vivid green cyan', 'event_espresso' ),
+	__('Vivid green cyan', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:45
-	__( 'Pale cyan blue', 'event_espresso' ),
+	__('Pale cyan blue', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:49
-	__( 'Vivid cyan blue', 'event_espresso' ),
+	__('Vivid cyan blue', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:53
-	__( 'Vivid purple', 'event_espresso' ),
+	__('Vivid purple', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:9
-	__( 'Black', 'event_espresso' ),
+	__('Black', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/ConfirmClose.tsx:8
 	// Reference: packages/ui-components/src/Modal/ModalWithAlert.tsx:24
-	__( 'Are you sure you want to close this?', 'event_espresso' ),
+	__('Are you sure you want to close this?', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/ConfirmClose.tsx:9
 	// Reference: packages/ui-components/src/Modal/ModalWithAlert.tsx:25
-	__( 'Yes, discard changes', 'event_espresso' ),
+	__('Yes, discard changes', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/ConfirmDelete.tsx:7
-	__( 'Are you sure you want to delete this?', 'event_espresso' ),
+	__('Are you sure you want to delete this?', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/useConfirmWithButton.tsx:11
-	__( 'Please confirm this action.', 'event_espresso' ),
+	__('Please confirm this action.', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/useConfirmationDialog.tsx:39
-	__( 'cancel', 'event_espresso' ),
+	__('cancel', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/useConfirmationDialog.tsx:40
-	__( 'confirm', 'event_espresso' ),
+	__('confirm', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/CurrencyDisplay/CurrencyDisplay.tsx:34
-	__( 'free', 'event_espresso' ),
+	__('free', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/DateTimeRangePicker/DateTimeRangePicker.tsx:117
 	// Reference: packages/ui-components/src/Popover/PopoverForm/PopoverForm.tsx:44
-	__( 'save', 'event_espresso' ),
+	__('save', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/DebugInfo/DebugInfo.tsx:36
-	__( 'Hide Debug Info', 'event_espresso' ),
+	__('Hide Debug Info', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/DebugInfo/DebugInfo.tsx:36
-	__( 'Show Debug Info', 'event_espresso' ),
+	__('Show Debug Info', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EditDateRangeButton/EditDateRangeButton.tsx:49
-	__( 'Edit Start and End Dates and Times', 'event_espresso' ),
+	__('Edit Start and End Dates and Times', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityActionsMenu/entityMenuItems/CopyEntity.tsx:8
-	__( 'copy', 'event_espresso' ),
+	__('copy', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityActionsMenu/entityMenuItems/EditEntity.tsx:8
-	__( 'edit', 'event_espresso' ),
+	__('edit', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityActionsMenu/entityMenuItems/TrashEntity.tsx:8
-	__( 'trash', 'event_espresso' ),
+	__('trash', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityActionsMenu/entityMenuItems/Untrash.tsx:8
-	__( 'untrash', 'event_espresso' ),
+	__('untrash', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/RegistrationsLink/index.tsx:12
-	__( 'click to open the registrations admin page in a new tab or window', 'event_espresso' ),
+	__('click to open the registrations admin page in a new tab or window', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/CardViewFilterButton.tsx:22
-	__( 'card view', 'event_espresso' ),
+	__('card view', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/TableViewFilterButton.tsx:21
-	__( 'table view', 'event_espresso' ),
+	__('table view', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/ToggleBulkActionsButton.tsx:8
-	__( 'hide bulk actions', 'event_espresso' ),
+	__('hide bulk actions', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/ToggleBulkActionsButton.tsx:8
-	__( 'show bulk actions', 'event_espresso' ),
+	__('show bulk actions', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/ToggleFiltersButton.tsx:9
-	__( 'hide filters', 'event_espresso' ),
+	__('hide filters', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/ToggleFiltersButton.tsx:9
-	__( 'show filters', 'event_espresso' ),
+	__('show filters', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Legend/ToggleLegendButton.tsx:26
-	__( 'hide legend', 'event_espresso' ),
+	__('hide legend', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Legend/ToggleLegendButton.tsx:26
-	__( 'show legend', 'event_espresso' ),
+	__('show legend', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/LoadingNotice/LoadingNotice.tsx:11
-	__( 'loading…', 'event_espresso' ),
+	__('loading…', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Modal/Modal.tsx:58
-	__( 'close modal', 'event_espresso' ),
+	__('close modal', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:10
-	__( 'jump to previous', 'event_espresso' ),
+	__('jump to previous', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:11
-	__( 'jump to next', 'event_espresso' ),
+	__('jump to next', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:12
-	__( 'page', 'event_espresso' ),
+	__('page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:8
-	__( 'previous', 'event_espresso' ),
+	__('previous', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:9
-	__( 'next', 'event_espresso' ),
+	__('next', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/PerPage.tsx:37
-	__( 'items per page', 'event_espresso' ),
+	__('items per page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:10
 	/* translators: %s is per page value */
-	__( '%s / page', 'event_espresso' ),
+	__('%s / page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:13
-	__( 'Next Page', 'event_espresso' ),
+	__('Next Page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:14
-	__( 'Previous Page', 'event_espresso' ),
+	__('Previous Page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/PercentSign/index.tsx:10
-	__( '%', 'event_espresso' ),
+	__('%', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityOptionsRow/index.tsx:31
 	/* translators: entity type to select */
-	__( 'Select an existing %s to use as a template.', 'event_espresso' ),
+	__('Select an existing %s to use as a template.', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityOptionsRow/index.tsx:38
-	__( 'or', 'event_espresso' ),
+	__('or', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityOptionsRow/index.tsx:43
 	/* translators: entity type to add */
-	__( 'Add a new %s and insert details manually', 'event_espresso' ),
+	__('Add a new %s and insert details manually', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityOptionsRow/index.tsx:48
-	__( 'Add New', 'event_espresso' ),
+	__('Add New', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Stepper/buttons/Next.tsx:8
-	__( 'Next', 'event_espresso' ),
+	__('Next', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Stepper/buttons/Previous.tsx:8
-	__( 'Previous', 'event_espresso' ),
+	__('Previous', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Steps/Steps.tsx:31
-	__( 'Steps', 'event_espresso' ),
+	__('Steps', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TabbableText/index.tsx:21
-	__( 'click to edit…', 'event_espresso' ),
+	__('click to edit…', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/Content.tsx:14
-	__( 'The Website\'s Time Zone', 'event_espresso' ),
+	__('The Website\'s Time Zone', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/Content.tsx:19
-	__( 'UTC (Greenwich Mean Time)', 'event_espresso' ),
+	__('UTC (Greenwich Mean Time)', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/Content.tsx:9
-	__( 'Your Local Time Zone', 'event_espresso' ),
+	__('Your Local Time Zone', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/TimezoneTimeInfo.tsx:25
-	__( 'click for timezone information', 'event_espresso' ),
+	__('click for timezone information', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/TimezoneTimeInfo.tsx:30
-	__( 'This Date Converted To:', 'event_espresso' ),
+	__('This Date Converted To:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/VenueSelector/VenueSelector.tsx:120
-	__( 'Add New Venue', 'event_espresso' ),
+	__('Add New Venue', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/VenueSelector/VenueSelector.tsx:36
-	__( '~ no venue ~', 'event_espresso' ),
+	__('~ no venue ~', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/VenueSelector/VenueSelector.tsx:43
-	__( 'assign venue…', 'event_espresso' ),
+	__('assign venue…', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/VenueSelector/VenueSelector.tsx:44
-	__( 'click to select a venue…', 'event_espresso' ),
+	__('click to select a venue…', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/bulkEdit/BulkActions.tsx:51
-	__( 'select all', 'event_espresso' ),
+	__('select all', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/bulkEdit/BulkActions.tsx:54
-	__( 'apply', 'event_espresso' )
+	__('apply', 'event_espresso')
 );
 /* THIS IS THE END OF THE GENERATED FILE */

espresso.php

Indentation +97 added lines, -97 removed lines

@@ -37,124 +37,124 @@
  * @since           4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time.
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time.
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
 <div class="error">
 	<p>
 		<?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
 	</p>
 </div>
 <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '7.4.0');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '7.4.0');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
 <div class="error">
 	<p>
 		<?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
 	</p>
 </div>
 <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
 
-        require_once __DIR__ . '/vendor/autoload.php';
-        require_once __DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php';
+		require_once __DIR__ . '/vendor/autoload.php';
+		require_once __DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php';
 
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '5.0.5.rc.000');
-        }
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '5.0.5.rc.000');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-            update_option('event-espresso-core_allow_tracking', 'no');
-            update_option('event-espresso-core_tracking_notice', 'hide');
-            // Run WP GraphQL activation callback
-            graphql_activation_callback();
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+			update_option('event-espresso-core_allow_tracking', 'no');
+			update_option('event-espresso-core_tracking_notice', 'hide');
+			// Run WP GraphQL activation callback
+			graphql_activation_callback();
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        /**
-         * espresso_plugin_deactivation
-         */
-        function espresso_plugin_deactivation()
-        {
-            // Run WP GraphQL deactivation callback
-            graphql_deactivation_callback();
-            delete_option('event-espresso-core_allow_tracking');
-            delete_option('event-espresso-core_tracking_notice');
-        }
-        register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
+		/**
+		 * espresso_plugin_deactivation
+		 */
+		function espresso_plugin_deactivation()
+		{
+			// Run WP GraphQL deactivation callback
+			graphql_deactivation_callback();
+			delete_option('event-espresso-core_allow_tracking');
+			delete_option('event-espresso-core_tracking_notice');
+		}
+		register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }

core/helpers/EEH_Tabbed_Content.helper.php

Indentation +194 added lines, -194 removed lines

@@ -13,249 +13,249 @@
  */
 class EEH_Tabbed_Content
 {
-    /**
-     * assembles and returns the html structure for tabs
-     *
-     * @static
-     * @param array $tabs_contents an array of the content for each tab [required]
-     * @param array $tabs_names    a numerically indexed array of names for each tab [optional]
-     *                             - if this isn't included then we use the indexes for $tabs_content as the tab names)
-     * @param bool  $small_tabs
-     * @param bool  $tabs_content
-     * @return string the assembled html string containing the tabbed content for display.
-     * @throws EE_Error
-     */
-    public static function display($tabs_contents, $tabs_names = [], $small_tabs = true, $tabs_content = true)
-    {
+	/**
+	 * assembles and returns the html structure for tabs
+	 *
+	 * @static
+	 * @param array $tabs_contents an array of the content for each tab [required]
+	 * @param array $tabs_names    a numerically indexed array of names for each tab [optional]
+	 *                             - if this isn't included then we use the indexes for $tabs_content as the tab names)
+	 * @param bool  $small_tabs
+	 * @param bool  $tabs_content
+	 * @return string the assembled html string containing the tabbed content for display.
+	 * @throws EE_Error
+	 */
+	public static function display($tabs_contents, $tabs_names = [], $small_tabs = true, $tabs_content = true)
+	{
 
-        // first check if $tabs_names is not empty then the count must match the count of $tabs_content otherwise we've got a problem houston
-        if (! empty($tabs_names) && (count((array) $tabs_names) != count((array) $tabs_content))) {
-            throw new EE_Error(
-                esc_html__('The count for $tabs_names and $tabs_content does not match.', 'event_espresso')
-            );
-        }
+		// first check if $tabs_names is not empty then the count must match the count of $tabs_content otherwise we've got a problem houston
+		if (! empty($tabs_names) && (count((array) $tabs_names) != count((array) $tabs_content))) {
+			throw new EE_Error(
+				esc_html__('The count for $tabs_names and $tabs_content does not match.', 'event_espresso')
+			);
+		}
 
-        // make sure we've got incoming data setup properly
-        $tabs         = ! empty($tabs_names)
-            ? (array) $tabs_names
-            : array_keys((array) $tabs_contents);
-        $tabs_content = ! empty($tabs_names)
-            ? array_combine((array) $tabs_names, (array) $tabs_content)
-            : $tabs_contents;
+		// make sure we've got incoming data setup properly
+		$tabs         = ! empty($tabs_names)
+			? (array) $tabs_names
+			: array_keys((array) $tabs_contents);
+		$tabs_content = ! empty($tabs_names)
+			? array_combine((array) $tabs_names, (array) $tabs_content)
+			: $tabs_contents;
 
-        $tabs_html         = '';
-        $tabs_content_html = '';
+		$tabs_html         = '';
+		$tabs_content_html = '';
 
-        $index = 0;
-        foreach ($tabs as $tab) {
-            $active            = $index === 0;
-            $tabs_html         .= self::tab($tab, $active);
-            $tabs_content_html .= self::tab_content($tab, $tabs_content[ $tab ], $active);
-            $index++;
-        }
+		$index = 0;
+		foreach ($tabs as $tab) {
+			$active            = $index === 0;
+			$tabs_html         .= self::tab($tab, $active);
+			$tabs_content_html .= self::tab_content($tab, $tabs_content[ $tab ], $active);
+			$index++;
+		}
 
-        $tabs_class = $small_tabs ? ' ee-nav-tabs-small' : '';
+		$tabs_class = $small_tabs ? ' ee-nav-tabs-small' : '';
 
-        return "
+		return "
     <div class='ee-nav-tabs{$tabs_class}'>
         <h2 class='nav-tab-wrapper'>{$tabs_html}</h2>
         {$tabs_content_html}
     </div>
     ";
-    }
+	}
 
 
-    /**
-     * display_admin_nav_tabs
-     * this returns the properly formatted tab html for EE_Admin_Pages.
-     * We are expecting an array of tabs in the following format
-     * array(
-     *    'nav_tab_name' => array(
-     *        'url' => 'url for tab',
-     *        'link_text' => 'tab text',
-     *        'css_class' => 'tab class' //including the nav-tab-active class if its active
-     *    )
-     * )
-     *
-     * @access public
-     * @static
-     * @param string[][] $nav_tabs tab array for nav tabs
-     * @return string
-     * @throws EE_Error
-     */
-    public static function display_admin_nav_tabs(array $nav_tabs = [], string $page_slug = '')
-    {
-        if (empty($nav_tabs)) {
-            throw new EE_Error(
-                esc_html__('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso')
-            );
-        }
-        $tab_content = '';
-        $tab_count = 0;
-        foreach ($nav_tabs as $slug => $tab) {
-            $tab_count++;
-            $tab_content .= self::tab($slug, false, $tab['link_text'], $tab['url'], $tab['css_class']);
-        }
-        $aria_label = esc_attr__('Secondary menu', 'event_espresso');
-        $css_class = "ee-nav-tabs--{$tab_count}";
-        $css_class .= $page_slug ? " ee-nav-tabs--$page_slug" : '';
-        return "
+	/**
+	 * display_admin_nav_tabs
+	 * this returns the properly formatted tab html for EE_Admin_Pages.
+	 * We are expecting an array of tabs in the following format
+	 * array(
+	 *    'nav_tab_name' => array(
+	 *        'url' => 'url for tab',
+	 *        'link_text' => 'tab text',
+	 *        'css_class' => 'tab class' //including the nav-tab-active class if its active
+	 *    )
+	 * )
+	 *
+	 * @access public
+	 * @static
+	 * @param string[][] $nav_tabs tab array for nav tabs
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public static function display_admin_nav_tabs(array $nav_tabs = [], string $page_slug = '')
+	{
+		if (empty($nav_tabs)) {
+			throw new EE_Error(
+				esc_html__('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso')
+			);
+		}
+		$tab_content = '';
+		$tab_count = 0;
+		foreach ($nav_tabs as $slug => $tab) {
+			$tab_count++;
+			$tab_content .= self::tab($slug, false, $tab['link_text'], $tab['url'], $tab['css_class']);
+		}
+		$aria_label = esc_attr__('Secondary menu', 'event_espresso');
+		$css_class = "ee-nav-tabs--{$tab_count}";
+		$css_class .= $page_slug ? " ee-nav-tabs--$page_slug" : '';
+		return "
         <nav class='nav-tab-wrapper wp-clearfix $css_class' aria-label='$aria_label'>
             $tab_content
         </nav>
         ";
-    }
+	}
 
 
-    /**
-     * this simply returns a single tab given a tab name & content
-     *
-     * @param string      $name      name of tab
-     * @param bool        $active    true=tab active, false=tab not active
-     * @param bool|string $nice_name if string given then this value will be used for the tab link text.
-     * @param bool|string $url       If url given then tabs will be generated linking to the url.
-     * @param bool|string $css       If string given then the generated tab will include that as the class.
-     * @return string          html for tab
-     */
-    private static function tab($name, $active = false, $nice_name = false, $url = false, $css = false)
-    {
-        $nice_name = $nice_name ?: esc_html(ucwords(str_replace(['_', '-'], ' ', $name)));
-        $name      = self::generateTabID($name);
-        $class     = $css ? ' ' . esc_attr($css) : '';
-        $class     .= $active ? ' nav-tab-active' : '';
-        $url       = $url ?: '#' . esc_attr($name);
-        return "
+	/**
+	 * this simply returns a single tab given a tab name & content
+	 *
+	 * @param string      $name      name of tab
+	 * @param bool        $active    true=tab active, false=tab not active
+	 * @param bool|string $nice_name if string given then this value will be used for the tab link text.
+	 * @param bool|string $url       If url given then tabs will be generated linking to the url.
+	 * @param bool|string $css       If string given then the generated tab will include that as the class.
+	 * @return string          html for tab
+	 */
+	private static function tab($name, $active = false, $nice_name = false, $url = false, $css = false)
+	{
+		$nice_name = $nice_name ?: esc_html(ucwords(str_replace(['_', '-'], ' ', $name)));
+		$name      = self::generateTabID($name);
+		$class     = $css ? ' ' . esc_attr($css) : '';
+		$class     .= $active ? ' nav-tab-active' : '';
+		$url       = $url ?: '#' . esc_attr($name);
+		return "
         <a class='nav-tab{$class}' rel='{$name}' href='{$url}'>
             $nice_name
         </a>
         ";
-    }
+	}
 
 
-    /**
-     * @param string $tab_name
-     * @return string
-     * @since   4.10.14.p
-     */
-    private static function generateTabID($tab_name)
-    {
-        return 'ee-tab-' . esc_attr(str_replace(' ', '-', $tab_name));
-    }
+	/**
+	 * @param string $tab_name
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	private static function generateTabID($tab_name)
+	{
+		return 'ee-tab-' . esc_attr(str_replace(' ', '-', $tab_name));
+	}
 
 
-    /**
-     * this just returns the properly formatted tab content for our tab box.
-     *
-     * @param string $name        name of tab (used for selector)
-     * @param string $tab_content content of tab
-     * @param bool   $active
-     * @return string html for content area
-     */
-    private static function tab_content($name, $tab_content, $active = false)
-    {
-        $class = $active ? '' : ' hidden';
-        $name  = self::generateTabID($name);
-        return "
+	/**
+	 * this just returns the properly formatted tab content for our tab box.
+	 *
+	 * @param string $name        name of tab (used for selector)
+	 * @param string $tab_content content of tab
+	 * @param bool   $active
+	 * @return string html for content area
+	 */
+	private static function tab_content($name, $tab_content, $active = false)
+	{
+		$class = $active ? '' : ' hidden';
+		$name  = self::generateTabID($name);
+		return "
     <div class='nav-tab-content{$class}' id='{$name}'>
         {$tab_content}
         <div style='clear:both'></div>
     </div>";
-    }
+	}
 
 
 
-    /** HORIZONTAL TEXT LINKS **/
+	/** HORIZONTAL TEXT LINKS **/
 
-    /**
-     * This will take in an array of link items and spit out a formatted list of links that can be used to navigate to
-     * items. There is a corresponding js file that can be loaded to dynamically display containers with the same id as
-     * the href -ref.
-     *
-     * @param string[] $item_array      formatted array of items.  Format:
-     *                                  array(
-     *                                  'label' => esc_html__('localized label displayed'),
-     *                                  'class' => 'class_for_item',
-     *                                  'href' => '#some_item_id', //url/bookmark for item.  If you include a bookmark
-     *                                  the js will used this to show the container div.
-     *                                  'title' => esc_html__('localized text for the title attribute of the link'),
-     *                                  'slug' => 'slug_used_for_reference'
-     *                                  )
-     * @param string   $container_class class used for main container
-     * @param string   $sep             you can add in what is used as a separator between each link (or leave blank for
-     *                                  none)
-     * @param string   $default         You can include a string for the item that will receive the "item_display" class
-     *                                  for the js.
-     * @return string                  a html snippet of of all the formatted link elements.
-     */
-    public static function tab_text_links(array $item_array, $container_class = '', $sep = '|', $default = '')
-    {
-        $item_array = apply_filters('FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class);
-        if (! is_array($item_array) || empty($item_array)) {
-            return false; // get out we don't have even the basic thing we need!
-        }
+	/**
+	 * This will take in an array of link items and spit out a formatted list of links that can be used to navigate to
+	 * items. There is a corresponding js file that can be loaded to dynamically display containers with the same id as
+	 * the href -ref.
+	 *
+	 * @param string[] $item_array      formatted array of items.  Format:
+	 *                                  array(
+	 *                                  'label' => esc_html__('localized label displayed'),
+	 *                                  'class' => 'class_for_item',
+	 *                                  'href' => '#some_item_id', //url/bookmark for item.  If you include a bookmark
+	 *                                  the js will used this to show the container div.
+	 *                                  'title' => esc_html__('localized text for the title attribute of the link'),
+	 *                                  'slug' => 'slug_used_for_reference'
+	 *                                  )
+	 * @param string   $container_class class used for main container
+	 * @param string   $sep             you can add in what is used as a separator between each link (or leave blank for
+	 *                                  none)
+	 * @param string   $default         You can include a string for the item that will receive the "item_display" class
+	 *                                  for the js.
+	 * @return string                  a html snippet of of all the formatted link elements.
+	 */
+	public static function tab_text_links(array $item_array, $container_class = '', $sep = '|', $default = '')
+	{
+		$item_array = apply_filters('FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class);
+		if (! is_array($item_array) || empty($item_array)) {
+			return false; // get out we don't have even the basic thing we need!
+		}
 
-        $defaults        = [
-            'label' => esc_html__('Item', 'event_espresso'),
-            'class' => '',
-            'href'  => '',
-            'title' => esc_attr__('Link for Item', 'event_espresso'),
-            'slug'  => 'item_slug',
-        ];
-        $container_class = ! empty($container_class) ? ' ' . esc_attr($container_class) : '';
-        $list            = '';
-        $list_length     = count($item_array);
-        // if we're' adding separators, set $current to 1, otherwise set it to list length + 1
-        // then we'll increment $current while looping and only add separators if $current is < list length
-        // (if we aren't adding separators $current will always be > list length cuz it started at list length + 1)
-        $current = empty($sep) ? $list_length + 1 : 1;
-        foreach ($item_array as $item) {
-            $item          = wp_parse_args($item, $defaults);
-            $item['class'] .= $default === $item['slug'] ? ' item_display' : '';
-            $list          .= self::textLinkItem($item);
-            $list          .= $current < $list_length ? self::textLinkSeparator($sep) : '';
-            $current++;
-        }
+		$defaults        = [
+			'label' => esc_html__('Item', 'event_espresso'),
+			'class' => '',
+			'href'  => '',
+			'title' => esc_attr__('Link for Item', 'event_espresso'),
+			'slug'  => 'item_slug',
+		];
+		$container_class = ! empty($container_class) ? ' ' . esc_attr($container_class) : '';
+		$list            = '';
+		$list_length     = count($item_array);
+		// if we're' adding separators, set $current to 1, otherwise set it to list length + 1
+		// then we'll increment $current while looping and only add separators if $current is < list length
+		// (if we aren't adding separators $current will always be > list length cuz it started at list length + 1)
+		$current = empty($sep) ? $list_length + 1 : 1;
+		foreach ($item_array as $item) {
+			$item          = wp_parse_args($item, $defaults);
+			$item['class'] .= $default === $item['slug'] ? ' item_display' : '';
+			$list          .= self::textLinkItem($item);
+			$list          .= $current < $list_length ? self::textLinkSeparator($sep) : '';
+			$current++;
+		}
 
-        return "
+		return "
         <div class='ee-text-links{$container_class}'>{$list}</div>
         ";
-    }
+	}
 
 
-    /**
-     * @param string[] $item
-     * @return string
-     */
-    private static function textLinkItem(array $item)
-    {
-        $class = $item['class'] ? esc_attr($item['class']) : '';
-        $label = esc_html($item['label']);
-        $href  = $item['href'] ? esc_attr($item['href']) : '';
-        $icon  = $item['icon'] ?? '';
-        $title = esc_attr($item['title']);
-        $tag = $item['tag'] ?? 'a';
+	/**
+	 * @param string[] $item
+	 * @return string
+	 */
+	private static function textLinkItem(array $item)
+	{
+		$class = $item['class'] ? esc_attr($item['class']) : '';
+		$label = esc_html($item['label']);
+		$href  = $item['href'] ? esc_attr($item['href']) : '';
+		$icon  = $item['icon'] ?? '';
+		$title = esc_attr($item['title']);
+		$tag = $item['tag'] ?? 'a';
 
 
-        return ! empty($href)
-            ? "
+		return ! empty($href)
+			? "
             <{$tag} class='{$class} ee-text-link ee-aria-tooltip' href='#{$href}' aria-label='{$title}'>
                 {$icon}{$label}
             </{$tag}>
             "
-            : $label;
-    }
+			: $label;
+	}
 
 
-    /**
-     * @param string $separator
-     * @return string
-     * @since   4.10.14.p
-     */
-    private static function textLinkSeparator($separator)
-    {
-        $separator = esc_html($separator);
-        return "
+	/**
+	 * @param string $separator
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	private static function textLinkSeparator($separator)
+	{
+		$separator = esc_html($separator);
+		return "
         <span class='ee-text-link-sep'>{$separator}</span>
         ";
-    }
+	}
 }

core/db_models/EEM_Registration.model.php

Indentation +883 added lines, -883 removed lines

@@ -14,832 +14,832 @@ 
  */
 class EEM_Registration extends EEM_Soft_Delete_Base
 {
-    /**
-     * The value of REG_count for a primary registrant
-     */
-    const PRIMARY_REGISTRANT_COUNT = 1;
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate an INCOMPLETE registration.
-     * Initial status for registrations when they are first created
-     * Payments are NOT allowed.
-     * Automatically toggled to whatever the default Event registration status is upon completion of the attendee
-     * information reg step NO space reserved. Registration is NOT active
-     */
-    const status_id_incomplete = 'RIC';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate an UNAPPROVED registration.
-     * Payments are NOT allowed.
-     * Event Admin must manually toggle STS_ID for it to change
-     * No space reserved.
-     * Registration is active
-     */
-    const status_id_not_approved = 'RNA';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate registration is PENDING_PAYMENT .
-     * Payments are allowed.
-     * STS_ID will automatically be toggled to RAP if payment is made in full by the attendee
-     * No space reserved.
-     * Registration is active
-     */
-    const status_id_pending_payment = 'RPP';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate registration is on the WAIT_LIST .
-     * Payments are allowed.
-     * STS_ID will automatically be toggled to RAP if payment is made in full by the attendee
-     * No space reserved.
-     * Registration is active
-     */
-    const status_id_wait_list = 'RWL';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate an APPROVED registration.
-     * the TXN may or may not be completed ( paid in full )
-     * Payments are allowed.
-     * A space IS reserved.
-     * Registration is active
-     */
-    const status_id_approved = 'RAP';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate a registration was CANCELLED by the attendee.
-     * Payments are NOT allowed.
-     * NO space reserved.
-     * Registration is NOT active
-     */
-    const status_id_cancelled = 'RCN';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate a registration was DECLINED by the Event Admin
-     * Payments are NOT allowed.
-     * No space reserved.
-     * Registration is NOT active
-     */
-    const status_id_declined = 'RDC';
-
-
-    protected static ?EEM_Registration $_instance       = null;
-
-    protected ?TableAnalysis           $_table_analysis = null;
-
-    /**
-     * Keys are the status IDs for registrations (eg, RAP, RCN, etc), and the values
-     * are status codes (eg, approved, cancelled, etc)
-     *
-     * @var array|null
-     */
-    private static array $_reg_status = [];
-
-
-    /**
-     *    private constructor to prevent direct creation
-     *
-     * @Constructor
-     * @access protected
-     * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any
-     *                         incoming timezone data that gets saved). Note this just sends the timezone info to the
-     *                         date time model field objects.  Default is NULL (and will be assumed using the set
-     *                         timezone in the 'timezone_string' wp option)
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function __construct($timezone = null)
-    {
-        $this->_table_analysis         = EE_Registry::instance()->create('TableAnalysis', [], true);
-        $this->singular_item           = esc_html__('Registration', 'event_espresso');
-        $this->plural_item             = esc_html__('Registrations', 'event_espresso');
-        $this->_tables                 = [
-            'Registration' => new EE_Primary_Table('esp_registration', 'REG_ID'),
-        ];
-        $this->_fields                 = [
-            'Registration' => [
-                'REG_ID'           => new EE_Primary_Key_Int_Field(
-                    'REG_ID',
-                    esc_html__('Registration ID', 'event_espresso')
-                ),
-                'EVT_ID'           => new EE_Foreign_Key_Int_Field(
-                    'EVT_ID',
-                    esc_html__('Event ID', 'event_espresso'),
-                    false,
-                    0,
-                    'Event'
-                ),
-                'ATT_ID'           => new EE_Foreign_Key_Int_Field(
-                    'ATT_ID',
-                    esc_html__('Attendee ID', 'event_espresso'),
-                    false,
-                    0,
-                    'Attendee'
-                ),
-                'TXN_ID'           => new EE_Foreign_Key_Int_Field(
-                    'TXN_ID',
-                    esc_html__('Transaction ID', 'event_espresso'),
-                    false,
-                    0,
-                    'Transaction'
-                ),
-                'TKT_ID'           => new EE_Foreign_Key_Int_Field(
-                    'TKT_ID',
-                    esc_html__('Ticket ID', 'event_espresso'),
-                    false,
-                    0,
-                    'Ticket'
-                ),
-                'STS_ID'           => new EE_Foreign_Key_String_Field(
-                    'STS_ID',
-                    esc_html__('Status ID', 'event_espresso'),
-                    false,
-                    EEM_Registration::status_id_incomplete,
-                    'Status'
-                ),
-                'REG_date'         => new EE_Datetime_Field(
-                    'REG_date',
-                    esc_html__('Time registration occurred', 'event_espresso'),
-                    false,
-                    EE_Datetime_Field::now,
-                    $timezone
-                ),
-                'REG_final_price'  => new EE_Money_Field(
-                    'REG_final_price',
-                    esc_html__('Registration\'s share of the transaction total', 'event_espresso'),
-                    false,
-                    0
-                ),
-                'REG_paid'         => new EE_Money_Field(
-                    'REG_paid',
-                    esc_html__('Amount paid to date towards registration', 'event_espresso'),
-                    false,
-                    0
-                ),
-                'REG_session'      => new EE_Plain_Text_Field(
-                    'REG_session',
-                    esc_html__('Session ID of registration', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'REG_code'         => new EE_Plain_Text_Field(
-                    'REG_code',
-                    esc_html__('Unique Code for this registration', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'REG_url_link'     => new EE_Plain_Text_Field(
-                    'REG_url_link',
-                    esc_html__('String to be used in URL for identifying registration', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'REG_count'        => new EE_Integer_Field(
-                    'REG_count',
-                    esc_html__('Count of this registration in the group registration', 'event_espresso'),
-                    true,
-                    1
-                ),
-                'REG_group_size'   => new EE_Integer_Field(
-                    'REG_group_size',
-                    esc_html__('Number of registrations on this group', 'event_espresso'),
-                    false,
-                    1
-                ),
-                'REG_att_is_going' => new EE_Boolean_Field(
-                    'REG_att_is_going',
-                    esc_html__('Flag indicating the registrant plans on attending', 'event_espresso'),
-                    false,
-                    false
-                ),
-                'REG_deleted'      => new EE_Trashed_Flag_Field(
-                    'REG_deleted',
-                    esc_html__('Flag indicating if registration has been archived or not.', 'event_espresso'),
-                    false,
-                    false
-                ),
-            ],
-        ];
-        $this->_model_relations        = [
-            'Event'                => new EE_Belongs_To_Relation(),
-            'Attendee'             => new EE_Belongs_To_Relation(),
-            'Transaction'          => new EE_Belongs_To_Relation(),
-            'Ticket'               => new EE_Belongs_To_Relation(),
-            'Status'               => new EE_Belongs_To_Relation(),
-            'Answer'               => new EE_Has_Many_Relation(),
-            'Checkin'              => new EE_Has_Many_Relation(),
-            'Registration_Payment' => new EE_Has_Many_Relation(),
-            'Payment'              => new EE_HABTM_Relation('Registration_Payment'),
-            'Message'              => new EE_Has_Many_Any_Relation(false),
-            // allow deletes even if there are messages in the queue related
-        ];
-        $this->_model_chain_to_wp_user = 'Event';
-        parent::__construct($timezone);
-    }
-
-
-    /**
-     * a list of ALL valid registration statuses currently in use within the system
-     * generated by combining the filterable active and inactive reg status arrays
-     *
-     * @return array
-     */
-    public static function reg_statuses(): array
-    {
-        return array_unique(
-            array_merge(
-                EEM_Registration::active_reg_statuses(),
-                EEM_Registration::inactive_reg_statuses()
-            )
-        );
-    }
-
-
-    /**
-     * reg_statuses_that_allow_payment
-     * a filterable list of registration statuses that allow a registrant to make a payment
-     *
-     * @access public
-     * @return array
-     */
-    public static function reg_statuses_that_allow_payment(): array
-    {
-        return (array) apply_filters(
-            'FHEE__EEM_Registration__reg_statuses_that_allow_payment',
-            [
-                EEM_Registration::status_id_approved,
-                EEM_Registration::status_id_pending_payment,
-            ]
-        );
-    }
-
-
-    /**
-     * active_reg_statuses
-     * a filterable list of registration statuses that are considered active
-     *
-     * @access public
-     * @return array
-     */
-    public static function active_reg_statuses(): array
-    {
-        return (array) apply_filters(
-            'FHEE__EEM_Registration__active_reg_statuses',
-            [
-                EEM_Registration::status_id_approved,
-                EEM_Registration::status_id_pending_payment,
-                EEM_Registration::status_id_wait_list,
-                EEM_Registration::status_id_not_approved,
-            ]
-        );
-    }
-
-
-    /**
-     * inactive_reg_statuses
-     * a filterable list of registration statuses that are not considered active
-     *
-     * @access public
-     * @return array
-     */
-    public static function inactive_reg_statuses(): array
-    {
-        return (array) apply_filters(
-            'FHEE__EEM_Registration__inactive_reg_statuses',
-            [
-                EEM_Registration::status_id_incomplete,
-                EEM_Registration::status_id_cancelled,
-                EEM_Registration::status_id_declined,
-            ]
-        );
-    }
-
-
-    /**
-     *    closed_reg_statuses
-     *    a filterable list of registration statuses that are considered "closed"
-     * meaning they should not be considered in any calculations involving monies owing
-     *
-     * @access public
-     * @return array
-     */
-    public static function closed_reg_statuses(): array
-    {
-        return (array) apply_filters(
-            'FHEE__EEM_Registration__closed_reg_statuses',
-            [
-                EEM_Registration::status_id_cancelled,
-                EEM_Registration::status_id_declined,
-                EEM_Registration::status_id_wait_list,
-            ]
-        );
-    }
-
-
-    /**
-     * get list of registration statuses
-     *
-     * @param array $exclude    The status ids to exclude from the returned results
-     * @param bool  $translated If true will return the values as singular localized strings
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function reg_status_array(array $exclude = [], bool $translated = false): array
-    {
-        if (empty(self::$_reg_status)) {
-            EEM_Registration::instance()->_get_registration_status_array($exclude);
-        }
-        return $translated
-            ? EEM_Status::instance()->localized_status(self::$_reg_status, false, 'sentence')
-            : self::$_reg_status;
-    }
-
-
-    /**
-     * get list of registration statuses
-     *
-     * @param array $exclude
-     * @param bool  $recurse
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_registration_status_array(array $exclude = [], bool $recurse = true)
-    {
-        // in the very rare circumstance that we are deleting a model's table's data
-        // and the table hasn't actually been created, this could have an error
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        if ($this->_get_table_analysis()->tableExists($wpdb->prefix . 'esp_status')) {
-            $results           = $wpdb->get_results(
-                "SELECT STS_ID, STS_code FROM {$wpdb->prefix}esp_status WHERE STS_type = 'registration'"
-            );
-            self::$_reg_status = [];
-            foreach ($results as $status) {
-                if (! in_array($status->STS_ID, $exclude, true)) {
-                    self::$_reg_status[ $status->STS_ID ] = $status->STS_code;
-                }
-            }
-        }
-        // in case reg status codes have been deleted from db
-        if ($recurse && empty(self::$_reg_status)) {
-            EEH_Activation::insert_default_status_codes();
-            EEM_Registration::instance()->_get_registration_status_array($exclude, false);
-        }
-    }
-
-
-    /**
-     * Gets the injected table analyzer, or throws an exception
-     *
-     * @return TableAnalysis
-     * @throws EE_Error
-     */
-    protected function _get_table_analysis(): TableAnalysis
-    {
-        if ($this->_table_analysis instanceof TableAnalysis) {
-            return $this->_table_analysis;
-        }
-        throw new EE_Error(
-            sprintf(
-                esc_html__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
-                get_class($this)
-            )
-        );
-    }
-
-
-    /**
-     * This returns a wpdb->results array of all registration date month and years matching the incoming query params
-     * and grouped by month and year.
-     *
-     * @param array $where_params
-     * @return bool|stdClass[]
-     * @throws EE_Error
-     * @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md#0-where-conditions
-     */
-    public function get_reg_months_and_years(array $where_params)
-    {
-        $query_params[0]          = $where_params;
-        $query_params['group_by'] = ['reg_year', 'reg_month'];
-        $query_params['order_by'] = ['REG_date' => 'DESC'];
-        $columns_to_select        = [
-            'reg_year'  => ['YEAR(REG_date)', '%s'],
-            'reg_month' => ['MONTHNAME(REG_date)', '%s'],
-        ];
-        return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select);
-    }
-
-
-    /**
-     * retrieve ALL registrations for a particular Attendee from db
-     *
-     * @param int $ATT_ID
-     * @return EE_Registration[]|bool|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_all_registrations_for_attendee(int $ATT_ID = 0): ?array
-    {
-        if (! $ATT_ID) {
-            return null;
-        }
-        return $this->get_all([['ATT_ID' => $ATT_ID]]);
-    }
-
-
-    /**
-     * Gets a registration given their REG_url_link. Yes, this should usually
-     * be passed via a GET parameter.
-     *
-     * @param string $REG_url_link
-     * @return EE_Registration|null
-     * @throws EE_Error
-     */
-    public function get_registration_for_reg_url_link(string $REG_url_link): ?EE_Registration
-    {
-        if (! $REG_url_link) {
-            return null;
-        }
-        return $this->get_one([['REG_url_link' => $REG_url_link]]);
-    }
-
-
-    /**
-     *        retrieve registration for a specific transaction attendee from db
-     *
-     * @access        public
-     * @param int $TXN_ID
-     * @param int $ATT_ID
-     * @param int $att_nmbr    in case the ATT_ID is the same for multiple registrations (same details used) then the
-     *                         attendee number is required
-     * @return EE_Registration|null array on success, FALSE on fail
-     * @throws EE_Error
-     */
-    public function get_registration_for_transaction_attendee(int $TXN_ID = 0, int $ATT_ID = 0, int $att_nmbr = 0):
-    ?EE_Registration {
-        return $this->get_one([
-            [
-                'TXN_ID' => $TXN_ID,
-                'ATT_ID' => $ATT_ID,
-            ],
-            'limit' => [min($att_nmbr - 1, 0), 1],
-        ]);
-    }
-
-
-    /**
-     *        get the number of registrations per day  for the Registration Admin page Reports Tab.
-     *        (doesn't utilize models because it's a fairly specialized query)
-     *
-     * @access        public
-     * @param $period string which can be passed to php's strtotime function (eg "-1 month")
-     * @return EE_Registration[]|bool|null with properties regDate and total
-     * @throws EE_Error
-     */
-    public function get_registrations_per_day_report(string $period = '-1 month')
-    {
-        $sql_date = $this->convert_datetime_for_query(
-            'REG_date',
-            date('Y-m-d H:i:s', strtotime($period)),
-            'Y-m-d H:i:s',
-            'UTC'
-        );
-        $where    = [
-            'REG_date' => ['>=', $sql_date],
-            'STS_ID'   => ['!=', EEM_Registration::status_id_incomplete],
-        ];
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
-            $where['Event.EVT_wp_user'] = get_current_user_id();
-        }
-        $query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'REG_date');
-        return $this->_get_all_wpdb_results(
-            [
-                $where,
-                'group_by' => 'regDate',
-                'order_by' => ['REG_date' => 'ASC'],
-            ],
-            OBJECT,
-            [
-                'regDate' => ['DATE(' . $query_interval . ')', '%s'],
-                'total'   => ['count(REG_ID)', '%d'],
-            ]
-        );
-    }
-
-
-    /**
-     * Get the number of registrations per day including the count of registrations for each Registration Status.
-     * Note: EEM_Registration::status_id_incomplete registrations are excluded from the results.
-     *
-     * @param string $period
-     * @return stdClass[] with properties Registration_REG_date and a column for each registration status as the STS_ID
-     * @throws EE_Error
-     *                    (i.e. RAP)
-     * @throws EE_Error|ReflectionException
-     */
-    public function get_registrations_per_day_and_per_status_report(string $period = '-1 month'): array
-    {
-        global $wpdb;
-        $registration_table = $wpdb->prefix . 'esp_registration';
-        $event_table        = $wpdb->posts;
-        $sql_date           = date('Y-m-d H:i:s', strtotime($period));
-        // prepare the query interval for displaying offset
-        $query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'dates.REG_date');
-        // inner date query
-        $inner_date_query = "SELECT DISTINCT REG_date from $registration_table ";
-        $inner_where      = ' WHERE';
-        // exclude events not authored by user if permissions in effect
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
-            $inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-            $inner_where      .= ' post_author = ' . get_current_user_id() . ' AND';
-        }
-        $inner_where      .= " REG_date >= '$sql_date'";
-        $inner_date_query .= $inner_where;
-        // start main query
-        $select       = "SELECT DATE($query_interval) as Registration_REG_date, ";
-        $join         = '';
-        $join_parts   = [];
-        $select_parts = [];
-        // loop through registration stati to do parts for each status.
-        foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
-            if ($STS_ID === EEM_Registration::status_id_incomplete) {
-                continue;
-            }
-            $select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
-            $join_parts[]   =
-                "$registration_table AS $STS_code ON $STS_code.REG_date = dates.REG_date AND $STS_code.STS_ID = '$STS_ID'";
-        }
-        // setup the selects
-        $select .= implode(', ', $select_parts);
-        $select .= " FROM ($inner_date_query) AS dates LEFT JOIN ";
-        // setup the joins
-        $join .= implode(' LEFT JOIN ', $join_parts);
-        // now let's put it all together
-        $query = $select . $join . ' GROUP BY Registration_REG_date';
-        // and execute it
-        return $wpdb->get_results($query, ARRAY_A);
-    }
-
-
-    /**
-     *        get the number of registrations per event  for the Registration Admin page Reports Tab
-     *
-     * @access        public
-     * @param $period string which can be passed to php's strtotime function (eg "-1 month")
-     * @return stdClass[] each with properties event_name, reg_limit, and total
-     * @throws EE_Error
-     */
-    public function get_registrations_per_event_report(string $period = '-1 month'): array
-    {
-        $date_sql = $this->convert_datetime_for_query(
-            'REG_date',
-            date('Y-m-d H:i:s', strtotime($period)),
-            'Y-m-d H:i:s',
-            'UTC'
-        );
-        $where    = [
-            'REG_date' => ['>=', $date_sql],
-            'STS_ID'   => ['!=', EEM_Registration::status_id_incomplete],
-        ];
-        if (
-            ! EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_others_registrations',
-                'reg_per_event_report'
-            )
-        ) {
-            $where['Event.EVT_wp_user'] = get_current_user_id();
-        }
-        return $this->_get_all_wpdb_results(
-            [
-                $where,
-                'group_by' => 'Event.EVT_name',
-                'order_by' => 'Event.EVT_name',
-                'limit'    => [0, 24],
-            ],
-            OBJECT,
-            [
-                'event_name' => ['Event_CPT.post_title', '%s'],
-                'total'      => ['COUNT(REG_ID)', '%s'],
-            ]
-        );
-    }
-
-
-    /**
-     * Get the number of registrations per event grouped by registration status.
-     * Note: EEM_Registration::status_id_incomplete registrations are excluded from the results.
-     *
-     * @param string $period
-     * @return stdClass[] with properties `Registration_Event` and a column for each registration status as the STS_ID
-     *                    (i.e. RAP)
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_registrations_per_event_and_per_status_report(string $period = '-1 month'): array
-    {
-        global $wpdb;
-        $registration_table = $wpdb->prefix . 'esp_registration';
-        $event_table        = $wpdb->posts;
-        $sql_date           = date('Y-m-d H:i:s', strtotime($period));
-        // inner date query
-        $inner_date_query = "SELECT DISTINCT EVT_ID, REG_date from $registration_table ";
-        $inner_where      = ' WHERE';
-        // exclude events not authored by user if permissions in effect
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
-            $inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-            $inner_where      .= ' post_author = ' . get_current_user_id() . ' AND';
-        }
-        $inner_where      .= " REG_date >= '$sql_date'";
-        $inner_date_query .= $inner_where;
-        // build main query
-        $select       = 'SELECT Event.post_title as Registration_Event, ';
-        $join         = '';
-        $join_parts   = [];
-        $select_parts = [];
-        // loop through registration stati to do parts for each status.
-        foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
-            if ($STS_ID === EEM_Registration::status_id_incomplete) {
-                continue;
-            }
-            $select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
-            $join_parts[]   =
-                "$registration_table AS $STS_code ON $STS_code.EVT_ID = dates.EVT_ID AND $STS_code.STS_ID = '$STS_ID' AND $STS_code.REG_date = dates.REG_date";
-        }
-        // setup the selects
-        $select .= implode(', ', $select_parts);
-        $select .= " FROM ($inner_date_query) AS dates LEFT JOIN $event_table as Event ON Event.ID = dates.EVT_ID LEFT JOIN ";
-        // setup remaining joins
-        $join .= implode(' LEFT JOIN ', $join_parts);
-        // now put it all together
-        $query = $select . $join . ' GROUP BY Registration_Event';
-        // and execute
-        return $wpdb->get_results($query, ARRAY_A);
-    }
-
-
-    /**
-     * Returns the EE_Registration of the primary attendee on the transaction id provided
-     *
-     * @param int $TXN_ID
-     * @return EE_Registration|null
-     * @throws EE_Error
-     */
-    public function get_primary_registration_for_transaction_ID(int $TXN_ID = 0): ?EE_Registration
-    {
-        if (! $TXN_ID) {
-            return null;
-        }
-        return $this->get_one([
-            [
-                'TXN_ID'    => $TXN_ID,
-                'REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT,
-            ],
-        ]);
-    }
-
-
-    /**
-     *        get_event_registration_count
-     *
-     * @access public
-     * @param int     $EVT_ID
-     * @param boolean $for_incomplete_payments
-     * @return int
-     * @throws EE_Error
-     */
-    public function get_event_registration_count(int $EVT_ID, bool $for_incomplete_payments = false): int
-    {
-        // we only count approved registrations towards registration limits
-        $query_params = [['EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved]];
-        if ($for_incomplete_payments) {
-            $query_params[0]['Transaction.STS_ID'] = ['!=', EEM_Transaction::complete_status_code];
-        }
-        return $this->count($query_params);
-    }
-
-
-    /**
-     * Deletes all registrations with no transactions. Note that this needs to be very efficient
-     * and so it uses wpdb directly. Also, we can't put a limit on this because MySQL doesn't allow a limit on a delete
-     * when joining tables like this.
-     *
-     * @return int|bool number deleted
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @global WPDB $wpdb
-     */
-    public function delete_registrations_with_no_transaction()
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        return $wpdb->query(
-            'DELETE r FROM '
-            . $this->table()
-            . ' r LEFT JOIN '
-            . EEM_Transaction::instance()->table()
-            . ' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL'
-        );
-    }
-
-
-    /**
-     *  Count registrations checked into (or out of) a datetime
-     *
-     * @param int  $DTT_ID     datetime ID
-     * @param bool $checked_in whether to count registrations checked IN or OUT
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @throws ReflectionException
-     */
-    public function count_registrations_checked_into_datetime(int $DTT_ID, bool $checked_in = true): int
-    {
-        global $wpdb;
-        // subquery to get latest checkin
-        $query = $wpdb->prepare(
-            'SELECT '
-            . 'COUNT( DISTINCT checkins.REG_ID ) '
-            . 'FROM ' . EEM_Checkin::instance()->table() . ' AS checkins INNER JOIN'
-            . '( SELECT '
-            . 'max( CHK_timestamp ) AS latest_checkin, '
-            . 'REG_ID AS REG_ID '
-            . 'FROM ' . EEM_Checkin::instance()->table() . ' '
-            . 'WHERE DTT_ID=%d '
-            . 'GROUP BY REG_ID'
-            . ') AS most_recent_checkin_per_reg '
-            . 'ON checkins.REG_ID=most_recent_checkin_per_reg.REG_ID '
-            . 'AND checkins.CHK_timestamp = most_recent_checkin_per_reg.latest_checkin '
-            . 'WHERE '
-            . 'checkins.CHK_in=%d',
-            $DTT_ID,
-            $checked_in
-        );
-        return (int) $wpdb->get_var($query);
-    }
-
-
-    /**
-     *  Count registrations checked into (or out of) an event.
-     *
-     * @param int  $EVT_ID     event ID
-     * @param bool $checked_in whether to count registrations checked IN or OUT
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @throws ReflectionException
-     * @throws ReflectionException
-     */
-    public function count_registrations_checked_into_event(int $EVT_ID, bool $checked_in = true): int
-    {
-        global $wpdb;
-        // subquery to get latest checkin
-        $query = $wpdb->prepare(
-            'SELECT '
-            . 'COUNT( DISTINCT checkins.REG_ID ) '
-            . 'FROM ' . EEM_Checkin::instance()->table() . ' AS checkins INNER JOIN'
-            . '( SELECT '
-            . 'max( CHK_timestamp ) AS latest_checkin, '
-            . 'REG_ID AS REG_ID '
-            . 'FROM ' . EEM_Checkin::instance()->table() . ' AS c '
-            . 'INNER JOIN ' . EEM_Datetime::instance()->table() . ' AS d '
-            . 'ON c.DTT_ID=d.DTT_ID '
-            . 'WHERE d.EVT_ID=%d '
-            . 'GROUP BY REG_ID'
-            . ') AS most_recent_checkin_per_reg '
-            . 'ON checkins.REG_ID=most_recent_checkin_per_reg.REG_ID '
-            . 'AND checkins.CHK_timestamp = most_recent_checkin_per_reg.latest_checkin '
-            . 'WHERE '
-            . 'checkins.CHK_in=%d',
-            $EVT_ID,
-            $checked_in
-        );
-        return (int) $wpdb->get_var($query);
-    }
-
-
-    /**
-     * The purpose of this method is to retrieve an array of
-     * EE_Registration objects that represent the latest registration
-     * for each ATT_ID given in the function argument.
-     *
-     * @param array $attendee_ids
-     * @return EE_Registration[]|bool|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_latest_registration_for_each_of_given_contacts(array $attendee_ids = [])
-    {
-        // first do a native wp_query to get the latest REG_ID's matching these attendees.
-        global $wpdb;
-        $registration_table = $wpdb->prefix . 'esp_registration';
-        $attendee_table     = $wpdb->posts;
-        $attendee_ids       = is_array($attendee_ids)
-            ? array_map('absint', $attendee_ids)
-            : [(int) $attendee_ids];
-        $ATT_IDs            = implode(',', $attendee_ids);
-        // first we do a query to get the registration ids
-        // (because a group by before order by causes the order by to be ignored.)
-        $registration_id_query = "
+	/**
+	 * The value of REG_count for a primary registrant
+	 */
+	const PRIMARY_REGISTRANT_COUNT = 1;
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate an INCOMPLETE registration.
+	 * Initial status for registrations when they are first created
+	 * Payments are NOT allowed.
+	 * Automatically toggled to whatever the default Event registration status is upon completion of the attendee
+	 * information reg step NO space reserved. Registration is NOT active
+	 */
+	const status_id_incomplete = 'RIC';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate an UNAPPROVED registration.
+	 * Payments are NOT allowed.
+	 * Event Admin must manually toggle STS_ID for it to change
+	 * No space reserved.
+	 * Registration is active
+	 */
+	const status_id_not_approved = 'RNA';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate registration is PENDING_PAYMENT .
+	 * Payments are allowed.
+	 * STS_ID will automatically be toggled to RAP if payment is made in full by the attendee
+	 * No space reserved.
+	 * Registration is active
+	 */
+	const status_id_pending_payment = 'RPP';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate registration is on the WAIT_LIST .
+	 * Payments are allowed.
+	 * STS_ID will automatically be toggled to RAP if payment is made in full by the attendee
+	 * No space reserved.
+	 * Registration is active
+	 */
+	const status_id_wait_list = 'RWL';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate an APPROVED registration.
+	 * the TXN may or may not be completed ( paid in full )
+	 * Payments are allowed.
+	 * A space IS reserved.
+	 * Registration is active
+	 */
+	const status_id_approved = 'RAP';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate a registration was CANCELLED by the attendee.
+	 * Payments are NOT allowed.
+	 * NO space reserved.
+	 * Registration is NOT active
+	 */
+	const status_id_cancelled = 'RCN';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate a registration was DECLINED by the Event Admin
+	 * Payments are NOT allowed.
+	 * No space reserved.
+	 * Registration is NOT active
+	 */
+	const status_id_declined = 'RDC';
+
+
+	protected static ?EEM_Registration $_instance       = null;
+
+	protected ?TableAnalysis           $_table_analysis = null;
+
+	/**
+	 * Keys are the status IDs for registrations (eg, RAP, RCN, etc), and the values
+	 * are status codes (eg, approved, cancelled, etc)
+	 *
+	 * @var array|null
+	 */
+	private static array $_reg_status = [];
+
+
+	/**
+	 *    private constructor to prevent direct creation
+	 *
+	 * @Constructor
+	 * @access protected
+	 * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any
+	 *                         incoming timezone data that gets saved). Note this just sends the timezone info to the
+	 *                         date time model field objects.  Default is NULL (and will be assumed using the set
+	 *                         timezone in the 'timezone_string' wp option)
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function __construct($timezone = null)
+	{
+		$this->_table_analysis         = EE_Registry::instance()->create('TableAnalysis', [], true);
+		$this->singular_item           = esc_html__('Registration', 'event_espresso');
+		$this->plural_item             = esc_html__('Registrations', 'event_espresso');
+		$this->_tables                 = [
+			'Registration' => new EE_Primary_Table('esp_registration', 'REG_ID'),
+		];
+		$this->_fields                 = [
+			'Registration' => [
+				'REG_ID'           => new EE_Primary_Key_Int_Field(
+					'REG_ID',
+					esc_html__('Registration ID', 'event_espresso')
+				),
+				'EVT_ID'           => new EE_Foreign_Key_Int_Field(
+					'EVT_ID',
+					esc_html__('Event ID', 'event_espresso'),
+					false,
+					0,
+					'Event'
+				),
+				'ATT_ID'           => new EE_Foreign_Key_Int_Field(
+					'ATT_ID',
+					esc_html__('Attendee ID', 'event_espresso'),
+					false,
+					0,
+					'Attendee'
+				),
+				'TXN_ID'           => new EE_Foreign_Key_Int_Field(
+					'TXN_ID',
+					esc_html__('Transaction ID', 'event_espresso'),
+					false,
+					0,
+					'Transaction'
+				),
+				'TKT_ID'           => new EE_Foreign_Key_Int_Field(
+					'TKT_ID',
+					esc_html__('Ticket ID', 'event_espresso'),
+					false,
+					0,
+					'Ticket'
+				),
+				'STS_ID'           => new EE_Foreign_Key_String_Field(
+					'STS_ID',
+					esc_html__('Status ID', 'event_espresso'),
+					false,
+					EEM_Registration::status_id_incomplete,
+					'Status'
+				),
+				'REG_date'         => new EE_Datetime_Field(
+					'REG_date',
+					esc_html__('Time registration occurred', 'event_espresso'),
+					false,
+					EE_Datetime_Field::now,
+					$timezone
+				),
+				'REG_final_price'  => new EE_Money_Field(
+					'REG_final_price',
+					esc_html__('Registration\'s share of the transaction total', 'event_espresso'),
+					false,
+					0
+				),
+				'REG_paid'         => new EE_Money_Field(
+					'REG_paid',
+					esc_html__('Amount paid to date towards registration', 'event_espresso'),
+					false,
+					0
+				),
+				'REG_session'      => new EE_Plain_Text_Field(
+					'REG_session',
+					esc_html__('Session ID of registration', 'event_espresso'),
+					false,
+					''
+				),
+				'REG_code'         => new EE_Plain_Text_Field(
+					'REG_code',
+					esc_html__('Unique Code for this registration', 'event_espresso'),
+					false,
+					''
+				),
+				'REG_url_link'     => new EE_Plain_Text_Field(
+					'REG_url_link',
+					esc_html__('String to be used in URL for identifying registration', 'event_espresso'),
+					false,
+					''
+				),
+				'REG_count'        => new EE_Integer_Field(
+					'REG_count',
+					esc_html__('Count of this registration in the group registration', 'event_espresso'),
+					true,
+					1
+				),
+				'REG_group_size'   => new EE_Integer_Field(
+					'REG_group_size',
+					esc_html__('Number of registrations on this group', 'event_espresso'),
+					false,
+					1
+				),
+				'REG_att_is_going' => new EE_Boolean_Field(
+					'REG_att_is_going',
+					esc_html__('Flag indicating the registrant plans on attending', 'event_espresso'),
+					false,
+					false
+				),
+				'REG_deleted'      => new EE_Trashed_Flag_Field(
+					'REG_deleted',
+					esc_html__('Flag indicating if registration has been archived or not.', 'event_espresso'),
+					false,
+					false
+				),
+			],
+		];
+		$this->_model_relations        = [
+			'Event'                => new EE_Belongs_To_Relation(),
+			'Attendee'             => new EE_Belongs_To_Relation(),
+			'Transaction'          => new EE_Belongs_To_Relation(),
+			'Ticket'               => new EE_Belongs_To_Relation(),
+			'Status'               => new EE_Belongs_To_Relation(),
+			'Answer'               => new EE_Has_Many_Relation(),
+			'Checkin'              => new EE_Has_Many_Relation(),
+			'Registration_Payment' => new EE_Has_Many_Relation(),
+			'Payment'              => new EE_HABTM_Relation('Registration_Payment'),
+			'Message'              => new EE_Has_Many_Any_Relation(false),
+			// allow deletes even if there are messages in the queue related
+		];
+		$this->_model_chain_to_wp_user = 'Event';
+		parent::__construct($timezone);
+	}
+
+
+	/**
+	 * a list of ALL valid registration statuses currently in use within the system
+	 * generated by combining the filterable active and inactive reg status arrays
+	 *
+	 * @return array
+	 */
+	public static function reg_statuses(): array
+	{
+		return array_unique(
+			array_merge(
+				EEM_Registration::active_reg_statuses(),
+				EEM_Registration::inactive_reg_statuses()
+			)
+		);
+	}
+
+
+	/**
+	 * reg_statuses_that_allow_payment
+	 * a filterable list of registration statuses that allow a registrant to make a payment
+	 *
+	 * @access public
+	 * @return array
+	 */
+	public static function reg_statuses_that_allow_payment(): array
+	{
+		return (array) apply_filters(
+			'FHEE__EEM_Registration__reg_statuses_that_allow_payment',
+			[
+				EEM_Registration::status_id_approved,
+				EEM_Registration::status_id_pending_payment,
+			]
+		);
+	}
+
+
+	/**
+	 * active_reg_statuses
+	 * a filterable list of registration statuses that are considered active
+	 *
+	 * @access public
+	 * @return array
+	 */
+	public static function active_reg_statuses(): array
+	{
+		return (array) apply_filters(
+			'FHEE__EEM_Registration__active_reg_statuses',
+			[
+				EEM_Registration::status_id_approved,
+				EEM_Registration::status_id_pending_payment,
+				EEM_Registration::status_id_wait_list,
+				EEM_Registration::status_id_not_approved,
+			]
+		);
+	}
+
+
+	/**
+	 * inactive_reg_statuses
+	 * a filterable list of registration statuses that are not considered active
+	 *
+	 * @access public
+	 * @return array
+	 */
+	public static function inactive_reg_statuses(): array
+	{
+		return (array) apply_filters(
+			'FHEE__EEM_Registration__inactive_reg_statuses',
+			[
+				EEM_Registration::status_id_incomplete,
+				EEM_Registration::status_id_cancelled,
+				EEM_Registration::status_id_declined,
+			]
+		);
+	}
+
+
+	/**
+	 *    closed_reg_statuses
+	 *    a filterable list of registration statuses that are considered "closed"
+	 * meaning they should not be considered in any calculations involving monies owing
+	 *
+	 * @access public
+	 * @return array
+	 */
+	public static function closed_reg_statuses(): array
+	{
+		return (array) apply_filters(
+			'FHEE__EEM_Registration__closed_reg_statuses',
+			[
+				EEM_Registration::status_id_cancelled,
+				EEM_Registration::status_id_declined,
+				EEM_Registration::status_id_wait_list,
+			]
+		);
+	}
+
+
+	/**
+	 * get list of registration statuses
+	 *
+	 * @param array $exclude    The status ids to exclude from the returned results
+	 * @param bool  $translated If true will return the values as singular localized strings
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function reg_status_array(array $exclude = [], bool $translated = false): array
+	{
+		if (empty(self::$_reg_status)) {
+			EEM_Registration::instance()->_get_registration_status_array($exclude);
+		}
+		return $translated
+			? EEM_Status::instance()->localized_status(self::$_reg_status, false, 'sentence')
+			: self::$_reg_status;
+	}
+
+
+	/**
+	 * get list of registration statuses
+	 *
+	 * @param array $exclude
+	 * @param bool  $recurse
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_registration_status_array(array $exclude = [], bool $recurse = true)
+	{
+		// in the very rare circumstance that we are deleting a model's table's data
+		// and the table hasn't actually been created, this could have an error
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		if ($this->_get_table_analysis()->tableExists($wpdb->prefix . 'esp_status')) {
+			$results           = $wpdb->get_results(
+				"SELECT STS_ID, STS_code FROM {$wpdb->prefix}esp_status WHERE STS_type = 'registration'"
+			);
+			self::$_reg_status = [];
+			foreach ($results as $status) {
+				if (! in_array($status->STS_ID, $exclude, true)) {
+					self::$_reg_status[ $status->STS_ID ] = $status->STS_code;
+				}
+			}
+		}
+		// in case reg status codes have been deleted from db
+		if ($recurse && empty(self::$_reg_status)) {
+			EEH_Activation::insert_default_status_codes();
+			EEM_Registration::instance()->_get_registration_status_array($exclude, false);
+		}
+	}
+
+
+	/**
+	 * Gets the injected table analyzer, or throws an exception
+	 *
+	 * @return TableAnalysis
+	 * @throws EE_Error
+	 */
+	protected function _get_table_analysis(): TableAnalysis
+	{
+		if ($this->_table_analysis instanceof TableAnalysis) {
+			return $this->_table_analysis;
+		}
+		throw new EE_Error(
+			sprintf(
+				esc_html__('Table analysis class on class %1$s is not set properly.', 'event_espresso'),
+				get_class($this)
+			)
+		);
+	}
+
+
+	/**
+	 * This returns a wpdb->results array of all registration date month and years matching the incoming query params
+	 * and grouped by month and year.
+	 *
+	 * @param array $where_params
+	 * @return bool|stdClass[]
+	 * @throws EE_Error
+	 * @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md#0-where-conditions
+	 */
+	public function get_reg_months_and_years(array $where_params)
+	{
+		$query_params[0]          = $where_params;
+		$query_params['group_by'] = ['reg_year', 'reg_month'];
+		$query_params['order_by'] = ['REG_date' => 'DESC'];
+		$columns_to_select        = [
+			'reg_year'  => ['YEAR(REG_date)', '%s'],
+			'reg_month' => ['MONTHNAME(REG_date)', '%s'],
+		];
+		return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select);
+	}
+
+
+	/**
+	 * retrieve ALL registrations for a particular Attendee from db
+	 *
+	 * @param int $ATT_ID
+	 * @return EE_Registration[]|bool|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_all_registrations_for_attendee(int $ATT_ID = 0): ?array
+	{
+		if (! $ATT_ID) {
+			return null;
+		}
+		return $this->get_all([['ATT_ID' => $ATT_ID]]);
+	}
+
+
+	/**
+	 * Gets a registration given their REG_url_link. Yes, this should usually
+	 * be passed via a GET parameter.
+	 *
+	 * @param string $REG_url_link
+	 * @return EE_Registration|null
+	 * @throws EE_Error
+	 */
+	public function get_registration_for_reg_url_link(string $REG_url_link): ?EE_Registration
+	{
+		if (! $REG_url_link) {
+			return null;
+		}
+		return $this->get_one([['REG_url_link' => $REG_url_link]]);
+	}
+
+
+	/**
+	 *        retrieve registration for a specific transaction attendee from db
+	 *
+	 * @access        public
+	 * @param int $TXN_ID
+	 * @param int $ATT_ID
+	 * @param int $att_nmbr    in case the ATT_ID is the same for multiple registrations (same details used) then the
+	 *                         attendee number is required
+	 * @return EE_Registration|null array on success, FALSE on fail
+	 * @throws EE_Error
+	 */
+	public function get_registration_for_transaction_attendee(int $TXN_ID = 0, int $ATT_ID = 0, int $att_nmbr = 0):
+	?EE_Registration {
+		return $this->get_one([
+			[
+				'TXN_ID' => $TXN_ID,
+				'ATT_ID' => $ATT_ID,
+			],
+			'limit' => [min($att_nmbr - 1, 0), 1],
+		]);
+	}
+
+
+	/**
+	 *        get the number of registrations per day  for the Registration Admin page Reports Tab.
+	 *        (doesn't utilize models because it's a fairly specialized query)
+	 *
+	 * @access        public
+	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
+	 * @return EE_Registration[]|bool|null with properties regDate and total
+	 * @throws EE_Error
+	 */
+	public function get_registrations_per_day_report(string $period = '-1 month')
+	{
+		$sql_date = $this->convert_datetime_for_query(
+			'REG_date',
+			date('Y-m-d H:i:s', strtotime($period)),
+			'Y-m-d H:i:s',
+			'UTC'
+		);
+		$where    = [
+			'REG_date' => ['>=', $sql_date],
+			'STS_ID'   => ['!=', EEM_Registration::status_id_incomplete],
+		];
+		if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
+			$where['Event.EVT_wp_user'] = get_current_user_id();
+		}
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'REG_date');
+		return $this->_get_all_wpdb_results(
+			[
+				$where,
+				'group_by' => 'regDate',
+				'order_by' => ['REG_date' => 'ASC'],
+			],
+			OBJECT,
+			[
+				'regDate' => ['DATE(' . $query_interval . ')', '%s'],
+				'total'   => ['count(REG_ID)', '%d'],
+			]
+		);
+	}
+
+
+	/**
+	 * Get the number of registrations per day including the count of registrations for each Registration Status.
+	 * Note: EEM_Registration::status_id_incomplete registrations are excluded from the results.
+	 *
+	 * @param string $period
+	 * @return stdClass[] with properties Registration_REG_date and a column for each registration status as the STS_ID
+	 * @throws EE_Error
+	 *                    (i.e. RAP)
+	 * @throws EE_Error|ReflectionException
+	 */
+	public function get_registrations_per_day_and_per_status_report(string $period = '-1 month'): array
+	{
+		global $wpdb;
+		$registration_table = $wpdb->prefix . 'esp_registration';
+		$event_table        = $wpdb->posts;
+		$sql_date           = date('Y-m-d H:i:s', strtotime($period));
+		// prepare the query interval for displaying offset
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'dates.REG_date');
+		// inner date query
+		$inner_date_query = "SELECT DISTINCT REG_date from $registration_table ";
+		$inner_where      = ' WHERE';
+		// exclude events not authored by user if permissions in effect
+		if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
+			$inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
+			$inner_where      .= ' post_author = ' . get_current_user_id() . ' AND';
+		}
+		$inner_where      .= " REG_date >= '$sql_date'";
+		$inner_date_query .= $inner_where;
+		// start main query
+		$select       = "SELECT DATE($query_interval) as Registration_REG_date, ";
+		$join         = '';
+		$join_parts   = [];
+		$select_parts = [];
+		// loop through registration stati to do parts for each status.
+		foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
+			if ($STS_ID === EEM_Registration::status_id_incomplete) {
+				continue;
+			}
+			$select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
+			$join_parts[]   =
+				"$registration_table AS $STS_code ON $STS_code.REG_date = dates.REG_date AND $STS_code.STS_ID = '$STS_ID'";
+		}
+		// setup the selects
+		$select .= implode(', ', $select_parts);
+		$select .= " FROM ($inner_date_query) AS dates LEFT JOIN ";
+		// setup the joins
+		$join .= implode(' LEFT JOIN ', $join_parts);
+		// now let's put it all together
+		$query = $select . $join . ' GROUP BY Registration_REG_date';
+		// and execute it
+		return $wpdb->get_results($query, ARRAY_A);
+	}
+
+
+	/**
+	 *        get the number of registrations per event  for the Registration Admin page Reports Tab
+	 *
+	 * @access        public
+	 * @param $period string which can be passed to php's strtotime function (eg "-1 month")
+	 * @return stdClass[] each with properties event_name, reg_limit, and total
+	 * @throws EE_Error
+	 */
+	public function get_registrations_per_event_report(string $period = '-1 month'): array
+	{
+		$date_sql = $this->convert_datetime_for_query(
+			'REG_date',
+			date('Y-m-d H:i:s', strtotime($period)),
+			'Y-m-d H:i:s',
+			'UTC'
+		);
+		$where    = [
+			'REG_date' => ['>=', $date_sql],
+			'STS_ID'   => ['!=', EEM_Registration::status_id_incomplete],
+		];
+		if (
+			! EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_others_registrations',
+				'reg_per_event_report'
+			)
+		) {
+			$where['Event.EVT_wp_user'] = get_current_user_id();
+		}
+		return $this->_get_all_wpdb_results(
+			[
+				$where,
+				'group_by' => 'Event.EVT_name',
+				'order_by' => 'Event.EVT_name',
+				'limit'    => [0, 24],
+			],
+			OBJECT,
+			[
+				'event_name' => ['Event_CPT.post_title', '%s'],
+				'total'      => ['COUNT(REG_ID)', '%s'],
+			]
+		);
+	}
+
+
+	/**
+	 * Get the number of registrations per event grouped by registration status.
+	 * Note: EEM_Registration::status_id_incomplete registrations are excluded from the results.
+	 *
+	 * @param string $period
+	 * @return stdClass[] with properties `Registration_Event` and a column for each registration status as the STS_ID
+	 *                    (i.e. RAP)
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_registrations_per_event_and_per_status_report(string $period = '-1 month'): array
+	{
+		global $wpdb;
+		$registration_table = $wpdb->prefix . 'esp_registration';
+		$event_table        = $wpdb->posts;
+		$sql_date           = date('Y-m-d H:i:s', strtotime($period));
+		// inner date query
+		$inner_date_query = "SELECT DISTINCT EVT_ID, REG_date from $registration_table ";
+		$inner_where      = ' WHERE';
+		// exclude events not authored by user if permissions in effect
+		if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
+			$inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
+			$inner_where      .= ' post_author = ' . get_current_user_id() . ' AND';
+		}
+		$inner_where      .= " REG_date >= '$sql_date'";
+		$inner_date_query .= $inner_where;
+		// build main query
+		$select       = 'SELECT Event.post_title as Registration_Event, ';
+		$join         = '';
+		$join_parts   = [];
+		$select_parts = [];
+		// loop through registration stati to do parts for each status.
+		foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) {
+			if ($STS_ID === EEM_Registration::status_id_incomplete) {
+				continue;
+			}
+			$select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID";
+			$join_parts[]   =
+				"$registration_table AS $STS_code ON $STS_code.EVT_ID = dates.EVT_ID AND $STS_code.STS_ID = '$STS_ID' AND $STS_code.REG_date = dates.REG_date";
+		}
+		// setup the selects
+		$select .= implode(', ', $select_parts);
+		$select .= " FROM ($inner_date_query) AS dates LEFT JOIN $event_table as Event ON Event.ID = dates.EVT_ID LEFT JOIN ";
+		// setup remaining joins
+		$join .= implode(' LEFT JOIN ', $join_parts);
+		// now put it all together
+		$query = $select . $join . ' GROUP BY Registration_Event';
+		// and execute
+		return $wpdb->get_results($query, ARRAY_A);
+	}
+
+
+	/**
+	 * Returns the EE_Registration of the primary attendee on the transaction id provided
+	 *
+	 * @param int $TXN_ID
+	 * @return EE_Registration|null
+	 * @throws EE_Error
+	 */
+	public function get_primary_registration_for_transaction_ID(int $TXN_ID = 0): ?EE_Registration
+	{
+		if (! $TXN_ID) {
+			return null;
+		}
+		return $this->get_one([
+			[
+				'TXN_ID'    => $TXN_ID,
+				'REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT,
+			],
+		]);
+	}
+
+
+	/**
+	 *        get_event_registration_count
+	 *
+	 * @access public
+	 * @param int     $EVT_ID
+	 * @param boolean $for_incomplete_payments
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function get_event_registration_count(int $EVT_ID, bool $for_incomplete_payments = false): int
+	{
+		// we only count approved registrations towards registration limits
+		$query_params = [['EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved]];
+		if ($for_incomplete_payments) {
+			$query_params[0]['Transaction.STS_ID'] = ['!=', EEM_Transaction::complete_status_code];
+		}
+		return $this->count($query_params);
+	}
+
+
+	/**
+	 * Deletes all registrations with no transactions. Note that this needs to be very efficient
+	 * and so it uses wpdb directly. Also, we can't put a limit on this because MySQL doesn't allow a limit on a delete
+	 * when joining tables like this.
+	 *
+	 * @return int|bool number deleted
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @global WPDB $wpdb
+	 */
+	public function delete_registrations_with_no_transaction()
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		return $wpdb->query(
+			'DELETE r FROM '
+			. $this->table()
+			. ' r LEFT JOIN '
+			. EEM_Transaction::instance()->table()
+			. ' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL'
+		);
+	}
+
+
+	/**
+	 *  Count registrations checked into (or out of) a datetime
+	 *
+	 * @param int  $DTT_ID     datetime ID
+	 * @param bool $checked_in whether to count registrations checked IN or OUT
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @throws ReflectionException
+	 */
+	public function count_registrations_checked_into_datetime(int $DTT_ID, bool $checked_in = true): int
+	{
+		global $wpdb;
+		// subquery to get latest checkin
+		$query = $wpdb->prepare(
+			'SELECT '
+			. 'COUNT( DISTINCT checkins.REG_ID ) '
+			. 'FROM ' . EEM_Checkin::instance()->table() . ' AS checkins INNER JOIN'
+			. '( SELECT '
+			. 'max( CHK_timestamp ) AS latest_checkin, '
+			. 'REG_ID AS REG_ID '
+			. 'FROM ' . EEM_Checkin::instance()->table() . ' '
+			. 'WHERE DTT_ID=%d '
+			. 'GROUP BY REG_ID'
+			. ') AS most_recent_checkin_per_reg '
+			. 'ON checkins.REG_ID=most_recent_checkin_per_reg.REG_ID '
+			. 'AND checkins.CHK_timestamp = most_recent_checkin_per_reg.latest_checkin '
+			. 'WHERE '
+			. 'checkins.CHK_in=%d',
+			$DTT_ID,
+			$checked_in
+		);
+		return (int) $wpdb->get_var($query);
+	}
+
+
+	/**
+	 *  Count registrations checked into (or out of) an event.
+	 *
+	 * @param int  $EVT_ID     event ID
+	 * @param bool $checked_in whether to count registrations checked IN or OUT
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @throws ReflectionException
+	 * @throws ReflectionException
+	 */
+	public function count_registrations_checked_into_event(int $EVT_ID, bool $checked_in = true): int
+	{
+		global $wpdb;
+		// subquery to get latest checkin
+		$query = $wpdb->prepare(
+			'SELECT '
+			. 'COUNT( DISTINCT checkins.REG_ID ) '
+			. 'FROM ' . EEM_Checkin::instance()->table() . ' AS checkins INNER JOIN'
+			. '( SELECT '
+			. 'max( CHK_timestamp ) AS latest_checkin, '
+			. 'REG_ID AS REG_ID '
+			. 'FROM ' . EEM_Checkin::instance()->table() . ' AS c '
+			. 'INNER JOIN ' . EEM_Datetime::instance()->table() . ' AS d '
+			. 'ON c.DTT_ID=d.DTT_ID '
+			. 'WHERE d.EVT_ID=%d '
+			. 'GROUP BY REG_ID'
+			. ') AS most_recent_checkin_per_reg '
+			. 'ON checkins.REG_ID=most_recent_checkin_per_reg.REG_ID '
+			. 'AND checkins.CHK_timestamp = most_recent_checkin_per_reg.latest_checkin '
+			. 'WHERE '
+			. 'checkins.CHK_in=%d',
+			$EVT_ID,
+			$checked_in
+		);
+		return (int) $wpdb->get_var($query);
+	}
+
+
+	/**
+	 * The purpose of this method is to retrieve an array of
+	 * EE_Registration objects that represent the latest registration
+	 * for each ATT_ID given in the function argument.
+	 *
+	 * @param array $attendee_ids
+	 * @return EE_Registration[]|bool|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_latest_registration_for_each_of_given_contacts(array $attendee_ids = [])
+	{
+		// first do a native wp_query to get the latest REG_ID's matching these attendees.
+		global $wpdb;
+		$registration_table = $wpdb->prefix . 'esp_registration';
+		$attendee_table     = $wpdb->posts;
+		$attendee_ids       = is_array($attendee_ids)
+			? array_map('absint', $attendee_ids)
+			: [(int) $attendee_ids];
+		$ATT_IDs            = implode(',', $attendee_ids);
+		// first we do a query to get the registration ids
+		// (because a group by before order by causes the order by to be ignored.)
+		$registration_id_query = "
 			SELECT registrations.registration_ids as registration_id
 			FROM (
 				SELECT
@@ -853,61 +853,61 @@ 
 			  ) AS registrations
 			  GROUP BY registrations.attendee_ids
 		";
-        $registration_ids      = $wpdb->get_results($registration_id_query, ARRAY_A);
-        if (empty($registration_ids)) {
-            return [];
-        }
-        $ids_for_model_query = [];
-        // let's flatten the ids so they can be used in the model query.
-        foreach ($registration_ids as $registration_id) {
-            if (isset($registration_id['registration_id'])) {
-                $ids_for_model_query[] = $registration_id['registration_id'];
-            }
-        }
-        // construct query
-        $_where = [
-            'REG_ID' => ['IN', $ids_for_model_query],
-        ];
-        return $this->get_all([$_where]);
-    }
-
-
-    /**
-     * returns a count of registrations for the supplied event having the status as specified
-     *
-     * @param int   $EVT_ID
-     * @param array|string $statuses
-     * @return int
-     * @throws InvalidArgumentException
-     * @throws InvalidStatusException
-     * @throws EE_Error
-     */
-    public function event_reg_count_for_statuses(int $EVT_ID, $statuses = []): int
-    {
-        $EVT_ID = absint($EVT_ID);
-        if (! $EVT_ID) {
-            throw new InvalidArgumentException(
-                esc_html__('An invalid Event ID was supplied.', 'event_espresso')
-            );
-        }
-        $statuses = is_array($statuses) ? $statuses : [$statuses];
-        $statuses = ! empty($statuses) ? $statuses : [EEM_Registration::status_id_approved];
-
-        $valid_reg_statuses = EEM_Registration::reg_statuses();
-        foreach ($statuses as $status) {
-            if (! in_array($status, $valid_reg_statuses, true)) {
-                throw new InvalidStatusException($status, esc_html__('Registration', 'event_espresso'));
-            }
-        }
-        return $this->count(
-            [
-                [
-                    'EVT_ID' => $EVT_ID,
-                    'STS_ID' => ['IN', $statuses],
-                ],
-            ],
-            'REG_ID',
-            true
-        );
-    }
+		$registration_ids      = $wpdb->get_results($registration_id_query, ARRAY_A);
+		if (empty($registration_ids)) {
+			return [];
+		}
+		$ids_for_model_query = [];
+		// let's flatten the ids so they can be used in the model query.
+		foreach ($registration_ids as $registration_id) {
+			if (isset($registration_id['registration_id'])) {
+				$ids_for_model_query[] = $registration_id['registration_id'];
+			}
+		}
+		// construct query
+		$_where = [
+			'REG_ID' => ['IN', $ids_for_model_query],
+		];
+		return $this->get_all([$_where]);
+	}
+
+
+	/**
+	 * returns a count of registrations for the supplied event having the status as specified
+	 *
+	 * @param int   $EVT_ID
+	 * @param array|string $statuses
+	 * @return int
+	 * @throws InvalidArgumentException
+	 * @throws InvalidStatusException
+	 * @throws EE_Error
+	 */
+	public function event_reg_count_for_statuses(int $EVT_ID, $statuses = []): int
+	{
+		$EVT_ID = absint($EVT_ID);
+		if (! $EVT_ID) {
+			throw new InvalidArgumentException(
+				esc_html__('An invalid Event ID was supplied.', 'event_espresso')
+			);
+		}
+		$statuses = is_array($statuses) ? $statuses : [$statuses];
+		$statuses = ! empty($statuses) ? $statuses : [EEM_Registration::status_id_approved];
+
+		$valid_reg_statuses = EEM_Registration::reg_statuses();
+		foreach ($statuses as $status) {
+			if (! in_array($status, $valid_reg_statuses, true)) {
+				throw new InvalidStatusException($status, esc_html__('Registration', 'event_espresso'));
+			}
+		}
+		return $this->count(
+			[
+				[
+					'EVT_ID' => $EVT_ID,
+					'STS_ID' => ['IN', $statuses],
+				],
+			],
+			'REG_ID',
+			true
+		);
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -218,7 +218,7 @@ 
                 ),
             ],
         ];
-        $this->_model_relations        = [
+        $this->_model_relations = [
             'Event'                => new EE_Belongs_To_Relation(),
             'Attendee'             => new EE_Belongs_To_Relation(),
             'Transaction'          => new EE_Belongs_To_Relation(),
@@ -369,14 +369,14 @@ 
         // and the table hasn't actually been created, this could have an error
         /** @type WPDB $wpdb */
         global $wpdb;
-        if ($this->_get_table_analysis()->tableExists($wpdb->prefix . 'esp_status')) {
+        if ($this->_get_table_analysis()->tableExists($wpdb->prefix.'esp_status')) {
             $results           = $wpdb->get_results(
                 "SELECT STS_ID, STS_code FROM {$wpdb->prefix}esp_status WHERE STS_type = 'registration'"
             );
             self::$_reg_status = [];
             foreach ($results as $status) {
-                if (! in_array($status->STS_ID, $exclude, true)) {
-                    self::$_reg_status[ $status->STS_ID ] = $status->STS_code;
+                if ( ! in_array($status->STS_ID, $exclude, true)) {
+                    self::$_reg_status[$status->STS_ID] = $status->STS_code;
                 }
             }
         }
@@ -440,7 +440,7 @@ 
      */
     public function get_all_registrations_for_attendee(int $ATT_ID = 0): ?array
     {
-        if (! $ATT_ID) {
+        if ( ! $ATT_ID) {
             return null;
         }
         return $this->get_all([['ATT_ID' => $ATT_ID]]);
@@ -457,7 +457,7 @@ 
      */
     public function get_registration_for_reg_url_link(string $REG_url_link): ?EE_Registration
     {
-        if (! $REG_url_link) {
+        if ( ! $REG_url_link) {
             return null;
         }
         return $this->get_one([['REG_url_link' => $REG_url_link]]);
@@ -504,11 +504,11 @@ 
             'Y-m-d H:i:s',
             'UTC'
         );
-        $where    = [
+        $where = [
             'REG_date' => ['>=', $sql_date],
             'STS_ID'   => ['!=', EEM_Registration::status_id_incomplete],
         ];
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
+        if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) {
             $where['Event.EVT_wp_user'] = get_current_user_id();
         }
         $query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'REG_date');
@@ -520,7 +520,7 @@ 
             ],
             OBJECT,
             [
-                'regDate' => ['DATE(' . $query_interval . ')', '%s'],
+                'regDate' => ['DATE('.$query_interval.')', '%s'],
                 'total'   => ['count(REG_ID)', '%d'],
             ]
         );
@@ -540,7 +540,7 @@ 
     public function get_registrations_per_day_and_per_status_report(string $period = '-1 month'): array
     {
         global $wpdb;
-        $registration_table = $wpdb->prefix . 'esp_registration';
+        $registration_table = $wpdb->prefix.'esp_registration';
         $event_table        = $wpdb->posts;
         $sql_date           = date('Y-m-d H:i:s', strtotime($period));
         // prepare the query interval for displaying offset
@@ -549,9 +549,9 @@ 
         $inner_date_query = "SELECT DISTINCT REG_date from $registration_table ";
         $inner_where      = ' WHERE';
         // exclude events not authored by user if permissions in effect
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
+        if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
             $inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-            $inner_where      .= ' post_author = ' . get_current_user_id() . ' AND';
+            $inner_where      .= ' post_author = '.get_current_user_id().' AND';
         }
         $inner_where      .= " REG_date >= '$sql_date'";
         $inner_date_query .= $inner_where;
@@ -575,7 +575,7 @@ 
         // setup the joins
         $join .= implode(' LEFT JOIN ', $join_parts);
         // now let's put it all together
-        $query = $select . $join . ' GROUP BY Registration_REG_date';
+        $query = $select.$join.' GROUP BY Registration_REG_date';
         // and execute it
         return $wpdb->get_results($query, ARRAY_A);
     }
@@ -597,7 +597,7 @@ 
             'Y-m-d H:i:s',
             'UTC'
         );
-        $where    = [
+        $where = [
             'REG_date' => ['>=', $date_sql],
             'STS_ID'   => ['!=', EEM_Registration::status_id_incomplete],
         ];
@@ -638,16 +638,16 @@ 
     public function get_registrations_per_event_and_per_status_report(string $period = '-1 month'): array
     {
         global $wpdb;
-        $registration_table = $wpdb->prefix . 'esp_registration';
+        $registration_table = $wpdb->prefix.'esp_registration';
         $event_table        = $wpdb->posts;
         $sql_date           = date('Y-m-d H:i:s', strtotime($period));
         // inner date query
         $inner_date_query = "SELECT DISTINCT EVT_ID, REG_date from $registration_table ";
         $inner_where      = ' WHERE';
         // exclude events not authored by user if permissions in effect
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
+        if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
             $inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID";
-            $inner_where      .= ' post_author = ' . get_current_user_id() . ' AND';
+            $inner_where      .= ' post_author = '.get_current_user_id().' AND';
         }
         $inner_where      .= " REG_date >= '$sql_date'";
         $inner_date_query .= $inner_where;
@@ -671,7 +671,7 @@ 
         // setup remaining joins
         $join .= implode(' LEFT JOIN ', $join_parts);
         // now put it all together
-        $query = $select . $join . ' GROUP BY Registration_Event';
+        $query = $select.$join.' GROUP BY Registration_Event';
         // and execute
         return $wpdb->get_results($query, ARRAY_A);
     }
@@ -686,7 +686,7 @@ 
      */
     public function get_primary_registration_for_transaction_ID(int $TXN_ID = 0): ?EE_Registration
     {
-        if (! $TXN_ID) {
+        if ( ! $TXN_ID) {
             return null;
         }
         return $this->get_one([
@@ -759,11 +759,11 @@ 
         $query = $wpdb->prepare(
             'SELECT '
             . 'COUNT( DISTINCT checkins.REG_ID ) '
-            . 'FROM ' . EEM_Checkin::instance()->table() . ' AS checkins INNER JOIN'
+            . 'FROM '.EEM_Checkin::instance()->table().' AS checkins INNER JOIN'
             . '( SELECT '
             . 'max( CHK_timestamp ) AS latest_checkin, '
             . 'REG_ID AS REG_ID '
-            . 'FROM ' . EEM_Checkin::instance()->table() . ' '
+            . 'FROM '.EEM_Checkin::instance()->table().' '
             . 'WHERE DTT_ID=%d '
             . 'GROUP BY REG_ID'
             . ') AS most_recent_checkin_per_reg '
@@ -796,12 +796,12 @@ 
         $query = $wpdb->prepare(
             'SELECT '
             . 'COUNT( DISTINCT checkins.REG_ID ) '
-            . 'FROM ' . EEM_Checkin::instance()->table() . ' AS checkins INNER JOIN'
+            . 'FROM '.EEM_Checkin::instance()->table().' AS checkins INNER JOIN'
             . '( SELECT '
             . 'max( CHK_timestamp ) AS latest_checkin, '
             . 'REG_ID AS REG_ID '
-            . 'FROM ' . EEM_Checkin::instance()->table() . ' AS c '
-            . 'INNER JOIN ' . EEM_Datetime::instance()->table() . ' AS d '
+            . 'FROM '.EEM_Checkin::instance()->table().' AS c '
+            . 'INNER JOIN '.EEM_Datetime::instance()->table().' AS d '
             . 'ON c.DTT_ID=d.DTT_ID '
             . 'WHERE d.EVT_ID=%d '
             . 'GROUP BY REG_ID'
@@ -831,7 +831,7 @@ 
     {
         // first do a native wp_query to get the latest REG_ID's matching these attendees.
         global $wpdb;
-        $registration_table = $wpdb->prefix . 'esp_registration';
+        $registration_table = $wpdb->prefix.'esp_registration';
         $attendee_table     = $wpdb->posts;
         $attendee_ids       = is_array($attendee_ids)
             ? array_map('absint', $attendee_ids)
@@ -853,7 +853,7 @@ 
 			  ) AS registrations
 			  GROUP BY registrations.attendee_ids
 		";
-        $registration_ids      = $wpdb->get_results($registration_id_query, ARRAY_A);
+        $registration_ids = $wpdb->get_results($registration_id_query, ARRAY_A);
         if (empty($registration_ids)) {
             return [];
         }
@@ -885,7 +885,7 @@ 
     public function event_reg_count_for_statuses(int $EVT_ID, $statuses = []): int
     {
         $EVT_ID = absint($EVT_ID);
-        if (! $EVT_ID) {
+        if ( ! $EVT_ID) {
             throw new InvalidArgumentException(
                 esc_html__('An invalid Event ID was supplied.', 'event_espresso')
             );
@@ -895,7 +895,7 @@ 
 
         $valid_reg_statuses = EEM_Registration::reg_statuses();
         foreach ($statuses as $status) {
-            if (! in_array($status, $valid_reg_statuses, true)) {
+            if ( ! in_array($status, $valid_reg_statuses, true)) {
                 throw new InvalidStatusException($status, esc_html__('Registration', 'event_espresso'));
             }
         }

core/db_models/fields/EE_Datetime_Field.php

Indentation +746 added lines, -746 removed lines

@@ -17,751 +17,751 @@
  */
 class EE_Datetime_Field extends EE_Model_Field_Base
 {
-    /**
-     * The pattern we're looking for is if only the characters 0-9 are found and there are only
-     * 10 or more numbers (because 9 numbers even with all 9's would be sometime in 2001 )
-     *
-     * @type string unix_timestamp_regex
-     */
-    const unix_timestamp_regex = '/[0-9]{10,}/';
-
-    /**
-     * @type string mysql_timestamp_format
-     */
-    const mysql_timestamp_format = 'Y-m-d H:i:s';
-
-    /**
-     * @type string mysql_date_format
-     */
-    const mysql_date_format = 'Y-m-d';
-
-    /**
-     * @type string mysql_time_format
-     */
-    const mysql_time_format = 'H:i:s';
-
-    /**
-     * Const for using in the default value. If the field's default is set to this,
-     * then we will return the time of calling `get_default_value()`, not
-     * just the current time at construction
-     */
-    const now = 'now';
-
-    /**
-     * The following properties hold the default formats for date and time.
-     * Defaults are set via the constructor and can be overridden on class instantiation.
-     * However they can also be overridden later by the set_format() method
-     * (and corresponding set_date_format, set_time_format methods);
-     */
-
-    protected string        $_date_format        = '';
-
-    protected string        $_time_format        = '';
-
-    protected string        $_pretty_date_format = '';
-
-    protected string        $_pretty_time_format = '';
-
-    protected ?DateTimeZone $_DateTimeZone       = null;
-
-    protected ?DateTimeZone $_UTC_DateTimeZone   = null;
-
-    protected ?DateTimeZone $_blog_DateTimeZone  = null;
-
-
-    /**
-     * This property holds how we want the output returned when getting a datetime string.  It is set for the
-     * set_date_time_output() method.  By default this is empty.  When empty, we are assuming that we want both date
-     * and time returned via getters.
-     *
-     * @var mixed (null|string)
-     */
-    protected $_date_time_output;
-
-
-    /**
-     * timezone string
-     * This gets set by the constructor and can be changed by the "set_timezone()" method so that we know what timezone
-     * incoming strings|timestamps are in.  This can also be used before a get to set what timezone you want strings
-     * coming out of the object to be in.  Default timezone is the current WP timezone option setting
-     */
-    protected ?string $_timezone_string = null;
-
-
-    /**
-     * This holds whatever UTC offset for the blog (we automatically convert timezone strings into their related
-     * offsets for comparison purposes).
-     *
-     * @var int
-     */
-    protected int $_blog_offset;
-
-
-    /**
-     * @param string      $table_column
-     * @param string      $nice_name
-     * @param bool        $nullable
-     * @param string|null $default_value
-     * @param string|null $timezone_string
-     * @param string|null $date_format
-     * @param string|null $time_format
-     * @param string|null $pretty_date_format
-     * @param string|null $pretty_time_format
-     * @throws InvalidArgumentException
-     * @throws Exception
-     */
-    public function __construct(
-        string $table_column,
-        string $nice_name,
-        bool $nullable,
-        ?string $default_value,
-        ?string $timezone_string = '',
-        ?string $date_format = '',
-        ?string $time_format = '',
-        ?string $pretty_date_format = '',
-        ?string $pretty_time_format = ''
-    ) {
-        $this->set_date_format($date_format);
-        $this->set_time_format($time_format);
-        $this->set_date_format($pretty_date_format, true);
-        $this->set_time_format($pretty_time_format, true);
-
-        parent::__construct($table_column, $nice_name, $nullable, $default_value);
-        $this->set_timezone($timezone_string);
-        $this->setSchemaFormat('date-time');
-    }
-
-
-    /**
-     * @return DateTimeZone
-     * @throws Exception
-     */
-    public function get_UTC_DateTimeZone(): DateTimeZone
-    {
-        return $this->_UTC_DateTimeZone instanceof DateTimeZone
-            ? $this->_UTC_DateTimeZone
-            : $this->_create_timezone_object_from_timezone_string('UTC');
-    }
-
-
-    /**
-     * @return DateTimeZone
-     * @throws Exception
-     */
-    public function get_blog_DateTimeZone(): DateTimeZone
-    {
-        return $this->_blog_DateTimeZone instanceof DateTimeZone
-            ? $this->_blog_DateTimeZone
-            : $this->_create_timezone_object_from_timezone_string();
-    }
-
-
-    /**
-     * this prepares any incoming date data and make sure its converted to a utc unix timestamp
-     *
-     * @param string|int $value_inputted_for_field_on_model_object  could be a string formatted date time or int unix
-     *                                                              timestamp
-     * @return DateTime
-     * @throws Exception
-     */
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        return $this->_get_date_object($value_inputted_for_field_on_model_object);
-    }
-
-
-    /**
-     * This returns the format string to be used by getters depending on what the $_date_time_output property is set at.
-     * getters need to know whether we're just returning the date or the time or both.  By default we return both.
-     *
-     * @param bool $pretty If we're returning the pretty formats or standard format string.
-     * @return string    The final assembled format string.
-     */
-    protected function _get_date_time_output(bool $pretty = false): string
-    {
-        switch ($this->_date_time_output) {
-            case 'time':
-                return $pretty
-                    ? $this->_pretty_time_format
-                    : $this->_time_format;
-
-            case 'date':
-                return $pretty
-                    ? $this->_pretty_date_format
-                    : $this->_date_format;
-
-            default:
-                return $pretty
-                    ? trim($this->_pretty_date_format . ' ' . $this->_pretty_time_format)
-                    : trim($this->_date_format . ' ' . $this->_time_format);
-        }
-    }
-
-
-    /**
-     * This just sets the $_date_time_output property so we can flag how date and times are formatted before being
-     * returned (using the format properties)
-     *
-     * @param string|null $what acceptable values are 'time' or 'date'.
-     *                          Any other value will be set but will always result
-     *                          in both 'date' and 'time' being returned.
-     * @return void
-     */
-    public function set_date_time_output(?string $what = null)
-    {
-        $this->_date_time_output = $what;
-    }
-
-
-    /**
-     * See $_timezone property for description of what the timezone property is for.  This SETS the timezone internally
-     * for being able to reference what timezone we are running conversions on when converting TO the internal timezone
-     * (UTC Unix Timestamp) for the object OR when converting FROM the internal timezone (UTC Unix Timestamp).
-     * We also set some other properties in this method.
-     *
-     * @param string|null $timezone_string A valid timezone string as described by @link
-     *                                     http://www.php.net/manual/en/timezones.php
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws Exception
-     */
-    public function set_timezone(?string $timezone_string)
-    {
-        if (empty($timezone_string) && $this->_timezone_string !== null) {
-            // leave the timezone AS-IS if we already have one and
-            // the function arg didn't provide one
-            return;
-        }
-        $timezone_string        = EEH_DTT_Helper::get_valid_timezone_string($timezone_string);
-        $this->_timezone_string = ! empty($timezone_string)
-            ? $timezone_string
-            : 'UTC';
-        $this->_DateTimeZone    = $this->_create_timezone_object_from_timezone_string($this->_timezone_string);
-    }
-
-
-    /**
-     * _create_timezone_object_from_timezone_name
-     *
-     * @access protected
-     * @param string|null $timezone_string
-     * @return DateTimeZone
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws Exception
-     */
-    protected function _create_timezone_object_from_timezone_string(?string $timezone_string = ''): DateTimeZone
-    {
-        return new DateTimeZone(EEH_DTT_Helper::get_valid_timezone_string($timezone_string));
-    }
-
-
-    /**
-     * This just returns whatever is set for the current timezone.
-     *
-     * @access public
-     * @return string timezone string
-     */
-    public function get_timezone(): ?string
-    {
-        return $this->_timezone_string;
-    }
-
-
-    /**
-     * set the $_date_format property
-     *
-     * @access public
-     * @param string $format a new date format (corresponding to formats accepted by PHP date() function)
-     * @param bool   $pretty Whether to set pretty format or not.
-     * @return void
-     */
-    public function set_date_format(string $format, bool $pretty = false)
-    {
-        if ($pretty) {
-            $this->_pretty_date_format = new DateFormat($format);
-        } else {
-            $this->_date_format = new DateFormat($format);
-        }
-    }
-
-
-    /**
-     * return the $_date_format property value.
-     *
-     * @param bool $pretty Whether to get pretty format or not.
-     * @return string
-     */
-    public function get_date_format(bool $pretty = false): string
-    {
-        return $pretty
-            ? $this->_pretty_date_format
-            : $this->_date_format;
-    }
-
-
-    /**
-     * set the $_time_format property
-     *
-     * @access public
-     * @param string $format a new time format (corresponding to formats accepted by PHP date() function)
-     * @param bool   $pretty Whether to set pretty format or not.
-     * @return void
-     */
-    public function set_time_format(string $format, bool $pretty = false)
-    {
-        if ($pretty) {
-            $this->_pretty_time_format = new TimeFormat($format);
-        } else {
-            $this->_time_format = new TimeFormat($format);
-        }
-    }
-
-
-    /**
-     * return the $_time_format property value.
-     *
-     * @param bool $pretty Whether to get pretty format or not.
-     * @return string
-     */
-    public function get_time_format(bool $pretty = false): string
-    {
-        return $pretty
-            ? $this->_pretty_time_format
-            : $this->_time_format;
-    }
-
-
-    /**
-     * set the $_pretty_date_format property
-     *
-     * @access public
-     * @param string|null $format a new pretty date format (corresponding to formats accepted by PHP date() function)
-     * @return void
-     */
-    public function set_pretty_date_format(?string $format)
-    {
-        $this->set_date_format($format, true);
-    }
-
-
-    /**
-     * set the $_pretty_time_format property
-     *
-     * @access public
-     * @param string|null $format a new pretty time format (corresponding to formats accepted by PHP date() function)
-     * @return void
-     */
-    public function set_pretty_time_format(?string $format)
-    {
-        $this->set_time_format($format, true);
-    }
-
-
-    /**
-     * Only sets the time portion of the datetime.
-     *
-     * @param string|DateTime $time_to_set_string like 8am OR a DateTime object.
-     * @param DateTime        $current            current DateTime object for the datetime field
-     * @return DateTime
-     */
-    public function prepare_for_set_with_new_time($time_to_set_string, DateTime $current): DateTime
-    {
-        // if $time_to_set_string is datetime object, then let's use it to set the parse array.
-        // Otherwise parse the string.
-        if ($time_to_set_string instanceof DateTime) {
-            $parsed = [
-                'hour'   => $time_to_set_string->format('H'),
-                'minute' => $time_to_set_string->format('i'),
-                'second' => $time_to_set_string->format('s'),
-            ];
-        } else {
-            // parse incoming string
-            $parsed = date_parse_from_format($this->_time_format, $time_to_set_string);
-        }
-        EEH_DTT_Helper::setTimezone($current, $this->_DateTimeZone);
-        return $current->setTime($parsed['hour'], $parsed['minute'], $parsed['second']);
-    }
-
-
-    /**
-     * Only sets the date portion of the datetime.
-     *
-     * @param string|DateTime $date_to_set_string like Friday, January 8th or a DateTime object.
-     * @param DateTime        $current            current DateTime object for the datetime field
-     * @return DateTime
-     */
-    public function prepare_for_set_with_new_date($date_to_set_string, DateTime $current): DateTime
-    {
-        // if $time_to_set_string is datetime object, then let's use it to set the parse array.
-        // Otherwise parse the string.
-        if ($date_to_set_string instanceof DateTime) {
-            $parsed = [
-                'year'  => $date_to_set_string->format('Y'),
-                'month' => $date_to_set_string->format('m'),
-                'day'   => $date_to_set_string->format('d'),
-            ];
-        } else {
-            // parse incoming string
-            $parsed = date_parse_from_format($this->_date_format, $date_to_set_string);
-        }
-        EEH_DTT_Helper::setTimezone($current, $this->_DateTimeZone);
-        return $current->setDate($parsed['year'], $parsed['month'], $parsed['day']);
-    }
-
-
-    /**
-     * This prepares the EE_DateTime value to be saved to the db as mysql timestamp (UTC +0 timezone).  When the
-     * datetime gets to this stage it should ALREADY be in UTC time
-     *
-     * @param DateTime $DateTime
-     * @return string formatted date time for given timezone
-     * @throws EE_Error
-     */
-    public function prepare_for_get($DateTime): string
-    {
-        return $this->_prepare_for_display($DateTime);
-    }
-
-
-    /**
-     * This differs from prepare_for_get in that it considers whether the internal $_timezone differs
-     * from the set wp timezone.  If so, then it returns the datetime string formatted via
-     * _pretty_date_format, and _pretty_time_format.  However, it also appends a timezone
-     * abbreviation to the date_string.
-     *
-     * @param mixed       $DateTime
-     * @param string|null $schema
-     * @return string
-     * @throws EE_Error
-     */
-    public function prepare_for_pretty_echoing($DateTime, ?string $schema = null): string
-    {
-        return $this->_prepare_for_display($DateTime, ($schema
-            ?: true));
-    }
-
-
-    /**
-     * This prepares the EE_DateTime value to be saved to the db as mysql timestamp (UTC +0
-     * timezone).
-     *
-     * @param DateTime|null $DateTime
-     * @param bool|string   $schema
-     * @return string
-     * @throws EE_Error
-     * @throws Exception
-     */
-    protected function _prepare_for_display(?DateTime $DateTime, $schema = false): string
-    {
-        if (! $DateTime instanceof DateTime) {
-            if ($this->_nullable) {
-                return '';
-            }
-            if (WP_DEBUG) {
-                throw new EE_Error(
-                    sprintf(
-                        esc_html__(
-                            'EE_Datetime_Field::_prepare_for_display requires a DateTime class to be the value for the $DateTime argument because the %s field is not nullable.',
-                            'event_espresso'
-                        ),
-                        $this->_nicename
-                    )
-                );
-            }
-            $DateTime = new DbSafeDateTime(EE_Datetime_Field::now);
-            EE_Error::add_error(
-                sprintf(
-                    esc_html__(
-                        'EE_Datetime_Field::_prepare_for_display requires a DateTime class to be the value for the $DateTime argument because the %s field is not nullable.  When WP_DEBUG is false, the value is set to "now" instead of throwing an exception.',
-                        'event_espresso'
-                    ),
-                    $this->_nicename
-                ),
-                __FILE__, __FUNCTION__, __LINE__
-            );
-        }
-        $format_string = $this->_get_date_time_output($schema);
-        EEH_DTT_Helper::setTimezone($DateTime, $this->_DateTimeZone);
-        if ($schema) {
-            $timezone_string = '';
-            if ($this->_display_timezone()) {
-                // must be explicit because schema could equal true.
-                if ($schema === 'no_html') {
-                    $timezone_string = ' (' . $DateTime->format('T') . ')';
-                } else {
-                    $timezone_string = ' <span class="ee_dtt_timezone_string">(' . $DateTime->format('T') . ')</span>';
-                }
-            }
-
-            return $DateTime->format($format_string) . $timezone_string;
-        }
-        return $DateTime->format($format_string);
-    }
-
-
-    /**
-     * This prepares the EE_DateTime value to be saved to the db as mysql timestamp (UTC +0
-     * timezone).
-     *
-     * @param mixed $datetime_value u
-     * @return string mysql timestamp in UTC
-     * @throws EE_Error
-     * @throws Exception
-     */
-    public function prepare_for_use_in_db($datetime_value): ?string
-    {
-        // we allow an empty value or DateTime object, but nothing else.
-        if (! empty($datetime_value) && ! $datetime_value instanceof DateTime) {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__(
-                        'The incoming value being prepared for setting in the database must either be empty or a php 
+	/**
+	 * The pattern we're looking for is if only the characters 0-9 are found and there are only
+	 * 10 or more numbers (because 9 numbers even with all 9's would be sometime in 2001 )
+	 *
+	 * @type string unix_timestamp_regex
+	 */
+	const unix_timestamp_regex = '/[0-9]{10,}/';
+
+	/**
+	 * @type string mysql_timestamp_format
+	 */
+	const mysql_timestamp_format = 'Y-m-d H:i:s';
+
+	/**
+	 * @type string mysql_date_format
+	 */
+	const mysql_date_format = 'Y-m-d';
+
+	/**
+	 * @type string mysql_time_format
+	 */
+	const mysql_time_format = 'H:i:s';
+
+	/**
+	 * Const for using in the default value. If the field's default is set to this,
+	 * then we will return the time of calling `get_default_value()`, not
+	 * just the current time at construction
+	 */
+	const now = 'now';
+
+	/**
+	 * The following properties hold the default formats for date and time.
+	 * Defaults are set via the constructor and can be overridden on class instantiation.
+	 * However they can also be overridden later by the set_format() method
+	 * (and corresponding set_date_format, set_time_format methods);
+	 */
+
+	protected string        $_date_format        = '';
+
+	protected string        $_time_format        = '';
+
+	protected string        $_pretty_date_format = '';
+
+	protected string        $_pretty_time_format = '';
+
+	protected ?DateTimeZone $_DateTimeZone       = null;
+
+	protected ?DateTimeZone $_UTC_DateTimeZone   = null;
+
+	protected ?DateTimeZone $_blog_DateTimeZone  = null;
+
+
+	/**
+	 * This property holds how we want the output returned when getting a datetime string.  It is set for the
+	 * set_date_time_output() method.  By default this is empty.  When empty, we are assuming that we want both date
+	 * and time returned via getters.
+	 *
+	 * @var mixed (null|string)
+	 */
+	protected $_date_time_output;
+
+
+	/**
+	 * timezone string
+	 * This gets set by the constructor and can be changed by the "set_timezone()" method so that we know what timezone
+	 * incoming strings|timestamps are in.  This can also be used before a get to set what timezone you want strings
+	 * coming out of the object to be in.  Default timezone is the current WP timezone option setting
+	 */
+	protected ?string $_timezone_string = null;
+
+
+	/**
+	 * This holds whatever UTC offset for the blog (we automatically convert timezone strings into their related
+	 * offsets for comparison purposes).
+	 *
+	 * @var int
+	 */
+	protected int $_blog_offset;
+
+
+	/**
+	 * @param string      $table_column
+	 * @param string      $nice_name
+	 * @param bool        $nullable
+	 * @param string|null $default_value
+	 * @param string|null $timezone_string
+	 * @param string|null $date_format
+	 * @param string|null $time_format
+	 * @param string|null $pretty_date_format
+	 * @param string|null $pretty_time_format
+	 * @throws InvalidArgumentException
+	 * @throws Exception
+	 */
+	public function __construct(
+		string $table_column,
+		string $nice_name,
+		bool $nullable,
+		?string $default_value,
+		?string $timezone_string = '',
+		?string $date_format = '',
+		?string $time_format = '',
+		?string $pretty_date_format = '',
+		?string $pretty_time_format = ''
+	) {
+		$this->set_date_format($date_format);
+		$this->set_time_format($time_format);
+		$this->set_date_format($pretty_date_format, true);
+		$this->set_time_format($pretty_time_format, true);
+
+		parent::__construct($table_column, $nice_name, $nullable, $default_value);
+		$this->set_timezone($timezone_string);
+		$this->setSchemaFormat('date-time');
+	}
+
+
+	/**
+	 * @return DateTimeZone
+	 * @throws Exception
+	 */
+	public function get_UTC_DateTimeZone(): DateTimeZone
+	{
+		return $this->_UTC_DateTimeZone instanceof DateTimeZone
+			? $this->_UTC_DateTimeZone
+			: $this->_create_timezone_object_from_timezone_string('UTC');
+	}
+
+
+	/**
+	 * @return DateTimeZone
+	 * @throws Exception
+	 */
+	public function get_blog_DateTimeZone(): DateTimeZone
+	{
+		return $this->_blog_DateTimeZone instanceof DateTimeZone
+			? $this->_blog_DateTimeZone
+			: $this->_create_timezone_object_from_timezone_string();
+	}
+
+
+	/**
+	 * this prepares any incoming date data and make sure its converted to a utc unix timestamp
+	 *
+	 * @param string|int $value_inputted_for_field_on_model_object  could be a string formatted date time or int unix
+	 *                                                              timestamp
+	 * @return DateTime
+	 * @throws Exception
+	 */
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		return $this->_get_date_object($value_inputted_for_field_on_model_object);
+	}
+
+
+	/**
+	 * This returns the format string to be used by getters depending on what the $_date_time_output property is set at.
+	 * getters need to know whether we're just returning the date or the time or both.  By default we return both.
+	 *
+	 * @param bool $pretty If we're returning the pretty formats or standard format string.
+	 * @return string    The final assembled format string.
+	 */
+	protected function _get_date_time_output(bool $pretty = false): string
+	{
+		switch ($this->_date_time_output) {
+			case 'time':
+				return $pretty
+					? $this->_pretty_time_format
+					: $this->_time_format;
+
+			case 'date':
+				return $pretty
+					? $this->_pretty_date_format
+					: $this->_date_format;
+
+			default:
+				return $pretty
+					? trim($this->_pretty_date_format . ' ' . $this->_pretty_time_format)
+					: trim($this->_date_format . ' ' . $this->_time_format);
+		}
+	}
+
+
+	/**
+	 * This just sets the $_date_time_output property so we can flag how date and times are formatted before being
+	 * returned (using the format properties)
+	 *
+	 * @param string|null $what acceptable values are 'time' or 'date'.
+	 *                          Any other value will be set but will always result
+	 *                          in both 'date' and 'time' being returned.
+	 * @return void
+	 */
+	public function set_date_time_output(?string $what = null)
+	{
+		$this->_date_time_output = $what;
+	}
+
+
+	/**
+	 * See $_timezone property for description of what the timezone property is for.  This SETS the timezone internally
+	 * for being able to reference what timezone we are running conversions on when converting TO the internal timezone
+	 * (UTC Unix Timestamp) for the object OR when converting FROM the internal timezone (UTC Unix Timestamp).
+	 * We also set some other properties in this method.
+	 *
+	 * @param string|null $timezone_string A valid timezone string as described by @link
+	 *                                     http://www.php.net/manual/en/timezones.php
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws Exception
+	 */
+	public function set_timezone(?string $timezone_string)
+	{
+		if (empty($timezone_string) && $this->_timezone_string !== null) {
+			// leave the timezone AS-IS if we already have one and
+			// the function arg didn't provide one
+			return;
+		}
+		$timezone_string        = EEH_DTT_Helper::get_valid_timezone_string($timezone_string);
+		$this->_timezone_string = ! empty($timezone_string)
+			? $timezone_string
+			: 'UTC';
+		$this->_DateTimeZone    = $this->_create_timezone_object_from_timezone_string($this->_timezone_string);
+	}
+
+
+	/**
+	 * _create_timezone_object_from_timezone_name
+	 *
+	 * @access protected
+	 * @param string|null $timezone_string
+	 * @return DateTimeZone
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws Exception
+	 */
+	protected function _create_timezone_object_from_timezone_string(?string $timezone_string = ''): DateTimeZone
+	{
+		return new DateTimeZone(EEH_DTT_Helper::get_valid_timezone_string($timezone_string));
+	}
+
+
+	/**
+	 * This just returns whatever is set for the current timezone.
+	 *
+	 * @access public
+	 * @return string timezone string
+	 */
+	public function get_timezone(): ?string
+	{
+		return $this->_timezone_string;
+	}
+
+
+	/**
+	 * set the $_date_format property
+	 *
+	 * @access public
+	 * @param string $format a new date format (corresponding to formats accepted by PHP date() function)
+	 * @param bool   $pretty Whether to set pretty format or not.
+	 * @return void
+	 */
+	public function set_date_format(string $format, bool $pretty = false)
+	{
+		if ($pretty) {
+			$this->_pretty_date_format = new DateFormat($format);
+		} else {
+			$this->_date_format = new DateFormat($format);
+		}
+	}
+
+
+	/**
+	 * return the $_date_format property value.
+	 *
+	 * @param bool $pretty Whether to get pretty format or not.
+	 * @return string
+	 */
+	public function get_date_format(bool $pretty = false): string
+	{
+		return $pretty
+			? $this->_pretty_date_format
+			: $this->_date_format;
+	}
+
+
+	/**
+	 * set the $_time_format property
+	 *
+	 * @access public
+	 * @param string $format a new time format (corresponding to formats accepted by PHP date() function)
+	 * @param bool   $pretty Whether to set pretty format or not.
+	 * @return void
+	 */
+	public function set_time_format(string $format, bool $pretty = false)
+	{
+		if ($pretty) {
+			$this->_pretty_time_format = new TimeFormat($format);
+		} else {
+			$this->_time_format = new TimeFormat($format);
+		}
+	}
+
+
+	/**
+	 * return the $_time_format property value.
+	 *
+	 * @param bool $pretty Whether to get pretty format or not.
+	 * @return string
+	 */
+	public function get_time_format(bool $pretty = false): string
+	{
+		return $pretty
+			? $this->_pretty_time_format
+			: $this->_time_format;
+	}
+
+
+	/**
+	 * set the $_pretty_date_format property
+	 *
+	 * @access public
+	 * @param string|null $format a new pretty date format (corresponding to formats accepted by PHP date() function)
+	 * @return void
+	 */
+	public function set_pretty_date_format(?string $format)
+	{
+		$this->set_date_format($format, true);
+	}
+
+
+	/**
+	 * set the $_pretty_time_format property
+	 *
+	 * @access public
+	 * @param string|null $format a new pretty time format (corresponding to formats accepted by PHP date() function)
+	 * @return void
+	 */
+	public function set_pretty_time_format(?string $format)
+	{
+		$this->set_time_format($format, true);
+	}
+
+
+	/**
+	 * Only sets the time portion of the datetime.
+	 *
+	 * @param string|DateTime $time_to_set_string like 8am OR a DateTime object.
+	 * @param DateTime        $current            current DateTime object for the datetime field
+	 * @return DateTime
+	 */
+	public function prepare_for_set_with_new_time($time_to_set_string, DateTime $current): DateTime
+	{
+		// if $time_to_set_string is datetime object, then let's use it to set the parse array.
+		// Otherwise parse the string.
+		if ($time_to_set_string instanceof DateTime) {
+			$parsed = [
+				'hour'   => $time_to_set_string->format('H'),
+				'minute' => $time_to_set_string->format('i'),
+				'second' => $time_to_set_string->format('s'),
+			];
+		} else {
+			// parse incoming string
+			$parsed = date_parse_from_format($this->_time_format, $time_to_set_string);
+		}
+		EEH_DTT_Helper::setTimezone($current, $this->_DateTimeZone);
+		return $current->setTime($parsed['hour'], $parsed['minute'], $parsed['second']);
+	}
+
+
+	/**
+	 * Only sets the date portion of the datetime.
+	 *
+	 * @param string|DateTime $date_to_set_string like Friday, January 8th or a DateTime object.
+	 * @param DateTime        $current            current DateTime object for the datetime field
+	 * @return DateTime
+	 */
+	public function prepare_for_set_with_new_date($date_to_set_string, DateTime $current): DateTime
+	{
+		// if $time_to_set_string is datetime object, then let's use it to set the parse array.
+		// Otherwise parse the string.
+		if ($date_to_set_string instanceof DateTime) {
+			$parsed = [
+				'year'  => $date_to_set_string->format('Y'),
+				'month' => $date_to_set_string->format('m'),
+				'day'   => $date_to_set_string->format('d'),
+			];
+		} else {
+			// parse incoming string
+			$parsed = date_parse_from_format($this->_date_format, $date_to_set_string);
+		}
+		EEH_DTT_Helper::setTimezone($current, $this->_DateTimeZone);
+		return $current->setDate($parsed['year'], $parsed['month'], $parsed['day']);
+	}
+
+
+	/**
+	 * This prepares the EE_DateTime value to be saved to the db as mysql timestamp (UTC +0 timezone).  When the
+	 * datetime gets to this stage it should ALREADY be in UTC time
+	 *
+	 * @param DateTime $DateTime
+	 * @return string formatted date time for given timezone
+	 * @throws EE_Error
+	 */
+	public function prepare_for_get($DateTime): string
+	{
+		return $this->_prepare_for_display($DateTime);
+	}
+
+
+	/**
+	 * This differs from prepare_for_get in that it considers whether the internal $_timezone differs
+	 * from the set wp timezone.  If so, then it returns the datetime string formatted via
+	 * _pretty_date_format, and _pretty_time_format.  However, it also appends a timezone
+	 * abbreviation to the date_string.
+	 *
+	 * @param mixed       $DateTime
+	 * @param string|null $schema
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function prepare_for_pretty_echoing($DateTime, ?string $schema = null): string
+	{
+		return $this->_prepare_for_display($DateTime, ($schema
+			?: true));
+	}
+
+
+	/**
+	 * This prepares the EE_DateTime value to be saved to the db as mysql timestamp (UTC +0
+	 * timezone).
+	 *
+	 * @param DateTime|null $DateTime
+	 * @param bool|string   $schema
+	 * @return string
+	 * @throws EE_Error
+	 * @throws Exception
+	 */
+	protected function _prepare_for_display(?DateTime $DateTime, $schema = false): string
+	{
+		if (! $DateTime instanceof DateTime) {
+			if ($this->_nullable) {
+				return '';
+			}
+			if (WP_DEBUG) {
+				throw new EE_Error(
+					sprintf(
+						esc_html__(
+							'EE_Datetime_Field::_prepare_for_display requires a DateTime class to be the value for the $DateTime argument because the %s field is not nullable.',
+							'event_espresso'
+						),
+						$this->_nicename
+					)
+				);
+			}
+			$DateTime = new DbSafeDateTime(EE_Datetime_Field::now);
+			EE_Error::add_error(
+				sprintf(
+					esc_html__(
+						'EE_Datetime_Field::_prepare_for_display requires a DateTime class to be the value for the $DateTime argument because the %s field is not nullable.  When WP_DEBUG is false, the value is set to "now" instead of throwing an exception.',
+						'event_espresso'
+					),
+					$this->_nicename
+				),
+				__FILE__, __FUNCTION__, __LINE__
+			);
+		}
+		$format_string = $this->_get_date_time_output($schema);
+		EEH_DTT_Helper::setTimezone($DateTime, $this->_DateTimeZone);
+		if ($schema) {
+			$timezone_string = '';
+			if ($this->_display_timezone()) {
+				// must be explicit because schema could equal true.
+				if ($schema === 'no_html') {
+					$timezone_string = ' (' . $DateTime->format('T') . ')';
+				} else {
+					$timezone_string = ' <span class="ee_dtt_timezone_string">(' . $DateTime->format('T') . ')</span>';
+				}
+			}
+
+			return $DateTime->format($format_string) . $timezone_string;
+		}
+		return $DateTime->format($format_string);
+	}
+
+
+	/**
+	 * This prepares the EE_DateTime value to be saved to the db as mysql timestamp (UTC +0
+	 * timezone).
+	 *
+	 * @param mixed $datetime_value u
+	 * @return string mysql timestamp in UTC
+	 * @throws EE_Error
+	 * @throws Exception
+	 */
+	public function prepare_for_use_in_db($datetime_value): ?string
+	{
+		// we allow an empty value or DateTime object, but nothing else.
+		if (! empty($datetime_value) && ! $datetime_value instanceof DateTime) {
+			throw new EE_Error(
+				sprintf(
+					esc_html__(
+						'The incoming value being prepared for setting in the database must either be empty or a php 
             		    DateTime object, instead of: %1$s %2$s',
-                        'event_espresso'
-                    ),
-                    '<br />',
-                    print_r($datetime_value, true)
-                )
-            );
-        }
-
-        if ($datetime_value instanceof DateTime) {
-            if (! $datetime_value instanceof DbSafeDateTime) {
-                $datetime_value = DbSafeDateTime::createFromDateTime($datetime_value);
-            }
-            EEH_DTT_Helper::setTimezone($datetime_value, $this->get_UTC_DateTimeZone());
-            return $datetime_value->format(
-                EE_Datetime_Field::mysql_timestamp_format
-            );
-        }
-
-        // if $datetime_value is empty, and ! $this->_nullable, use current_time() but set the GMT flag to true
-        return ! $this->_nullable
-            ? current_time('mysql', true)
-            : null;
-    }
-
-
-    /**
-     * This prepares the datetime for internal usage as a PHP DateTime object OR null (if nullable is
-     * allowed)
-     *
-     * @param string $datetime_string mysql timestamp in UTC
-     * @return  bool|DbSafeDateTime|null
-     * @throws EE_Error
-     * @throws Exception
-     */
-    public function prepare_for_set_from_db($datetime_string)
-    {
-        // if $datetime_value is empty, and ! $this->_nullable, just use time()
-        if (empty($datetime_string) && $this->_nullable) {
-            return null;
-        }
-        // datetime strings from the db should ALWAYS be in UTC+0, so use UTC_DateTimeZone when creating
-        $DateTime = empty($datetime_string)
-            ? new DbSafeDateTime(EE_Datetime_Field::now, $this->get_UTC_DateTimeZone())
-            : DbSafeDateTime::createFromFormat(
-                EE_Datetime_Field::mysql_timestamp_format,
-                $datetime_string,
-                $this->get_UTC_DateTimeZone()
-            );
-
-        if (! $DateTime instanceof DbSafeDateTime) {
-            // if still no datetime object, then let's just use now
-            $DateTime = new DbSafeDateTime(EE_Datetime_Field::now, $this->get_UTC_DateTimeZone());
-        }
-        // THEN apply the field's set DateTimeZone
-        EEH_DTT_Helper::setTimezone($DateTime, $this->_DateTimeZone);
-        return $DateTime;
-    }
-
-
-    /**
-     * All this method does is determine if we're going to display the timezone string or not on any output.
-     * To determine this we check if the set timezone offset is different than the blog's set timezone offset.
-     * If so, then true.
-     *
-     * @return bool true for yes false for no
-     * @throws Exception
-     */
-    protected function _display_timezone(): bool
-    {
-        // first let's do a comparison of timezone strings.
-        // If they match then we can get out without any further calculations
-        $blog_string = get_option('timezone_string');
-        if ($blog_string === $this->_timezone_string) {
-            return false;
-        }
-        // now we need to calc the offset for the timezone string so we can compare with the blog offset.
-        $this_offset = $this->get_timezone_offset($this->_DateTimeZone);
-        $blog_offset = $this->get_timezone_offset($this->get_blog_DateTimeZone());
-        // now compare
-        return $blog_offset !== $this_offset;
-    }
-
-
-    /**
-     * This method returns a php DateTime object for setting on the EE_Base_Class model.
-     * EE passes around DateTime objects because they are MUCH easier to manipulate and deal
-     * with.
-     *
-     * @param int|string|DateTime $date_string            This should be the incoming date string.  It's assumed to be
-     *                                                    in the format that is set on the date_field (or DateTime
-     *                                                    object)!
-     * @return DateTime
-     * @throws Exception
-     * @throws Exception
-     */
-    protected function _get_date_object($date_string)
-    {
-        // first if this is an empty date_string and nullable is allowed, just return null.
-        if ($this->_nullable && empty($date_string)) {
-            return null;
-        }
-
-        // if incoming date
-        if ($date_string instanceof DateTime) {
-            EEH_DTT_Helper::setTimezone($date_string, $this->_DateTimeZone);
-            return $date_string;
-        }
-        // if empty date_string and made it here.
-        // Return a datetime object for now in the given timezone.
-        if (empty($date_string)) {
-            return new DbSafeDateTime(EE_Datetime_Field::now, $this->_DateTimeZone);
-        }
-        // if $date_string is matches something that looks like a Unix timestamp let's just use it.
-        if (preg_match(EE_Datetime_Field::unix_timestamp_regex, $date_string)) {
-            try {
-                // This is operating under the assumption that the incoming Unix timestamp
-                // is an ACTUAL Unix timestamp and not the calculated one output by current_time('timestamp');
-                $DateTime = new DbSafeDateTime(EE_Datetime_Field::now, $this->_DateTimeZone);
-                $DateTime->setTimestamp($date_string);
-
-                return $DateTime;
-            } catch (Exception $e) {
-                // should be rare, but if things got fooled then let's just continue
-            }
-        }
-        // not a unix timestamp.  So we will use the set format on this object and set timezone to
-        // create the DateTime object.
-        $format = $this->_date_format . ' ' . $this->_time_format;
-        try {
-            $DateTime = DbSafeDateTime::createFromFormat($format, $date_string, $this->_DateTimeZone);
-            if (! $DateTime instanceof DbSafeDateTime) {
-                throw new EE_Error(
-                    sprintf(
-                        esc_html__('"%1$s" does not represent a valid Date Time in the format "%2$s".',
-                            'event_espresso'),
-                        $date_string,
-                        $format
-                    )
-                );
-            }
-        } catch (Exception $e) {
-            // if we made it here then likely then something went really wrong.
-            // Instead of throwing an exception, let's just return a DateTime object for now, in the set timezone.
-            $DateTime = new DbSafeDateTime(EE_Datetime_Field::now, $this->_DateTimeZone);
-        }
-
-        return $DateTime;
-    }
-
-
-    /**
-     * get_timezone_transitions
-     *
-     * @param DateTimeZone $DateTimeZone
-     * @param int|null     $time
-     * @param bool|null    $first_only
-     * @return array
-     */
-    public function get_timezone_transitions(
-        DateTimeZone $DateTimeZone,
-        ?int $time = null,
-        bool $first_only = true
-    ): array {
-        return EEH_DTT_Helper::get_timezone_transitions($DateTimeZone, $time, $first_only);
-    }
-
-
-    /**
-     * get_timezone_offset
-     *
-     * @param DateTimeZone $DateTimeZone
-     * @param int|null     $time
-     * @return mixed
-     * @throws DomainException
-     */
-    public function get_timezone_offset(DateTimeZone $DateTimeZone, ?int $time = null)
-    {
-        return EEH_DTT_Helper::get_timezone_offset($DateTimeZone, $time);
-    }
-
-
-    /**
-     * This will take an incoming timezone string and return the abbreviation for that timezone
-     *
-     * @param string|null $timezone_string
-     * @return string           abbreviation
-     * @throws Exception
-     */
-    public function get_timezone_abbrev(?string $timezone_string): string
-    {
-        $timezone_string = EEH_DTT_Helper::get_valid_timezone_string($timezone_string);
-        $dateTime        = new DateTime(EE_Datetime_Field::now, new DateTimeZone($timezone_string));
-        return $dateTime->format('T');
-    }
-
-
-    /**
-     * Overrides the parent to allow for having a dynamic "now" value
-     *
-     * @return mixed
-     */
-    public function get_default_value()
-    {
-        if ($this->_default_value === EE_Datetime_Field::now) {
-            return time();
-        }
-        return parent::get_default_value();
-    }
-
-
-    /**
-     * Gets the default datetime object from the field's default time
-     *
-     * @return DbSafeDateTime|DateTime|null
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException*@throws Exception
-     * @throws Exception
-     * @since 4.9.66.p
-     */
-    public function getDefaultDateTimeObj()
-    {
-        $default_raw = $this->get_default_value();
-        if ($default_raw instanceof DateTime) {
-            return $default_raw;
-        }
-        if (is_null($default_raw)) {
-            return null;
-        }
-        return new DbSafeDateTime(
-            $this->get_default_value(),
-            EEH_DTT_Helper::get_valid_timezone_string($this->get_timezone())
-        );
-    }
-
-
-    public function getSchemaDescription(): string
-    {
-        return sprintf(
-            esc_html__('%s - the value for this field is in the timezone of the site.', 'event_espresso'),
-            $this->get_nicename()
-        );
-    }
+						'event_espresso'
+					),
+					'<br />',
+					print_r($datetime_value, true)
+				)
+			);
+		}
+
+		if ($datetime_value instanceof DateTime) {
+			if (! $datetime_value instanceof DbSafeDateTime) {
+				$datetime_value = DbSafeDateTime::createFromDateTime($datetime_value);
+			}
+			EEH_DTT_Helper::setTimezone($datetime_value, $this->get_UTC_DateTimeZone());
+			return $datetime_value->format(
+				EE_Datetime_Field::mysql_timestamp_format
+			);
+		}
+
+		// if $datetime_value is empty, and ! $this->_nullable, use current_time() but set the GMT flag to true
+		return ! $this->_nullable
+			? current_time('mysql', true)
+			: null;
+	}
+
+
+	/**
+	 * This prepares the datetime for internal usage as a PHP DateTime object OR null (if nullable is
+	 * allowed)
+	 *
+	 * @param string $datetime_string mysql timestamp in UTC
+	 * @return  bool|DbSafeDateTime|null
+	 * @throws EE_Error
+	 * @throws Exception
+	 */
+	public function prepare_for_set_from_db($datetime_string)
+	{
+		// if $datetime_value is empty, and ! $this->_nullable, just use time()
+		if (empty($datetime_string) && $this->_nullable) {
+			return null;
+		}
+		// datetime strings from the db should ALWAYS be in UTC+0, so use UTC_DateTimeZone when creating
+		$DateTime = empty($datetime_string)
+			? new DbSafeDateTime(EE_Datetime_Field::now, $this->get_UTC_DateTimeZone())
+			: DbSafeDateTime::createFromFormat(
+				EE_Datetime_Field::mysql_timestamp_format,
+				$datetime_string,
+				$this->get_UTC_DateTimeZone()
+			);
+
+		if (! $DateTime instanceof DbSafeDateTime) {
+			// if still no datetime object, then let's just use now
+			$DateTime = new DbSafeDateTime(EE_Datetime_Field::now, $this->get_UTC_DateTimeZone());
+		}
+		// THEN apply the field's set DateTimeZone
+		EEH_DTT_Helper::setTimezone($DateTime, $this->_DateTimeZone);
+		return $DateTime;
+	}
+
+
+	/**
+	 * All this method does is determine if we're going to display the timezone string or not on any output.
+	 * To determine this we check if the set timezone offset is different than the blog's set timezone offset.
+	 * If so, then true.
+	 *
+	 * @return bool true for yes false for no
+	 * @throws Exception
+	 */
+	protected function _display_timezone(): bool
+	{
+		// first let's do a comparison of timezone strings.
+		// If they match then we can get out without any further calculations
+		$blog_string = get_option('timezone_string');
+		if ($blog_string === $this->_timezone_string) {
+			return false;
+		}
+		// now we need to calc the offset for the timezone string so we can compare with the blog offset.
+		$this_offset = $this->get_timezone_offset($this->_DateTimeZone);
+		$blog_offset = $this->get_timezone_offset($this->get_blog_DateTimeZone());
+		// now compare
+		return $blog_offset !== $this_offset;
+	}
+
+
+	/**
+	 * This method returns a php DateTime object for setting on the EE_Base_Class model.
+	 * EE passes around DateTime objects because they are MUCH easier to manipulate and deal
+	 * with.
+	 *
+	 * @param int|string|DateTime $date_string            This should be the incoming date string.  It's assumed to be
+	 *                                                    in the format that is set on the date_field (or DateTime
+	 *                                                    object)!
+	 * @return DateTime
+	 * @throws Exception
+	 * @throws Exception
+	 */
+	protected function _get_date_object($date_string)
+	{
+		// first if this is an empty date_string and nullable is allowed, just return null.
+		if ($this->_nullable && empty($date_string)) {
+			return null;
+		}
+
+		// if incoming date
+		if ($date_string instanceof DateTime) {
+			EEH_DTT_Helper::setTimezone($date_string, $this->_DateTimeZone);
+			return $date_string;
+		}
+		// if empty date_string and made it here.
+		// Return a datetime object for now in the given timezone.
+		if (empty($date_string)) {
+			return new DbSafeDateTime(EE_Datetime_Field::now, $this->_DateTimeZone);
+		}
+		// if $date_string is matches something that looks like a Unix timestamp let's just use it.
+		if (preg_match(EE_Datetime_Field::unix_timestamp_regex, $date_string)) {
+			try {
+				// This is operating under the assumption that the incoming Unix timestamp
+				// is an ACTUAL Unix timestamp and not the calculated one output by current_time('timestamp');
+				$DateTime = new DbSafeDateTime(EE_Datetime_Field::now, $this->_DateTimeZone);
+				$DateTime->setTimestamp($date_string);
+
+				return $DateTime;
+			} catch (Exception $e) {
+				// should be rare, but if things got fooled then let's just continue
+			}
+		}
+		// not a unix timestamp.  So we will use the set format on this object and set timezone to
+		// create the DateTime object.
+		$format = $this->_date_format . ' ' . $this->_time_format;
+		try {
+			$DateTime = DbSafeDateTime::createFromFormat($format, $date_string, $this->_DateTimeZone);
+			if (! $DateTime instanceof DbSafeDateTime) {
+				throw new EE_Error(
+					sprintf(
+						esc_html__('"%1$s" does not represent a valid Date Time in the format "%2$s".',
+							'event_espresso'),
+						$date_string,
+						$format
+					)
+				);
+			}
+		} catch (Exception $e) {
+			// if we made it here then likely then something went really wrong.
+			// Instead of throwing an exception, let's just return a DateTime object for now, in the set timezone.
+			$DateTime = new DbSafeDateTime(EE_Datetime_Field::now, $this->_DateTimeZone);
+		}
+
+		return $DateTime;
+	}
+
+
+	/**
+	 * get_timezone_transitions
+	 *
+	 * @param DateTimeZone $DateTimeZone
+	 * @param int|null     $time
+	 * @param bool|null    $first_only
+	 * @return array
+	 */
+	public function get_timezone_transitions(
+		DateTimeZone $DateTimeZone,
+		?int $time = null,
+		bool $first_only = true
+	): array {
+		return EEH_DTT_Helper::get_timezone_transitions($DateTimeZone, $time, $first_only);
+	}
+
+
+	/**
+	 * get_timezone_offset
+	 *
+	 * @param DateTimeZone $DateTimeZone
+	 * @param int|null     $time
+	 * @return mixed
+	 * @throws DomainException
+	 */
+	public function get_timezone_offset(DateTimeZone $DateTimeZone, ?int $time = null)
+	{
+		return EEH_DTT_Helper::get_timezone_offset($DateTimeZone, $time);
+	}
+
+
+	/**
+	 * This will take an incoming timezone string and return the abbreviation for that timezone
+	 *
+	 * @param string|null $timezone_string
+	 * @return string           abbreviation
+	 * @throws Exception
+	 */
+	public function get_timezone_abbrev(?string $timezone_string): string
+	{
+		$timezone_string = EEH_DTT_Helper::get_valid_timezone_string($timezone_string);
+		$dateTime        = new DateTime(EE_Datetime_Field::now, new DateTimeZone($timezone_string));
+		return $dateTime->format('T');
+	}
+
+
+	/**
+	 * Overrides the parent to allow for having a dynamic "now" value
+	 *
+	 * @return mixed
+	 */
+	public function get_default_value()
+	{
+		if ($this->_default_value === EE_Datetime_Field::now) {
+			return time();
+		}
+		return parent::get_default_value();
+	}
+
+
+	/**
+	 * Gets the default datetime object from the field's default time
+	 *
+	 * @return DbSafeDateTime|DateTime|null
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException*@throws Exception
+	 * @throws Exception
+	 * @since 4.9.66.p
+	 */
+	public function getDefaultDateTimeObj()
+	{
+		$default_raw = $this->get_default_value();
+		if ($default_raw instanceof DateTime) {
+			return $default_raw;
+		}
+		if (is_null($default_raw)) {
+			return null;
+		}
+		return new DbSafeDateTime(
+			$this->get_default_value(),
+			EEH_DTT_Helper::get_valid_timezone_string($this->get_timezone())
+		);
+	}
+
+
+	public function getSchemaDescription(): string
+	{
+		return sprintf(
+			esc_html__('%s - the value for this field is in the timezone of the site.', 'event_espresso'),
+			$this->get_nicename()
+		);
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -192,8 +192,8 @@ 
 
             default:
                 return $pretty
-                    ? trim($this->_pretty_date_format . ' ' . $this->_pretty_time_format)
-                    : trim($this->_date_format . ' ' . $this->_time_format);
+                    ? trim($this->_pretty_date_format.' '.$this->_pretty_time_format)
+                    : trim($this->_date_format.' '.$this->_time_format);
         }
     }
 
@@ -457,7 +457,7 @@ 
      */
     protected function _prepare_for_display(?DateTime $DateTime, $schema = false): string
     {
-        if (! $DateTime instanceof DateTime) {
+        if ( ! $DateTime instanceof DateTime) {
             if ($this->_nullable) {
                 return '';
             }
@@ -491,13 +491,13 @@ 
             if ($this->_display_timezone()) {
                 // must be explicit because schema could equal true.
                 if ($schema === 'no_html') {
-                    $timezone_string = ' (' . $DateTime->format('T') . ')';
+                    $timezone_string = ' ('.$DateTime->format('T').')';
                 } else {
-                    $timezone_string = ' <span class="ee_dtt_timezone_string">(' . $DateTime->format('T') . ')</span>';
+                    $timezone_string = ' <span class="ee_dtt_timezone_string">('.$DateTime->format('T').')</span>';
                 }
             }
 
-            return $DateTime->format($format_string) . $timezone_string;
+            return $DateTime->format($format_string).$timezone_string;
         }
         return $DateTime->format($format_string);
     }
@@ -515,7 +515,7 @@ 
     public function prepare_for_use_in_db($datetime_value): ?string
     {
         // we allow an empty value or DateTime object, but nothing else.
-        if (! empty($datetime_value) && ! $datetime_value instanceof DateTime) {
+        if ( ! empty($datetime_value) && ! $datetime_value instanceof DateTime) {
             throw new EE_Error(
                 sprintf(
                     esc_html__(
@@ -530,7 +530,7 @@ 
         }
 
         if ($datetime_value instanceof DateTime) {
-            if (! $datetime_value instanceof DbSafeDateTime) {
+            if ( ! $datetime_value instanceof DbSafeDateTime) {
                 $datetime_value = DbSafeDateTime::createFromDateTime($datetime_value);
             }
             EEH_DTT_Helper::setTimezone($datetime_value, $this->get_UTC_DateTimeZone());
@@ -570,7 +570,7 @@ 
                 $this->get_UTC_DateTimeZone()
             );
 
-        if (! $DateTime instanceof DbSafeDateTime) {
+        if ( ! $DateTime instanceof DbSafeDateTime) {
             // if still no datetime object, then let's just use now
             $DateTime = new DbSafeDateTime(EE_Datetime_Field::now, $this->get_UTC_DateTimeZone());
         }
@@ -648,10 +648,10 @@ 
         }
         // not a unix timestamp.  So we will use the set format on this object and set timezone to
         // create the DateTime object.
-        $format = $this->_date_format . ' ' . $this->_time_format;
+        $format = $this->_date_format.' '.$this->_time_format;
         try {
             $DateTime = DbSafeDateTime::createFromFormat($format, $date_string, $this->_DateTimeZone);
-            if (! $DateTime instanceof DbSafeDateTime) {
+            if ( ! $DateTime instanceof DbSafeDateTime) {
                 throw new EE_Error(
                     sprintf(
                         esc_html__('"%1$s" does not represent a valid Date Time in the format "%2$s".',

core/EE_Load_Textdomain.core.php

Indentation +123 added lines, -123 removed lines

@@ -14,127 +14,127 @@
  */
 class EE_Load_Textdomain extends EE_Base
 {
-    private const REPO_BASE_URL = 'https://raw.githubusercontent.com/eventespresso/languages-ee4/master/event_espresso';
-
-
-    /**
-     * holds the current lang in WP
-     *
-     * @var string
-     */
-    public static $locale;
-
-
-    /**
-     * this takes care of retrieving a matching textdomain for event espresso for the current WPLANG from EE GitHub
-     * repo (if necessary) and then loading it for translations. should only be called in wp plugins_loaded callback
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function load_textdomain()
-    {
-        EE_Load_Textdomain::loadTranslationsForLocale();
-        // now load the textdomain
-        if (!empty(EE_Load_Textdomain::$locale)) {
-            $github_mo_path = EE_LANGUAGES_SAFE_DIR . 'event_espresso-' . EE_Load_Textdomain::$locale . '.mo';
-            if (is_readable($github_mo_path)) {
-                load_plugin_textdomain('event_espresso', false, EE_LANGUAGES_SAFE_LOC);
-                return;
-            }
-            $glotpress_mo_path = EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . EE_Load_Textdomain::$locale . '.mo';
-            if (is_readable($glotpress_mo_path)) {
-                load_textdomain('event_espresso', $glotpress_mo_path);
-                return;
-            }
-        }
-        load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME) . '/languages/');
-    }
-
-
-    /**
-     * The purpose of this method is to sideload the language files for EE,
-     * this includes the POT file and the PO/MO files for the given WPLANG locale (if necessary).
-     *
-     * @access private
-     * @static
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function loadTranslationsForLocale()
-    {
-        EE_Load_Textdomain::$locale = get_locale();
-        // can't download a language file if a language isn't set <taps temple>
-        if (empty(EE_Load_Textdomain::$locale)) {
-            return;
-        }
-        $loaded_text_domains = new LoadedTextDomains();
-
-        // check if language files has already been sideloaded
-        if ($loaded_text_domains->hasVersion(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION)) {
-            return;
-        }
-
-        // clean up old text domain tracking
-        $LegacyTextDomainOptions = new LegacyTextDomainOptions($loaded_text_domains);
-        $LegacyTextDomainOptions->convertToConsolidatedFormat();
-
-        // load sideloader and sideload the .POT file as this should always be included.
-        $sideloader_args = array(
-            '_upload_to'     => EE_PLUGIN_DIR_PATH . 'languages/',
-            '_download_from' => EE_Load_Textdomain::REPO_BASE_URL . '.pot',
-            '_new_file_name' => 'event_espresso.pot',
-        );
-        /** @var EEH_Sideloader $sideloader */
-        $sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, false);
-        // sideload the .POT file only for main site of the network, or if not running Multisite.
-        if (is_main_site()) {
-            $sideloader->sideload();
-        }
-
-        // if locale is "en_US" then lets just get out, since Event Espresso core is already "en_US"
-        if (EE_Load_Textdomain::$locale === 'en_US') {
-            // but set option first else we'll forever be downloading the pot file
-            $loaded_text_domains->versionLoaded(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION);
-            return;
-        }
-        $repo_locale_URL = EE_Load_Textdomain::REPO_BASE_URL . '-' . EE_Load_Textdomain::$locale;
-        $file_name_base = 'event_espresso-' . EE_Load_Textdomain::$locale;
-
-        // made it here so let's get the language files from the GitHub repo, first the .mo file
-        $sideloader->set_download_from("$repo_locale_URL.mo");
-        $sideloader->set_new_file_name("$file_name_base.mo");
-        $mo_loaded = $sideloader->sideload();
-
-        // now the .po file:
-        $sideloader->set_download_from("$repo_locale_URL.po");
-        $sideloader->set_new_file_name("$file_name_base.po");
-        $po_loaded = $sideloader->sideload();
-
-        // set option so the above only runs when EE updates.
-        $loaded_text_domains->versionLoaded(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION);
-
-        if ($mo_loaded && $po_loaded) {
-            EE_Error::add_success(
-                sprintf(
-                    esc_html__(
-                        'Successfully downloaded the Event Espresso text domain for the "%1$s" locale.',
-                        'event_espresso'
-                    ),
-                    EE_Load_Textdomain::$locale
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-    }
+	private const REPO_BASE_URL = 'https://raw.githubusercontent.com/eventespresso/languages-ee4/master/event_espresso';
+
+
+	/**
+	 * holds the current lang in WP
+	 *
+	 * @var string
+	 */
+	public static $locale;
+
+
+	/**
+	 * this takes care of retrieving a matching textdomain for event espresso for the current WPLANG from EE GitHub
+	 * repo (if necessary) and then loading it for translations. should only be called in wp plugins_loaded callback
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function load_textdomain()
+	{
+		EE_Load_Textdomain::loadTranslationsForLocale();
+		// now load the textdomain
+		if (!empty(EE_Load_Textdomain::$locale)) {
+			$github_mo_path = EE_LANGUAGES_SAFE_DIR . 'event_espresso-' . EE_Load_Textdomain::$locale . '.mo';
+			if (is_readable($github_mo_path)) {
+				load_plugin_textdomain('event_espresso', false, EE_LANGUAGES_SAFE_LOC);
+				return;
+			}
+			$glotpress_mo_path = EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . EE_Load_Textdomain::$locale . '.mo';
+			if (is_readable($glotpress_mo_path)) {
+				load_textdomain('event_espresso', $glotpress_mo_path);
+				return;
+			}
+		}
+		load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME) . '/languages/');
+	}
+
+
+	/**
+	 * The purpose of this method is to sideload the language files for EE,
+	 * this includes the POT file and the PO/MO files for the given WPLANG locale (if necessary).
+	 *
+	 * @access private
+	 * @static
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function loadTranslationsForLocale()
+	{
+		EE_Load_Textdomain::$locale = get_locale();
+		// can't download a language file if a language isn't set <taps temple>
+		if (empty(EE_Load_Textdomain::$locale)) {
+			return;
+		}
+		$loaded_text_domains = new LoadedTextDomains();
+
+		// check if language files has already been sideloaded
+		if ($loaded_text_domains->hasVersion(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION)) {
+			return;
+		}
+
+		// clean up old text domain tracking
+		$LegacyTextDomainOptions = new LegacyTextDomainOptions($loaded_text_domains);
+		$LegacyTextDomainOptions->convertToConsolidatedFormat();
+
+		// load sideloader and sideload the .POT file as this should always be included.
+		$sideloader_args = array(
+			'_upload_to'     => EE_PLUGIN_DIR_PATH . 'languages/',
+			'_download_from' => EE_Load_Textdomain::REPO_BASE_URL . '.pot',
+			'_new_file_name' => 'event_espresso.pot',
+		);
+		/** @var EEH_Sideloader $sideloader */
+		$sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, false);
+		// sideload the .POT file only for main site of the network, or if not running Multisite.
+		if (is_main_site()) {
+			$sideloader->sideload();
+		}
+
+		// if locale is "en_US" then lets just get out, since Event Espresso core is already "en_US"
+		if (EE_Load_Textdomain::$locale === 'en_US') {
+			// but set option first else we'll forever be downloading the pot file
+			$loaded_text_domains->versionLoaded(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION);
+			return;
+		}
+		$repo_locale_URL = EE_Load_Textdomain::REPO_BASE_URL . '-' . EE_Load_Textdomain::$locale;
+		$file_name_base = 'event_espresso-' . EE_Load_Textdomain::$locale;
+
+		// made it here so let's get the language files from the GitHub repo, first the .mo file
+		$sideloader->set_download_from("$repo_locale_URL.mo");
+		$sideloader->set_new_file_name("$file_name_base.mo");
+		$mo_loaded = $sideloader->sideload();
+
+		// now the .po file:
+		$sideloader->set_download_from("$repo_locale_URL.po");
+		$sideloader->set_new_file_name("$file_name_base.po");
+		$po_loaded = $sideloader->sideload();
+
+		// set option so the above only runs when EE updates.
+		$loaded_text_domains->versionLoaded(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION);
+
+		if ($mo_loaded && $po_loaded) {
+			EE_Error::add_success(
+				sprintf(
+					esc_html__(
+						'Successfully downloaded the Event Espresso text domain for the "%1$s" locale.',
+						'event_espresso'
+					),
+					EE_Load_Textdomain::$locale
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -40,19 +40,19 @@ 
     {
         EE_Load_Textdomain::loadTranslationsForLocale();
         // now load the textdomain
-        if (!empty(EE_Load_Textdomain::$locale)) {
-            $github_mo_path = EE_LANGUAGES_SAFE_DIR . 'event_espresso-' . EE_Load_Textdomain::$locale . '.mo';
+        if ( ! empty(EE_Load_Textdomain::$locale)) {
+            $github_mo_path = EE_LANGUAGES_SAFE_DIR.'event_espresso-'.EE_Load_Textdomain::$locale.'.mo';
             if (is_readable($github_mo_path)) {
                 load_plugin_textdomain('event_espresso', false, EE_LANGUAGES_SAFE_LOC);
                 return;
             }
-            $glotpress_mo_path = EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . EE_Load_Textdomain::$locale . '.mo';
+            $glotpress_mo_path = EE_LANGUAGES_SAFE_DIR.'event-espresso-4-'.EE_Load_Textdomain::$locale.'.mo';
             if (is_readable($glotpress_mo_path)) {
                 load_textdomain('event_espresso', $glotpress_mo_path);
                 return;
             }
         }
-        load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME) . '/languages/');
+        load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME).'/languages/');
     }
 
 
@@ -89,8 +89,8 @@ 
 
         // load sideloader and sideload the .POT file as this should always be included.
         $sideloader_args = array(
-            '_upload_to'     => EE_PLUGIN_DIR_PATH . 'languages/',
-            '_download_from' => EE_Load_Textdomain::REPO_BASE_URL . '.pot',
+            '_upload_to'     => EE_PLUGIN_DIR_PATH.'languages/',
+            '_download_from' => EE_Load_Textdomain::REPO_BASE_URL.'.pot',
             '_new_file_name' => 'event_espresso.pot',
         );
         /** @var EEH_Sideloader $sideloader */
@@ -106,8 +106,8 @@ 
             $loaded_text_domains->versionLoaded(EE_Load_Textdomain::$locale, EVENT_ESPRESSO_VERSION);
             return;
         }
-        $repo_locale_URL = EE_Load_Textdomain::REPO_BASE_URL . '-' . EE_Load_Textdomain::$locale;
-        $file_name_base = 'event_espresso-' . EE_Load_Textdomain::$locale;
+        $repo_locale_URL = EE_Load_Textdomain::REPO_BASE_URL.'-'.EE_Load_Textdomain::$locale;
+        $file_name_base = 'event_espresso-'.EE_Load_Textdomain::$locale;
 
         // made it here so let's get the language files from the GitHub repo, first the .mo file
         $sideloader->set_download_from("$repo_locale_URL.mo");