Changeset 676953

Timestamp:

03/06/2013 04:56:12 PM (11 years ago)

Author:

stephenh1988

Message:

Merging 1.7.1

Location:

wcm-user-language-switcher/trunk

Files:

• .gitignore (modified) (2 diffs)
• README.md (modified) (4 diffs)
• dev_tools.class.php (modified) (4 diffs)
• readme.txt (modified) (3 diffs)
• wcm_lang_switch.class.php (modified) (15 diffs)

wcm-user-language-switcher/trunk/.gitignore

@@ -2 +2 @@
 .DSSTORE
 .gitignore
+
+
+
 
 # SVN
@@ -20 +23 @@
 .settings
 
-# PSD
-.psd/*
-.psd
+# PSD
+/*
+.

wcm-user-language-switcher/trunk/README.md

@@ -3 +3 @@
 <img width="150" height="150" src="https://raw.github.com/wecodemore/wcm_lang_switch/master/assets/logo.png" />
 
-**Contributors:** [Stephen Harris](https://github.com/stephenh1988), [Franz Josef Kaiser](https://github.com/franz-josef-kaiser)
+**Contributors:** [Stephen Harris](https://github.com/stephenh), [Franz Josef Kaiser](https://github.com/franz-josef-kaiser)
 **Tags:** Language, switcher, localisation
-**Tested up to:** 3.5
-**Stable tag:** 1.6.1
-**Requires at least:** 3.5
+**Tested up to:** 3.5
+**Stable tag:** 1..1
+**Requires at least:** 3.5
 **License:** GPL3
 **License URI:** http://www.gnu.org/licenses/gpl-3.0.html
@@ -28 +28 @@
 Extract the zip file and just drop the contents in the `~/wp-content/plugins/` directory of your WordPress installation and then activate the Plugin from Plugins page.
 
-    It scans the language directory to build the list of available languages. To add a language, simple [download the appropriate mo file](http://codex.wordpress.org/WordPress_in_Your_Language) and add to your WordPress `languages` folder.
+It scans the language directory to build the list of available languages. To add a language, simple [download the appropriate mo file](http://codex.wordpress.org/WordPress_in_Your_Language) and add to your WordPress `languages` folder.
 
 This plugin was originally built as a means of plugin and theme developers to test translations of their plugins or themes.
@@ -40 +40 @@
     <?php
     /* Plugin Name:** (WCM) Add additional languages */
-    add_filter( 'uls_get_langs', 'wcm_add_languages' );
+    add_filter( '_get_langs', 'wcm_add_languages' );
     function wcm_add_languages( $languages )
     {
@@ -57 +57 @@
 
 ## Changelog ##
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 ### 1.6 ###

wcm-user-language-switcher/trunk/dev_tools.class.php

@@ -8 +8 @@
  * @since      1.3
  */
-class WCMUserLangSelectDevTools extends WCMUserLangSelect
+class WCM
 {
     public function __construct()
@@ -71 +71 @@
                 // If we found one, assign it to the array, else empty
                 $nn = ! $nn ? $string : ucwords( $native[ $nn ]['nativeName'] );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 $output[ $l ] = array(
-                     'int'    => $string
-                    ,'native' => $nn
+                     'int'    => 
+                    ,'native' => 
                 );
             }
@@ -81 +134 @@
             return;
 
-        # Test if native strings work
-        # foreach ( $output as $k => $v )
-        #   printf ( "<p>%s</p>", $v['native'] );
-
-        $output = json_encode( $output );
-        $output_raw = $this->beautify_json( $output );
-
+        # Output for a complete ISO 639-2 list
+        /* printf(
+            '<textarea rows="5" cols="104">%s</textarea>'
+            ,json_encode( $output )
+        );*/
+
+        // Only use the first string for WP UI
+        foreach ( $output as $code => $out )
+            foreach ( $out as $k => $o )
+            {
+                $output[ $code ][ $k ] = array_shift( $o );
+            }
+
+        printf ( '<p>%s</p>', 'Number of languages' );
+        printf(
+            '<input type="text" value="%s" />'
+            ,count( $output )
+        );
         printf ( '<p>%s</p>', 'Readable' );
         printf(
             '<textarea rows="5" cols="104">%s</textarea>'
-            ,$output_raw
+            ,$
         );
         printf ( '<p>%s</p>', 'Compressed' );
         printf(
              '<textarea rows="5" cols="104">%s</textarea>'
-            ,$output
+            ,
         );
 
         return;
         # Remove the above `return;` to get a DIFF of the changes
-        $this->diff_json( $output_raw );
+        $this->diff_json( $ );
     }
 
@@ -143 +207 @@
         $output_current = file_get_contents( plugin_dir_path( __FILE__ ).'/json/lang_codes.json' );
         print wp_text_diff(
-            var_export( $output_current, true )
+            var_export( $output_current, true )
             ,var_export( $output_remote, true )
             ,array(
-                'title'       => 'Dev: Changes since last JSON file fetch'
-            ,'title_left'  => 'Current data'
-            ,'title_right' => 'New fetched data'
+                'title'       => 'Dev: Changes since last JSON file fetch'
+            ,'title_left'  => 'Current data'
+            ,'title_right' => 'New fetched data'
             )
         );

wcm-user-language-switcher/trunk/readme.txt

@@ -2 +2 @@
 Contributors: stephenharris, F J Kaiser
 Tags: Language, switcher, localisation
-Tested up to: 3.5
-Stable tag: 1.6.1
+Tested up to: 3.5
+Stable tag: 1..1
 Requires at least: 3.5
 License: GPL3
@@ -38 +38 @@
     <?php
     /* Plugin Name: (WCM) Add additional languages */
-    add_filter( 'uls_get_langs', 'wcm_add_languages' );
+    add_filter( '_get_langs', 'wcm_add_languages' );
     function wcm_add_languages( $languages )
     {
@@ -54 +54 @@
 
 == Changelog ==
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 = 1.6 =

wcm-user-language-switcher/trunk/wcm_lang_switch.class.php

@@ -1 +1 @@
 <?php
-! defined( 'ABSPATH' ) AND exit;
+ exit;
 /*
 Plugin Name:  User Language Switcher
@@ -7 +7 @@
 Author:       Stephen Harris
 Author URI:   https://plus.google.com/b/109907580576615571040/109907580576615571040/posts
-Contributors: Franz Josef Kaiser
-Version:      1.6.1
+Contributors: Franz Josef Kaiser
+Version:      1..1
 License:      GNU GPL 3
 */
@@ -14 +14 @@
 
 # PUBLIC API #
+
+
+
+
+
+
+
+
+
+
+
+
 /**
  * A function returns with returns the user's selected locale, if stored.
  *
  * @since  0.1
- *
  * @param  bool $locale
- * @return mixed string/bool $locale
+ * @return mixed string/bool $locale
  */
-function wcm_get_user_locale( $locale = false )
+function wcm_get_user_l( $locale = false )
 {
-    if ( $new_locale = get_user_meta(
+    if ( $ = get_user_meta(
          get_current_user_id()
         ,'user_language'
         ,true
     ) )
-         return $new_locale;
+         return $;
 
     return $locale;
 }
 
-add_action( 'plugins_loaded', array( 'WCMUserLangSelect', 'init' ) );
-
+add_action( 'plugins_loaded', array( 'WCM_User_Lang_Switch', 'init' ), 5 );
 /**
  * Allows the user to change the systems language.
@@ -48 +58 @@
  * @subpackage User Language Change
  */
-class WCMUserLangSelect
+class WCM
 {
     /**
@@ -65 +75 @@
      * @var    string
      */
-    static public $name = 'uls_pick_lang';
+    static public $name = '_lang';
 
     /**
@@ -88 +98 @@
      * @since  0.2
      * @static
-     * @return void
+     * @return 
      */
     static public function init()
     {
-        is_null( self :: $instance ) AND self :: $instance = new self;
-        return self :: $instance;
+        $instance = new self;
+        return self$instance;
     }
 
@@ -118 +128 @@
         }
 
-        ! defined( 'WPLANG' ) AND define( 'WPLANG', $meta );
+        defined( 'WPLANG' )
+            OR define( 'WPLANG', $meta );
 
         // Use the global $locale instead of get_locale() to prevent endless loops
@@ -130 +141 @@
      * Hook the functions
      * @since  0.1
-     * @return \WCMUserLangSelect
+     * @return \WCM
      */
     public function __construct()
     {
-        if ( isset( $_REQUEST[ self :: $name ] ) )
+        if ( isset( $_REQUEST[ self$name ] ) )
             add_action( 'locale', array( $this, 'update_user' ) );
 
-        add_filter( 'locale', 'wcm_get_user_locale', 20 );
+        add_filter( 'locale', 'wcm_get_user_l', 20 );
         add_action( 'wp_before_admin_bar_render', array( $this, 'admin_bar') );
 
@@ -158 +169 @@
              get_current_user_id()
             ,'user_language'
-            ,$_REQUEST[ self :: $name ]
+            ,$_REQUEST[ self$name ]
         );
 
-        return wcm_get_user_locale( $locale );
+        return wcm_get_user_l( $locale );
     }
 
@@ -168 +179 @@
      * The 'drop down' for the admin bar
      *
-     * Based on Thomas "toscho" Scholz answer on the following WPSE question by Stephen Harris:
-     * @link http://wordpress.stackexchange.com/questions/57606/obtain-a-list-of-available-translations/57609
+     * Based on Thomas "toscho" Scholz answer on the following WPSE question by Stephen Harris:
+     * @link http://
      *
      * @since   0.1
@@ -184 +195 @@
         $locale  = get_locale();
 
-        $wp_admin_bar->add_menu( array(
-             'id'    => 'user_lang_pick'
-            ,'title' => $this->format_code_lang( $locale )
+        $current = $this->format_code_lang( $locale );
+        $wp_admin_bar->add_node( array(
+             'id'    => 'wcm_user_lang_pick'
+            ,'title' => $current
             ,'href'  => '#'
+
+
+
         ) );
 
@@ -194 +209 @@
             $name = $this->format_code_lang( $lang );
             $link = add_query_arg(
-                 self :: $name
+                 self$name
                 ,$lang
             );
 
-            $locale == $lang AND $name = sprintf(
+            $locale == $lang AND $name = sprintf(
                  '<strong> %s </strong>'
                 ,$name
-            );
-
-            $wp_admin_bar->add_menu( array(
-                 'parent' => 'user_lang_pick'
-                ,'id'     => "user_lang_pick_lang_{$lang}"
+            );*/
+
+            // Don't add the current language as menu item
+            if ( $lang === wcm_get_user_lang( 'en_US' ) )
+                continue;
+
+            $wp_admin_bar->add_node( array(
+                 'parent' => 'wcm_user_lang_pick'
+                ,'id'     => "wcm_user_lang_pick-{$lang}"
                 ,'title'  => $name
                 ,'href'   => $link
+
+
+
+
+
+
+
+
             ) );
         }
@@ -216 +243 @@
      * Get Languages
      * @since  0.3
-     * @return void
+     * @return 
      */
     public function get_langs()
     {
-        return apply_filters( 'uls_get_langs', array_merge(
+        return apply_filters( '_get_langs', array_merge(
              get_available_languages()
             ,array( 'en_US' )
@@ -236 +263 @@
      * @since  0.2
      * @link   http://codex.wordpress.org/Function_Reference/format_code_lang
-         *
+     *
      * @param  string $code Language code, e.g. en_US or en
-     * @return string The human readable language name, e.g. 'English' or the input on Error.
+     * @param  string $part Which part to return: International or native name?
+     * @return string The human readable language name, e.g. 'English', or the input on Error.
     */
-    public function format_code_lang( $code = '' )
-    {
-
+    public function format_code_lang( $code = '', $part = 'native' )
+    {
         $label_code = strtok( strtolower( $code ), "_" );
-        if ( is_null( self :: $lang_codes ) )
-            self :: $lang_codes =  json_decode( reset( file( plugin_dir_path( __FILE__ ).'/json/lang_codes.min.json' ) ), true );
-
-        if ( 0 !== json_last_error() )
+        if ( null === self::$lang_codes )
+        {
+            $iso_639_2 = file( plugin_dir_path( __FILE__ ).'/json/lang_codes.min.json' );
+            self::$lang_codes = json_decode( reset( $iso_639_2 ), true );
+        }
+
+        # PHP >= 5.3.0 only...
+        # if ( 0 !== json_last_error() )
+        if ( ! empty( self::$lang_codes['error'] ) )
             return $code;
 
-        $lang_codes = apply_filters( 'lang_codes', self :: $lang_codes, $code );
-        $user_locale = wcm_get_user_locale( 'en_US' );
+        $lang_codes = apply_filters( 'wcm_lang_codes', self::$lang_codes, $code );
 
         if ( ! isset( $lang_codes[ $label_code ] ) )
             return $code;
-        if( $user_locale == $code )
-            return $lang_codes[ $label_code ][ 'native' ];
-        else
-            return $lang_codes[ $label_code ][ 'int' ];
+
+        return $lang_codes[ $label_code ][ $part ];
     }
 
@@ -270 +299 @@
 
         include_once plugin_dir_path( __FILE__ ).'/dev_tools.class.php';
-        new WCMUserLangSelectDevTools();
+        new WCMDevTools();
     }
 }