Changeset 2768343

Timestamp:

08/09/2022 11:40:40 AM (3 years ago)

Author:

tivnet

Message:

2.10.3

Location:

wpglobus/trunk

Files:

• flags/vi.alt.png (added)
• includes/class-wpglobus-filters.php (modified) (3 diffs)
• language-switcher-sample.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)
• wpglobus.php (modified) (2 diffs)

wpglobus/trunk/includes/class-wpglobus-filters.php

@@ -508 +508 @@
      * Filter for @see get_locale
      *
-     * @param string $locale
+     * @param string $locale Locale.
      *
      * @return string
@@ -516 +516 @@
      * @example echo setlocale(LC_ALL, 'Russian'); => Russian_Russia.1251
      */
-    public static function filter__get_locale(
-        /** @noinspection PhpUnusedParameterInspection */
-        $locale
-    ) {
-
-        /**
-         * @todo This caching breaks the admin language switcher.
-         */
-        /*      static $cached_locale = null;
-                if ( null !== $cached_locale ) {
-                    return $cached_locale;
-                }*/
+    public static function filter__get_locale( $locale ) {
+
+        static $cached_locale = null;
 
         /**
          * Special case: in admin area, show everything in the language of admin interface.
          * (set in the General Settings in WP 4.1)
-         */
-        /**
-         * @internal
          * We need to exclude is_admin when it's a front-originated AJAX,
-         * so we are doing a "hack" checking @see WPGlobus_WP::is_admin_doing_ajax.
+         * so we are doing a "hack" checking.
+         *
+         * @see WPGlobus_WP::is_admin_doing_ajax.
          */
         if (
@@ -544 +534 @@
         ) {
             /**
-             * @todo is_multisite
-             * @todo Pre-WP4, WPLANG constant from wp-config
+             * Set locale in admin area using WPLANG option.
+             *
+             * @since 2.10.3 Do not set if WPLANG is empty.
              */
-            $WPLANG = get_option( 'WPLANG' );
-            if ( empty( $WPLANG ) ) {
-                $WPLANG = 'en_US';
-            }
-            WPGlobus::Config()->set_language( $WPLANG );
-
-        }
-
-        if ( is_admin() ) {
+            $wp_lang = get_option( 'WPLANG' );
+            if ( ! empty( $wp_lang ) ) {
+                WPGlobus::Config()->set_language( $wp_lang );
+            }
+        } else {
             /**
-             * Checking case for set locale which does not set in WPGlobus
+             * Caching breaks the admin language switcher. So, use only when not in admin area.
+             * @since 2.10.3
              */
-            if ( WPGlobus::Config()->is_enabled_locale( $locale ) ) {
-                $locale = WPGlobus::Config()->locale[ WPGlobus::Config()->language ];
-            }
-        } else {
-            $locale = WPGlobus::Config()->locale[ WPGlobus::Config()->language ];
-        }
-
-        /*      $cached_locale = $locale;*/
+            if ( null !== $cached_locale ) {
+                return $cached_locale;
+            }
+        }
+
+        /**
+         * Only set locale if it's enabled in WPGlobus.
+         *
+         * @since 2.10.3 - check always, not only in admin.
+         * @since 2.10.3 - Update cache.
+         */
+        if ( WPGlobus::Config()->is_enabled_locale( $locale ) ) {
+            $locale        = WPGlobus::Config()->locale[ WPGlobus::Config()->language ];
+            $cached_locale = $locale;
+        }
 
         return $locale;
-
     }
 

wpglobus/trunk/language-switcher-sample.php

@@ -66 +66 @@
  * WPGlobus language switcher.
  * Example 3: If you need to hide extra languages from the switcher on the category or tag page.
+ *
+ * You can add this code to your active theme's `functions.php` file.
+ * Please note the information about the child theme
+ * https://developer.wordpress.org/themes/advanced-topics/child-themes/
  */
 if ( class_exists( 'WPGlobus' ) ):
@@ -83 +87 @@
  * Example 4: You can remove the language switcher from a particular page at all.
  * @since WPGlobus v.2.10.2
+ *
+ * You can add this code to your active theme's `functions.php` file.
+ * Please note the information about the child theme
+ * https://developer.wordpress.org/themes/advanced-topics/child-themes/ 
  */
 if ( class_exists( 'WPGlobus' ) ):

wpglobus/trunk/readme.txt

@@ -219 +219 @@
 == Changelog ==
 
+= 2.10.3 =
+* (Core/Filters) Code cleanup: `filter__get_locale()` in `class-wpglobus-filters.php`.
+* (Options/Languages table) Added the `vi.alt.png` flag.
+* (Internal) `package.json` - patches for the new `npm`.
+
 = 2.10.2 =
 * (Core/WPGlobus About) Removed obsolete information.

wpglobus/trunk/wpglobus.php

@@ -16 +16 @@
  * Text Domain: wpglobus
  * Domain Path: /languages/
- * Version: 2.10.2
+ * Version: 2.10.3
  * Author: WPGlobus
  * Author URI: https://wpglobus.com/
@@ -45 +45 @@
 }
 
-define( 'WPGLOBUS_VERSION', '2.10.2' );
+define( 'WPGLOBUS_VERSION', '2.10.3' );
 define( 'WPGLOBUS_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
 define( 'WPGLOBUS_AJAX', 'wpglobus-ajax' );