| @@ -9,9 +9,8 @@ | ||
| 9 | 9 | use WPAdminify\Inc\Classes\Feedback; |
| 10 | 10 | use WPAdminify\Inc\Admin\AdminSettings; |
| 11 | 11 | use WPAdminify\Inc\Classes\Pro_Upgrade; |
| 12 | 12 | use WPAdminify\Inc\Classes\Addons_Plugins; |
| 13 | -use WPAdminify\Inc\Classes\GoogleFontsLocal; | |
| 14 | 13 | use WPAdminify\Inc\Classes\Notifications\Notifications; |
| 15 | 14 | // No, Direct access Sir !!! |
| 16 | 15 | if ( !defined( 'ABSPATH' ) ) { |
| 17 | 16 | exit; |
| @@ -29,16 +28,12 @@ | ||
| 29 | 28 | // add_action('plugins_loaded', array($this, 'jltwp_adminify_plugins_loaded'), 999); |
| 30 | 29 | add_filter( 'plugin_action_links_' . WP_ADMINIFY_BASE, array($this, 'plugin_action_links') ); |
| 31 | 30 | add_filter( 'network_admin_plugin_action_links_' . WP_ADMINIFY_BASE, array($this, 'plugin_action_links') ); |
| 32 | 31 | add_filter( 'admin_body_class', array($this, 'jltwp_adminify_body_class'), 99 ); |
| 33 | - // Load textdomain and include files on init for WP 6.7+ compatibility | |
| 34 | - // Textdomain must be loaded before files that use translations | |
| 35 | - // Priority order: 0=textdomain, 1=include files (registers options), 5=framework setup | |
| 36 | - add_action( 'init', array($this, 'jltwp_adminify_load_textdomain'), 0 ); | |
| 37 | - add_action( 'init', array($this, 'jltwp_adminify_include_files'), 1 ); | |
| 38 | - add_action( 'init', array($this, 'jltwp_is_plugin_row_meta'), 1 ); | |
| 32 | + add_action( 'plugins_loaded', array($this, 'jltwp_is_plugin_row_meta') ); | |
| 33 | + add_action( 'plugins_loaded', array($this, 'jltwp_adminify_include_files') ); | |
| 39 | 34 | $is_finished = get_option( 'jltwp_adminify_setup_wizard_ran' ); |
| 40 | - if ( $is_finished !== '1' ) { | |
| 35 | + if ( !empty( $is_finished ) || $is_finished != '1' ) { | |
| 41 | 36 | if ( apply_filters( 'jltwp_adminify_show_setup_wizard', true ) ) { |
| 42 | 37 | new \WPAdminify\Inc\Classes\Wizard\Setup_Wizard(); |
| 43 | 38 | set_transient( '_adminify_activation_redirect', 1, 30 ); |
| 44 | 39 | } |
| @@ -46,9 +41,9 @@ | ||
| 46 | 41 | jltwp_adminify()->add_filter( 'pricing_url', [$this, 'jltwp_adminify_pricing_url'] ); |
| 47 | 42 | } |
| 48 | 43 | |
| 49 | 44 | function jltwp_adminify_pricing_url( $pricing_url ) { |
| 50 | - $pricing_url = 'https://wpadminify.com/pricing'; | |
| 45 | + $pricing_url = 'https://jeweltheme.com'; | |
| 51 | 46 | return $pricing_url; |
| 52 | 47 | } |
| 53 | 48 | |
| 54 | 49 | public function jltwp_is_plugin_row_meta() { |
| @@ -98,9 +93,9 @@ | ||
| 98 | 93 | if ( WP_ADMINIFY_BASE === $plugin_file ) { |
| 99 | 94 | $row_meta = array( |
| 100 | 95 | 'docs' => sprintf( '<a href="%1$s" target="_blank">%2$s</a>', esc_url_raw( 'https://wpadminify.com/kb' ), __( 'Docs', 'adminify' ) ), |
| 101 | 96 | 'changelogs' => sprintf( '<a href="%1$s" target="_blank">%2$s</a>', esc_url_raw( 'https://wpadminify.com/changelogs/' ), __( 'Changelogs', 'adminify' ) ), |
| 102 | - 'tutorials' => '<a href="https://www.youtube.com/playlist?list=PLqpMw0NsHXV-EKj9Xm1DMGa6FGniHHly8" aria-label="' . esc_attr( __( 'View Adminify Video Tutorials', 'adminify' ) ) . '" target="_blank">' . __( 'Video Tutorials', 'adminify' ) . '</a>', | |
| 97 | + 'tutorials' => '<a href="https://www.youtube.com/playlist?list=PLqpMw0NsHXV-EKj9Xm1DMGa6FGniHHly8" aria-label="' . esc_attr( __( 'View WP Adminify Video Tutorials', 'adminify' ) ) . '" target="_blank">' . __( 'Video Tutorials', 'adminify' ) . '</a>', | |
| 103 | 98 | ); |
| 104 | 99 | $plugin_meta = array_merge( $plugin_meta, $row_meta ); |
| 105 | 100 | } |
| 106 | 101 | return $plugin_meta; |
| @@ -136,10 +131,8 @@ | ||
| 136 | 131 | new Feedback(); |
| 137 | 132 | new Notifications(); |
| 138 | 133 | new Pro_Upgrade(); |
| 139 | 134 | new Addons_Plugins(); |
| 140 | - // Initialize Google Fonts Local early to catch option updates | |
| 141 | - GoogleFontsLocal::get_instance(); | |
| 142 | 135 | } |
| 143 | 136 | |
| 144 | 137 | public function jltwp_adminify_init() { |
| 145 | 138 | // Backup for OLD Database |
| @@ -148,8 +141,10 @@ | ||
| 148 | 141 | if ( version_compare( $current_version, WP_ADMINIFY_VER, '<' ) && empty( $is_backup ) ) { |
| 149 | 142 | $old_data = get_option( '_wpadminify' ); |
| 150 | 143 | update_option( '_wpadminify_backup', $old_data ); |
| 151 | 144 | } |
| 145 | + // Load Text Domain | |
| 146 | + $this->jltwp_adminify_load_textdomain(); | |
| 152 | 147 | } |
| 153 | 148 | |
| 154 | 149 | /** |
| 155 | 150 | * Loads the text domain for localization. |
| @@ -162,11 +157,14 @@ | ||
| 162 | 157 | * |
| 163 | 158 | * @return void |
| 164 | 159 | */ |
| 165 | 160 | public function jltwp_adminify_load_textdomain() { |
| 166 | - $locale = apply_filters( 'plugin_locale', get_locale(), 'adminify' ); | |
| 167 | - load_textdomain( 'adminify', WP_LANG_DIR . '/adminify/adminify-' . $locale . '.mo' ); | |
| 168 | - load_plugin_textdomain( 'adminify', false, dirname( WP_ADMINIFY_BASE ) . '/languages/' ); | |
| 161 | + add_action( 'init', function () { | |
| 162 | + $domain = 'adminify'; | |
| 163 | + $locale = apply_filters( 'plugin_locale', get_locale(), $domain ); | |
| 164 | + load_textdomain( $domain, WP_LANG_DIR . '/' . $domain . '/' . $domain . '-' . $locale . '.mo' ); | |
| 165 | + load_plugin_textdomain( $domain, false, dirname( WP_ADMINIFY_BASE ) . '/languages/' ); | |
| 166 | + } ); | |
| 169 | 167 | } |
| 170 | 168 | |
| 171 | 169 | // Activation Hook |
| 172 | 170 | public static function jltwp_adminify_activation_hook() { |
| @@ -172,11 +170,8 @@ | ||
| 172 | 170 | public static function jltwp_adminify_activation_hook() { |
| 173 | 171 | $current_adminify_version = get_option( 'wp_adminify_version', null ); |
| 174 | 172 | if ( get_option( 'jltwp_adminify_activation_time' ) === false ) { |
| 175 | 173 | update_option( 'jltwp_adminify_activation_time', strtotime( 'now' ) ); |
| 176 | - } | |
| 177 | - if ( "dismissed" === get_option( '_wpadminify_plugin_update_info_notice', true ) ) { | |
| 178 | - update_option( '_wpadminify_plugin_update_info_notice', '' ); | |
| 179 | 174 | } |
| 180 | 175 | if ( is_null( $current_adminify_version ) ) { |
| 181 | 176 | update_option( 'wp_adminify_version', self::VERSION ); |
| 182 | 177 | } |