Changeset 1604369

Timestamp:

02/27/2017 09:50:17 AM (9 years ago)

Author:

Asumaru

Message:

0.2

• po/mo files updated.
• Language column on the Table of Sites in network added.
• Language flags in Admin-Bar displayed.
• Malfunction of WPLANG in the setting-general supported.

Location:

msls-gouping/trunk

Files:

• asm-MSLS-Grouping.php (modified) (1 diff)
• inc/asm-MSLS-Grouping.php (modified) (27 diffs)
• languages/asm-msls-grouping-ja.mo (modified) (previous)
• languages/asm-msls-grouping-ja.po (modified) (4 diffs)
• languages/asm-msls-grouping-ja_JP.mo (modified) (previous)
• languages/asm-msls-grouping-ja_JP.po (modified) (4 diffs)
• languages/asm-msls-grouping.pot (modified) (3 diffs)
• languages/default.pot (modified) (3 diffs)
• readme.txt (modified) (6 diffs)

msls-gouping/trunk/asm-MSLS-Grouping.php

@@ -5 +5 @@
 Description: You can multilingualize by 'Multisite Language Switcher' with grouping the sites of the plural same languages.
 Author: Asumaru Corp.
-Version: 0.1
+Version: 0.2
 Author URI: http://asumaru.com/
 Created: 2017.01.01

msls-gouping/trunk/inc/asm-MSLS-Grouping.php

@@ -5 +5 @@
 Description: You can multilingualize by 'Multisite Language Switcher' with grouping the sites of the plural same languages.
 Author: Asumaru Corp.
-Version: 0.1
+Version: 0.2
 Author URI: http://asumaru.com/
 Created: 2017.01.01
+Updated: 2017.03.01
 
 */
 
+/**
+ * Global variable. Orignal text domain.
+ *
+ * @since 0.1
+**/
 $asm_textdomain = 'asm-msls-grouping';
 
-
 /**
-    @class : Base Class
+ * Core class.
+ *
+ * @since 0.1
 **/
 class asm_MSLS_Grouping_Class{
 
-    var $funcs = array();
-    var $cache = array();
-    var $defaults = array(
+    /**
+     * Any functions.
+     *
+     * @since 0.1
+     * @var array
+     * @access private
+     */
+    private $funcs = array();
+
+    /**
+     * Variable caching.
+     *
+     * @since 0.1
+     * @var array
+     * @access private
+     */
+    private $cache = array();
+
+    /**
+     * Variable defaults.
+     *
+     * @since 0.1
+     * @var array
+     * @access public
+     */
+    public $defaults = array(
         'atts'  => array(
             'name'  => '',
@@ -27 +57 @@
         ),
         'site_options' => array(
-            'allow_duplicate_languages' => array( false, 'checkbox', 'Allow Duplicate Languages', 'You allow for the same language to repeat in "Multisite Language Switcher".' ),
+            'allow_duplicate_languages' => array( false, 'checkbox', "Allow Duplicate Languages", "You allow for the same language to repeat in 'Multisite Language Switcher'." ),
         ),
         'sc_args'   => array(
@@ -47 +77 @@
 ',
     );
-    var $noGroup = '-- no group --';
-    var $emptyLang = 'us';
-    var $allow_duplicate_languages = false;
-
-
-    /**
-        @function : Constractor for PHP 4
-        @param : void
-        @return : void
-     */
-    function asm_MSLS_Grouping_Class(){
-        
-        // Initialize
+
+    /**
+     * Default strings for no groupkey.
+     *
+     * @since 0.1
+     * @var string
+     * @access public
+     */
+    public $noGroup = '-- no group --';
+
+    /**
+     * Default locale and language.
+     *
+     * @since 0.1
+     * @var array
+     * @access public
+     */
+    public $emptyLang = array( 'us', 'en_US' );
+
+    /**
+     * Default boolean to allow duplicate languages.
+     *
+     * @since 0.1
+     * @var bool
+     * @access public
+     */
+    public $allow_duplicate_languages = false;
+
+    /**
+     * Constractor for PHP 4
+     *
+     * @since 0.1
+     * @access public
+     */
+    public function asm_MSLS_Grouping_Class(){
         add_action( 'init', array( &$this, 'init'), 20);
 
         if( is_admin() ){
-            add_action( 'admin_init',    array( &$this, 'admin_init' ), 20 );
-        }
-
-        // i10n
+            add_action( 'admin_init', array( &$this, 'admin_init' ), 20 );
+        }
+
         add_action( 'plugins_loaded', array( &$this, 'load_plugin_textdomain' ), 20);
 
-        // Regist Widget
         add_action( 'widgets_init', create_function('', 'return register_widget("asm_SameLangSites_Widget");') );
 
-    }
-
-
-    /**
-        @function : Constractor
-        @param : void
-        @return : void
-    **/
-    function __construct(){
+        if( apply_filters( 'asm_language-flugs.admin-bar', true ) ){
+            add_action( 'admin_bar_menu', array( &$this, 'admin_bar_menu' ), 20, 20);
+        }
+
+    }
+
+    /**
+     * Constractor
+     *
+     * @since 0.1
+     * @access public
+     */
+    public function __construct(){
         return $this->asm_MSLS_Grouping_Class();
     }
 
     /**
-        @function : call method in this class.
-        @param : $name function name
-        @param : $args argments
-        @return : (mixed) resalt/null
-    **/
-    function __call( $name, $args){
+     * Call method in this class.
+     *
+     * @since 0.1
+     * @param string $name Calling function name.
+     * @param mix $args Calling function arguments.
+     * @return mix function result.
+     * @access public
+     */
+    public function __call( $name, $args){
         if( method_exists( $this, $name)){
             return call_user_func_array( array( &$this, $name), $args);
@@ -108 +165 @@
 
     /**
-        @function : Action Hook. Init
-        @param : void
-        @return : void
-    **/
-    function init(){
+     * Action Hook. WP Initialize.
+     *
+     * @since 0.1
+     * @access public
+     */
+    public function init(){
         if( class_exists( 'MslsOptions' ) ){
             $this->cache['MslsOptions'] = new MslsOptions();
@@ -123 +181 @@
 
     /**
-        @function : Action Hook. Admin Init
-        @param : void
-        @return : void
-    **/
-    function admin_init(){
+     * Action Hook. WP-Admin Initialize.
+     *
+     * @since 0.1
+     * @access public
+     */
+    public function admin_init(){
         global $asm_textdomain;
         if( function_exists( 'add_settings_field' ) ){
@@ -135 +194 @@
         add_action( 'wpmu_options', array( &$this, 'wpmu_options' ), 20 );
         add_filter( 'plugin_locale', array( &$this, 'plugin_locale' ), 20, 10 );
-    }
-
-    function _description(){
-        global $asm_textdomain;
-        __( "MSLS Gouping", $asm_textdomain );
-        __( "Asumaru", $asm_textdomain );
-        __( "Asumaru Corp.", $asm_textdomain );
-        __( "You can multilingualize by 'Multisite Language Switcher' with grouping the sites of the plural same languages.", $asm_textdomain );
-    }
-
-    /**
-        @function : Set text domain
-        @param : void
-        @return : void
-    **/
-    function load_plugin_textdomain() { // l10n
+        if( apply_filters( 'asm_language-column.blogs.network', true ) ){
+            add_filter( 'wpmu_blogs_columns', array( &$this, 'wpmu_blogs_columns' ), 20, 20 );
+            add_action( 'manage_sites_custom_column', array( &$this, 'manage_sites_custom_column' ), 20, 20 );
+        }
+        if( apply_filters( 'asm_force_WPLANG.options_general', true ) ){
+            add_action( 'load-options-general.php', array( &$this, 'load_options_general' ), 20, 20 );
+        }
+        add_action( 'admin_print_footer_scripts', array( &$this, 'admin_print_footer_scripts' ), 20, 20 );
+    }
+
+    /**
+     * Action Hook. Text domain.
+     *
+     * @since 0.1
+     * @access public
+     */
+    public function load_plugin_textdomain(){
         global $asm_textdomain;
         $dir = dirname( __FILE__);
@@ -163 +223 @@
     }
 
-    function plugin_locale( $locale, $domain = null ){
+    /**
+     * Filter Hook. Plugin locale.
+     *
+     * @since 0.1
+     * @param string $locale original locale.
+     * @param string $domain text domain.
+     * @return string locale.
+     * @access public
+     */
+    public function plugin_locale( $locale, $domain = null ){
         global $asm_textdomain;
         $res = $locale;
@@ -170 +239 @@
 
     /**
-        @function : Update site option.
-        @param : void
-        @return : void
-    **/
-    function update_wpmu_options(){
+     * Action Hook. Update site option.
+     *
+     * @since 0.1
+     * @access public
+     */
+    public function update_wpmu_options(){
         foreach( (array) $this->defaults['site_options'] as $akey => $aval ){
             if( $_POST[$akey] === null || $_POST[$akey] === false ){
@@ -188 +258 @@
 
     /**
-        @function : Add in site option form.
-        @param : void
-        @return : void
-    **/
-    function wpmu_options(){
+     * Action Hook. Add in site option form.
+     *
+     * @since 0.1
+     * @access public
+     */
+    public function wpmu_options(){
+        global $asm_textdomain;
         foreach( (array) $this->defaults['site_options'] as $akey => $aval ){
             switch( $aval[1] ){
@@ -215 +287 @@
 
     /**
-        @function : Display input-tag 'group_key'.
-        @param : void
-        @return : void
-    **/
-    function group_key(){
+     * Setting field 'group key'.
+     *
+     * @since 0.1
+     * @access public
+     */
+    public function group_key(){
         global $asm_textdomain;
         echo $this->render_input( 'group_key', '40' );
@@ -227 +300 @@
     }
 
-
-    /**
-        @function : Render form-element (checkbox)
-        @param : $key Name and ID of the form-element
-        @return : string
+    /**
+     * Render form-element (checkbox)
+     *
+     * @since 0.1
+     * @param string $key MslsOptions property name.
+     * @return string checkbox tag.
+     * @access public
      */
     public function render_checkbox( $key ) {
+        if( ! is_scalar( $key ) ) return '';
         if( ! is_object( $this->cache['MslsOptions'] )
         || ! is_callable( array( $this->cache['MslsOptions'] , 'instance' ) ) ){
-            return;
-        }
+            return '';
+        }
+        $MslsOptions = MslsOptions::instance();
+        if( ! isset( $MslsOptions->$key ) ) return '';
         return sprintf(
             '<input type="checkbox" id="%1$s" name="msls[%1$s]" value="1" %2$s/>',
             $key,
-            checked( 1, MslsOptions::instance()->$key, false )
+            checked( 1, $MslsOptions->$key, false )
         );
     }
 
     /**
-        @function : Render form-element (text-input)
-        @param : $key Name and ID of the form-element
-        @param : $size Size-attribute of the input-field
-        @return : string
+     * Render form-element (text-input)
+     *
+     * @since 0.1
+     * @param string $key MslsOptions property.
+     * @param init $size limit text size.
+     * @return string text-input tag.
+     * @access public
      */
     public function render_input( $key, $size = '30' ) {
+        if( ! is_scalar( $key ) || empty( $key ) ) return '';
         if( ! is_object( $this->cache['MslsOptions'] )
         || ! is_callable( array( $this->cache['MslsOptions'] , 'instance' ) ) ){
-            return;
-        }
+            return '';
+        }
+        $MslsOptions = MslsOptions::instance();
+        if( ! isset( $MslsOptions->$key ) ) return '';
         return sprintf(
             '<input id="%1$s" name="msls[%1$s]" value="%2$s" size="%3$s"/>',
             $key,
-            esc_attr( MslsOptions::instance()->$key ),
+            esc_attr( $MslsOptions->$key ),
             $size
         );
@@ -265 +349 @@
 
     /**
-        @function : Render form-element (select)
-        @param : $key Name and ID of the form-element
-        @param : $arr Options as associative array
-        @param : $selected Values which should be selected
-        @return : string
+     * Render form-element (select)
+     *
+     * @since 0.1
+     * @param string $key MslsOptions property.
+     * @param array $arr option values and descriptions.
+     * @return string select and option tag.
+     * @access public
      */
     public function render_select( $key, array $arr, $selected = '' ) {
+        if( ! is_scalar( $key ) || empty( $key ) ) return '';
         $options = array();
 
@@ -285 +372 @@
         if( ! is_object( $this->cache['MslsOptions'] )
         || ! is_callable( array( $this->cache['MslsOptions'] , 'instance' ) ) ){
-            return;
-        }
+            return '';
+        }
+        $MslsOptions = MslsOptions::instance();
+        if( ! isset( $MslsOptions->$key ) ) return '';
         return sprintf(
             '<select id="%1$s" name="msls[%1$s]">%2$s</select>',
@@ -295 +384 @@
 
     /**
-        @function : Filter Hook. MSLS Collection of blog-objects.
-        @param : $blogs_collection Collection of blog-objects
-        @return : array
-     */
-    function msls_blog_collection_construct( $blogs_collection = array() ){
+     * Filter Hook. MSLS Collection to group blog-objects.
+     *
+     * @since 0.1
+     * @param array $blogs_collection Collection of blog-objects.
+     * @return array Collection  to group blog-objects.
+     * @access public
+     */
+    public function msls_blog_collection_construct( $blogs_collection = array() ){
         $res = $blogs_collection;
         if( function_exists( 'get_current_blog_id' ) ){
@@ -319 +411 @@
 
         $lang = get_option( 'WPLANG' );
-        $lang = empty( $lang ) ? $this->emptyLang : $lang;
+        $lang = empty( $lang ) ? $this->emptyLang[0] : $lang;
         $langs = array();
 
@@ -334 +426 @@
             $aGroup_key = empty( $aOptions['group_key'] ) ? $this->noGroup : $aOptions['group_key'];
             $aLang = get_blog_option( $aBlog_id, 'WPLANG' );
-            $aLang = empty( $aLang ) ? $this->emptyLang : $aLang;
+            $aLang = empty( $aLang ) ? $this->emptyLang[0] : $aLang;
 
             if( empty( $this->cache['blogs'] ) ) $this->cache['blogs'] = array();
@@ -354 +446 @@
 
     /**
-        @function : Get Same language Sites.
-        @param : $atts Option Array.
-        @param : $template HTML tag Template.
-        @return : HTML Tags or Array.
-     */
-    function get_SameLangSites( $atts = '', $template = ''){
+     * Get Same language Sites.
+     *
+     * @since 0.1
+     * @param mix $atts Option Array.
+     * @param string $template HTML tag Template.
+     * @return string HTML Tags or Array.
+     * @access public
+     */
+    public function get_SameLangSites( $atts = '', $template = ''){
         $res = null;
 
@@ -372 +467 @@
         $blog_id = $current_blog['blog_id'];
         $lang = $current_blog['language'];
+        $lang = empty( $lang ) ? $this->emptyLang[0] : $lang;
         $group_key = $current_blog['group_key'];
         $grpstr = $current_blog['group_str'];
@@ -398 +494 @@
         }
         $res = $Siblings = apply_filters( 'asm_SameLangSites_array', (array) $Siblings );
+
+        $mslsOptions = null;
+        if( class_exists( 'MslsOptions' ) && is_callable( 'MslsOptions::instance' ) ){
+            $mslsOptions = MslsOptions::instance();
+            if( is_object( $mslsOptions ) && is_callable( array( $mslsOptions, 'get_flag_url' ) ) ){
+                $flag_url = $mslsOptions->get_flag_url( $lang );
+            }
+        }
 
         $args['raw'] = is_scalar( $args['raw'] ) ? strtolower( trim( $args['raw'] ) ) : (bool) $args['raw'];
@@ -412 +516 @@
                     $bval = str_replace( "%id%", $akey, $bval );
                     $bval = str_replace( "%lang%", $lang, $bval );
+                    $bval = str_replace( "%flag_url%", $flag_url, $bval );
                     $bval = str_replace( "%group%", $grpstr, $bval );
                     $ali = str_replace( "%{$bkey}%", $bval, $ali );
@@ -430 +535 @@
     }
 
+    /**
+     * Filter Hook. Blogs Columns to add 'Language' column in sites table.
+     *
+     * @since 0.2
+     * @param array $sites_columns Columns in WP_MS_Sites_List_Table.
+     * @return array columns.
+     * @access public
+     */
+    public function wpmu_blogs_columns( $sites_columns = array() ){
+        global $asm_textdomain;
+        $res = array();
+        $arr = (array) $sites_columns;
+        $addkey = 'language';
+        $addName = __( "Language", $asm_textdomain ) . ' (' . __( "Group Key", $asm_textdomain ) . ')';
+        reset( $arr );
+        if( empty( $arr[ $addkey ] ) ){
+            foreach( $arr as $akey => $aval ){
+                $res[$akey] = $aval;
+                if( $akey == 'blogname' ){
+                    $res[ $addkey ] = $addName;
+                    if( empty( $this->cache['addCSS'] ) ) $this->cache['addCSS'] = array();
+                    $this->cache['addCSS'][$addkey] = <<<EOS
+/* Language Column in Sites List */
+table.sites th.column-language ,
+table.sites td.column-language {
+    width : 15%;
+}
+table.sites .column-language .attantion {
+    color : red;
+EOS;
+                }
+            }
+        }
+
+        return $res;
+    }
+
+    /**
+     * Action Hook. Admin print fotter scripts.
+     *
+     * @since 0.2
+     * @access public
+     */
+    public function admin_print_footer_scripts(){
+        if( ! empty( $this->cache['addScripts'] ) && is_array( $this->cache['addScripts'] ) ){
+            $scripts = '';
+            foreach( $this->cache['addScripts'] as $akey => $aval ){
+                $scripts .= $aval . "\n";
+            }
+            $scripts = trim( $scripts );
+            $style = <<<EOS
+<script type="text/javascript">
+{$scripts}
+</script>
+
+EOS;
+            echo $style;
+        }
+        if( ! empty( $this->cache['addCSS'] ) && is_array( $this->cache['addCSS'] ) ){
+            $css = '';
+            foreach( $this->cache['addCSS'] as $akey => $aval ){
+                $css .= $aval . "\n";
+            }
+            $css = trim( $css );
+            $style = <<<EOS
+<style type="text/css">
+{$css}
+</style>
+
+EOS;
+            echo $style;
+        }
+    }
+
+    /**
+     * Get current blog language.
+     *
+     * @since 0.2
+     * @param init $blog_id Blog ID.
+     * @return array blog locale adn group key, language name, language flag url.
+     * @access public
+     */
+    public function get_current_blog_language( $blog_id = 0 ){
+        global $asm_textdomain;
+
+        $blog_id = (int) $blog_id;
+        if ( empty( $blog_id ) )
+            $blog_id = get_current_blog_id();
+        if ( get_current_blog_id() == $blog_id ){
+            $locale = get_option('WPLANG');
+            $msls = get_option('msls');
+        }
+        else
+        {
+            switch_to_blog( $blog_id );
+            $locale = get_option('WPLANG');
+            $msls = get_option('msls');
+            restore_current_blog();
+        }
+
+        $locale = empty( $locale ) ? $this->emptyLang[1] : $locale;
+        $msls = empty( $msls ) ? array() : (array) $msls;
+        $group_key = $msls['group_key'];
+        $group_key = $group_key == $this->noGroup ? '' : $group_key;
+        $langName = empty( $msls['description'] ) ? $locale : $msls['description'];
+        $flag_url = '';
+        if( class_exists( 'MslsOptions' ) && is_callable( 'MslsOptions::instance' ) ){
+            $mslsOptions = MslsOptions::instance();
+            if( is_callable( array( $mslsOptions, 'get_flag_url' ) ) ){
+                $flag_url = MslsOptions::instance()->get_flag_url( $locale );
+            }
+        }
+        $options = compact( 'locale', 'group_key', 'langName', 'flag_url', 'msls' );
+        return apply_filters(
+            "asm_get_current_blog_language",
+            $options,
+            $blog_id
+        );
+    }
+
+    /**
+     * Action Hook. 'Language' column on manage_sites_custom_column.
+     *
+     * @since 0.2
+     * @param string $column_name current column name.
+     * @param string $blog_id Blog ID.
+     * @access public
+     */
+    public function manage_sites_custom_column( $column_name = '', $blog_id = 0 ){
+        global $asm_textdomain;
+        $Colmuns = array( 'language' );
+        if( ! in_array( $column_name, $Colmuns ) ){
+            return;
+        }
+        if( $column_name == 'language' ){
+            $options = $this->get_current_blog_language( $blog_id );
+            extract( $options );
+
+            $flagImg = empty( $flag_url ) ? '' : <<<EOS
+<img alt="{$locale}" src="{$flag_url}" class="language-flag">
+EOS;
+            $grpSpan = empty( $group_key ) ? '' : <<<EOS
+<span class="language-group">{$group_key}</span>
+EOS;
+            $grpSpan = empty( $grpSpan ) ? '' : <<<EOS
+
+<p class="blog-groupkey">({$grpSpan})</p>
+
+EOS;
+            $noMsls = ! empty( $msls ) ? '' : __( "'Multisite Language Switcher' is unestablished.", $asm_textdomain );
+            $noMsls = empty( $noMsls ) ? '' : <<<EOS
+<p class="attantion">{$noMsls}</p>
+
+EOS;
+            $tags = <<<EOS
+<p class="blog-Languages">{$flagImg}<span class="language-name">{$langName}</span></p>{$grpSpan}{$noMsls}
+
+EOS;
+            $columnTitle = ucfirst( $column_name );
+            echo apply_filters(
+                "asm_{$columnTitle}Column",
+                $tags,
+                $column_name,
+                $blog_id,
+                $options
+            );
+        }
+
+    }
+
+    /**
+     * Action Hook. Language Flags on admin_bar_menu.
+     *
+     * Add CSS and Javascripts to show language flugs on Admin-Bar.
+     *
+     * @since 0.2
+     * @param object $wp_admin_bar WP Admin-bar.
+     * @access public
+     */
+    public function admin_bar_menu( $wp_admin_bar ){
+        global $asm_textdomain;
+        $options = $this->get_current_blog_language();
+        extract( $options );
+
+        $grpSpan = empty( $group_key ) ? '' : <<<EOS
+" [{$group_key}]"
+EOS;
+
+        if( empty( $this->cache['addCSS'] ) ) $this->cache['addCSS'] = array();
+
+        $flags = array();
+        foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
+            $aOptions = $this->get_current_blog_language( $blog->userblog_id );
+            $aBlogID = "blog-{$blog->userblog_id}";
+            $linkID = "#wp-admin-bar-{$aBlogID}";
+            $flags[$aOptions['locale']] = $aOptions['flag_url'];
+            $gkClass = empty( $aOptions['group_key'] ) ? '' : urlencode( $aOptions['group_key'] );
+
+            $this->cache['addScripts'][$aBlogID] = <<<EOS
+    jQuery("{$linkID}").addClass("blog-language-{$aOptions['locale']}");
+    if( "{$gkClass}" != "" ) jQuery("{$linkID}").addClass("blog-group-{$gkClass}");
+
+EOS;
+        }
+        foreach ( $flags as $akey => $aval ) {
+            $this->cache['addCSS']['lang-' . $akey] = <<<EOS
+#wpadminbar .quicklinks li.blog-language-{$akey} .blavatar::before {
+    content: url({$aval});
+}
+EOS;
+        }
+
+        if( ! is_network_admin() ){
+            $this->cache['addCSS']['site-name'] = <<<EOS
+.wp-admin #wpadminbar #wp-admin-bar-site-name > .ab-item::before ,
+#wpadminbar #wp-admin-bar-site-name > .ab-item::before {
+    content: url({$flag_url}){$grpSpan};
+    margin: 0.25em 0.25em 0.1em 0;
+    font-size: 1em;
+}
+EOS;
+        }
+    }
+
+    /**
+     * Action Hook. Deficient cancellation on Options General.
+     *
+     * @since 0.2
+     * @param object $wp_admin_bar WP Admin-bar.
+     * @access public
+     */
+    public function load_options_general(){
+        $lang = get_option( 'WPLANG' );
+        $this->cache['addScripts']['options_general'] = <<<EOS
+    if( jQuery("select#WPLANG option:selected").val() == "{$lang}" ){
+    }
+    else
+    if(jQuery("select#WPLANG option").is("[data-installed][value='{$lang}']")){
+        jQuery("select#WPLANG option:selected").removeAttr("selected");
+        jQuery("select#WPLANG option[data-installed][value='{$lang}']").attr("selected","selected");
+    }
+EOS;
+    }
+
 }
 
@@ -437 +786 @@
 
 /**
- * @class Same Language Sites Widgets
- */
+ * Same Language Sites Widgets Class.
+ *
+ * @since 0.1
+ * @see WP_Widget
+**/
 class asm_SameLangSites_Widget extends WP_Widget {
 
+    /**
+     * Form defaults.
+     *
+     * @since 0.1
+     * @var array
+     * @access private
+     */
     private $form_defs = array(
             'title' => '',
@@ -446 +805 @@
 
     /**
-        @function : Sets up a new Archives widget instance.
-        @param : void
-        @return : void
+     * Sets up a new Same Language Sites widget instance.
+     *
+     * @since 0.1
+     * @access public
      */
     public function __construct() {
@@ -463 +823 @@
 
     /**
-        @function : Outputs the content for the current Archives widget instance.
-        @param : $args Display arguments including 'before_title', 'after_title',
-                       'before_widget', and 'after_widget'.
-        @param : $instance Settings for the current Archives widget instance.
-        @return : void
+     * Outputs the content for the current Same Language Sites widget instance.
+     *
+     * @since 0.1
+     * @access public
+     *
+     * @param array $args     Display arguments including 'before_title', 'after_title',
+     *                        'before_widget', and 'after_widget'.
+     * @param array $instance Settings for the current Same Language Sites  widget instance.
      */
     public function widget( $args, $instance ) {
@@ -495 +858 @@
 
     /**
-        @function : Handles updating settings for the current Archives widget instance.
-        @param : $new_instance New settings for this instance as input by the user via
-                               WP_Widget_Archives::form().
-        @param : $old_instance Old settings for this instance.
-        @return : array Updated settings to save.
+     * Handles updating settings for the current Same Language Sites widget instance.
+     *
+     * @since 0.1
+     * @access public
+     *
+     * @param array $new_instance New settings for this instance as input by the user via
+     *                            asm_SameLangSites_Widget::form().
+     * @param array $old_instance Old settings for this instance.
+     * @return array Updated settings to save.
      */
     public function update( $new_instance, $old_instance ) {
@@ -515 +882 @@
 
     /**
-     * Outputs the settings form for the Archives widget.
+     * Outputs the settings form for the Same Language Sites widget.
      *
      * @since 2.8.0
@@ -521 +888 @@
      *
      * @param array $instance Current settings.
-        @function : Outputs the settings form for the Archives widget.
-        @param : $instance Current settings.
-        @return : void
      */
     public function form( $instance ) {

msls-gouping/trunk/languages/asm-msls-grouping-ja.po

@@ -3 +3 @@
 "Project-Id-Version: asm-MSLS-Grouping\n"
 "POT-Creation-Date: 2017-02-11 21:03+0900\n"
-"PO-Revision-Date: 2017-02-11 21:04+0900\n"
+"PO-Revision-Date: 2017-02-24 20:34+0900\n"
 "Last-Translator: Asumaru <[email protected]>\n"
 "Language-Team: \n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.8.12\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -20 +20 @@
 "X-Poedit-SearchPath-1: inc\n"
 
-#: inc/asm-MSLS-Grouping.php:132
+#: inc/asm-MSLS-Grouping.php:133 inc/asm-MSLS-Grouping.php:513
 msgid "Group Key"
 msgstr "グループキー"
 
-#: inc/asm-MSLS-Grouping.php:141
-msgid "MSLS Gouping"
-msgstr "マルチサイト言語スイッチャー グルーピング"
-
-#: inc/asm-MSLS-Grouping.php:142
-msgid "Asumaru"
-msgstr "あすまる"
-
-#: inc/asm-MSLS-Grouping.php:143
-msgid "Asumaru Corp."
-msgstr "(株)あすまる"
-
-#: inc/asm-MSLS-Grouping.php:144
-msgid ""
-"You can multilingualize by 'Multisite Language Switcher' with grouping the "
-"sites of the plural same languages."
-msgstr ""
-"複数の同じ言語のサイトをグループ分けすることで、「Multisite Language "
-"Switcher」を使って多言語化できます。"
-
-#: inc/asm-MSLS-Grouping.php:225
+#: inc/asm-MSLS-Grouping.php:222
 msgid ""
 "(*) If there is some blogs with the same language, you define \"Group Key\" "
@@ -52 +32 @@
 "キー」を定義します。"
 
-#: inc/asm-MSLS-Grouping.php:456
+#: inc/asm-MSLS-Grouping.php:434
+msgid "Language"
+msgstr "言語"
+
+#: inc/asm-MSLS-Grouping.php:521
+msgid "'Multisite Language Switcher' is unestablished."
+msgstr "マルチサイト言語スイッチャーは未設定です。"
+
+#: inc/asm-MSLS-Grouping.php:564
 msgid "Same Language Sites List"
 msgstr "同一言語サイト一覧"
 
-#: inc/asm-MSLS-Grouping.php:459 inc/asm-MSLS-Grouping.php:476
+#: inc/asm-MSLS-Grouping.php:567 inc/asm-MSLS-Grouping.php:584
 msgid "Same Language Sites"
 msgstr "同一言語サイト"
 
-#: inc/asm-MSLS-Grouping.php:535
+#: inc/asm-MSLS-Grouping.php:643
 msgid "Title:"
 msgstr "タイトル:"
 
-#: inc/asm-MSLS-Grouping.php:537
+#: inc/asm-MSLS-Grouping.php:645
 msgid "Template:"
 msgstr "テンプレート:"
+
+#: inc/dictionary.php:8
+msgid "Allow Duplicate Languages"
+msgstr "言語の重複の許可"
+
+#: inc/dictionary.php:9
+msgid ""
+"You allow for the same language to repeat in 'Multisite Language Switcher'."
+msgstr "マルチサイト言語スイッチャーで重複した言語の繰り返しを許可します。"
+
+#: inc/dictionary.php:10
+msgid "MSLS Gouping"
+msgstr "マルチサイト言語スイッチャー グルーピング"
+
+#: inc/dictionary.php:11
+msgid "Asumaru"
+msgstr "あすまる"
+
+#: inc/dictionary.php:12
+msgid "Asumaru Corp."
+msgstr "(株)あすまる"
+
+#: inc/dictionary.php:13
+msgid ""
+"You can multilingualize by 'Multisite Language Switcher' with grouping the "
+"sites of the plural same languages."
+msgstr ""
+"複数の同じ言語のサイトをグループ分けすることで、「Multisite Language "
+"Switcher」を使って多言語化できます。"

msls-gouping/trunk/languages/asm-msls-grouping-ja_JP.po

@@ -2 +2 @@
 msgstr ""
 "Project-Id-Version: asm-MSLS-Grouping\n"
-"POT-Creation-Date: 2017-02-11 21:05+0900\n"
-"PO-Revision-Date: 2017-02-11 21:05+0900\n"
+"POT-Creation-Date: 2017-02-24 20:29+0900\n"
+"PO-Revision-Date: 2017-02-24 20:32+0900\n"
 "Last-Translator: Asumaru <[email protected]>\n"
 "Language-Team: \n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.8.12\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -20 +20 @@
 "X-Poedit-SearchPath-1: inc\n"
 
-#: inc/asm-MSLS-Grouping.php:132
+#: inc/asm-MSLS-Grouping.php:133 inc/asm-MSLS-Grouping.php:513
 msgid "Group Key"
 msgstr "グループキー"
 
-#: inc/asm-MSLS-Grouping.php:141
-msgid "MSLS Gouping"
-msgstr "マルチサイト言語スイッチャー グルーピング"
-
-#: inc/asm-MSLS-Grouping.php:142
-msgid "Asumaru"
-msgstr "あすまる"
-
-#: inc/asm-MSLS-Grouping.php:143
-msgid "Asumaru Corp."
-msgstr "(株)あすまる"
-
-#: inc/asm-MSLS-Grouping.php:144
-msgid ""
-"You can multilingualize by 'Multisite Language Switcher' with grouping the "
-"sites of the plural same languages."
-msgstr ""
-"複数の同じ言語のサイトをグループ分けすることで、「Multisite Language "
-"Switcher」を使って多言語化できます。"
-
-#: inc/asm-MSLS-Grouping.php:225
+#: inc/asm-MSLS-Grouping.php:222
 msgid ""
 "(*) If there is some blogs with the same language, you define \"Group Key\" "
@@ -52 +32 @@
 "キー」を定義します。"
 
-#: inc/asm-MSLS-Grouping.php:456
+#: inc/asm-MSLS-Grouping.php:434
+msgid "Language"
+msgstr "言語"
+
+#: inc/asm-MSLS-Grouping.php:521
+msgid "'Multisite Language Switcher' is unestablished."
+msgstr "マルチサイト言語スイッチャーは未設定です。"
+
+#: inc/asm-MSLS-Grouping.php:564
 msgid "Same Language Sites List"
 msgstr "同一言語サイト一覧"
 
-#: inc/asm-MSLS-Grouping.php:459 inc/asm-MSLS-Grouping.php:476
+#: inc/asm-MSLS-Grouping.php:567 inc/asm-MSLS-Grouping.php:584
 msgid "Same Language Sites"
 msgstr "同一言語サイト"
 
-#: inc/asm-MSLS-Grouping.php:535
+#: inc/asm-MSLS-Grouping.php:643
 msgid "Title:"
 msgstr "タイトル:"
 
-#: inc/asm-MSLS-Grouping.php:537
+#: inc/asm-MSLS-Grouping.php:645
 msgid "Template:"
 msgstr "テンプレート:"
+
+#: inc/dictionary.php:8
+msgid "Allow Duplicate Languages"
+msgstr "言語の重複の許可"
+
+#: inc/dictionary.php:9
+msgid ""
+"You allow for the same language to repeat in 'Multisite Language Switcher'."
+msgstr "マルチサイト言語スイッチャーで重複した言語の繰り返しを許可します。"
+
+#: inc/dictionary.php:10
+msgid "MSLS Gouping"
+msgstr "マルチサイト言語スイッチャー グルーピング"
+
+#: inc/dictionary.php:11
+msgid "Asumaru"
+msgstr "あすまる"
+
+#: inc/dictionary.php:12
+msgid "Asumaru Corp."
+msgstr "(株)あすまる"
+
+#: inc/dictionary.php:13
+msgid ""
+"You can multilingualize by 'Multisite Language Switcher' with grouping the "
+"sites of the plural same languages."
+msgstr ""
+"複数の同じ言語のサイトをグループ分けすることで、「Multisite Language "
+"Switcher」を使って多言語化できます。"

msls-gouping/trunk/languages/asm-msls-grouping.pot

@@ -3 +3 @@
 msgstr ""
 "Project-Id-Version: asm-MSLS-Grouping\n"
-"POT-Creation-Date: 2017-02-11 21:03+0900\n"
+"POT-Creation-Date: 2017-02-24 20:27+0900\n"
 "PO-Revision-Date: 2017-02-11 17:12+0900\n"
 "Last-Translator: Asumaru <[email protected]>\n"
@@ -11 +11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.8.12\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -20 +20 @@
 "X-Poedit-SearchPath-1: inc\n"
 
-#: inc/asm-MSLS-Grouping.php:132
+#: inc/asm-MSLS-Grouping.php:133 inc/asm-MSLS-Grouping.php:513
 msgid "Group Key"
 msgstr ""
 
-#: inc/asm-MSLS-Grouping.php:141
+#: inc/asm-MSLS-Grouping.php:222
+msgid "(*) If there is some blogs with the same language, you define \"Group Key\" to same blog-set."
+msgstr ""
+
+#: inc/asm-MSLS-Grouping.php:434
+msgid "Language"
+msgstr ""
+
+#: inc/asm-MSLS-Grouping.php:521
+msgid "'Multisite Language Switcher' is unestablished."
+msgstr ""
+
+#: inc/asm-MSLS-Grouping.php:564
+msgid "Same Language Sites List"
+msgstr ""
+
+#: inc/asm-MSLS-Grouping.php:567 inc/asm-MSLS-Grouping.php:584
+msgid "Same Language Sites"
+msgstr ""
+
+#: inc/asm-MSLS-Grouping.php:643
+msgid "Title:"
+msgstr ""
+
+#: inc/asm-MSLS-Grouping.php:645
+msgid "Template:"
+msgstr ""
+
+#: inc/dictionary.php:8
+msgid "Allow Duplicate Languages"
+msgstr ""
+
+#: inc/dictionary.php:9
+msgid "You allow for the same language to repeat in 'Multisite Language Switcher'."
+msgstr ""
+
+#: inc/dictionary.php:10
 msgid "MSLS Gouping"
 msgstr ""
 
-#: inc/asm-MSLS-Grouping.php:142
+#: inc/dictionary.php:11
 msgid "Asumaru"
 msgstr ""
 
-#: inc/asm-MSLS-Grouping.php:143
+#: inc/dictionary.php:12
 msgid "Asumaru Corp."
 msgstr ""
 
-#: inc/asm-MSLS-Grouping.php:144
+#: inc/dictionary.php:13
 msgid ""
 "You can multilingualize by 'Multisite Language Switcher' with grouping the sites of the plural "
 "same languages."
 msgstr ""
-
-#: inc/asm-MSLS-Grouping.php:225
-msgid "(*) If there is some blogs with the same language, you define \"Group Key\" to same blog-set."
-msgstr ""
-
-#: inc/asm-MSLS-Grouping.php:456
-msgid "Same Language Sites List"
-msgstr ""
-
-#: inc/asm-MSLS-Grouping.php:459 inc/asm-MSLS-Grouping.php:476
-msgid "Same Language Sites"
-msgstr ""
-
-#: inc/asm-MSLS-Grouping.php:535
-msgid "Title:"
-msgstr ""
-
-#: inc/asm-MSLS-Grouping.php:537
-msgid "Template:"
-msgstr ""

msls-gouping/trunk/languages/default.pot

@@ -3 +3 @@
 msgstr ""
 "Project-Id-Version: asm-MSLS-Grouping\n"
-"POT-Creation-Date: 2017-02-11 21:02+0900\n"
+"POT-Creation-Date: 2017-02-24 20:26+0900\n"
 "PO-Revision-Date: 2017-02-11 17:12+0900\n"
 "Last-Translator: Asumaru <[email protected]>\n"
@@ -11 +11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.8.12\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -20 +20 @@
 "X-Poedit-SearchPath-1: inc\n"
 
-#: inc/asm-MSLS-Grouping.php:132
+#: inc/asm-MSLS-Grouping.php:133 inc/asm-MSLS-Grouping.php:513
 msgid "Group Key"
 msgstr ""
 
-#: inc/asm-MSLS-Grouping.php:141
+#: inc/asm-MSLS-Grouping.php:222
+msgid "(*) If there is some blogs with the same language, you define \"Group Key\" to same blog-set."
+msgstr ""
+
+#: inc/asm-MSLS-Grouping.php:434
+msgid "Language"
+msgstr ""
+
+#: inc/asm-MSLS-Grouping.php:521
+msgid "'Multisite Language Switcher' is unestablished."
+msgstr ""
+
+#: inc/asm-MSLS-Grouping.php:564
+msgid "Same Language Sites List"
+msgstr ""
+
+#: inc/asm-MSLS-Grouping.php:567 inc/asm-MSLS-Grouping.php:584
+msgid "Same Language Sites"
+msgstr ""
+
+#: inc/asm-MSLS-Grouping.php:643
+msgid "Title:"
+msgstr ""
+
+#: inc/asm-MSLS-Grouping.php:645
+msgid "Template:"
+msgstr ""
+
+#: inc/dictionary.php:8
+msgid "Allow Duplicate Languages"
+msgstr ""
+
+#: inc/dictionary.php:9
+msgid "You allow for the same language to repeat in 'Multisite Language Switcher'."
+msgstr ""
+
+#: inc/dictionary.php:10
 msgid "MSLS Gouping"
 msgstr ""
 
-#: inc/asm-MSLS-Grouping.php:142
+#: inc/dictionary.php:11
 msgid "Asumaru"
 msgstr ""
 
-#: inc/asm-MSLS-Grouping.php:143
+#: inc/dictionary.php:12
 msgid "Asumaru Corp."
 msgstr ""
 
-#: inc/asm-MSLS-Grouping.php:144
+#: inc/dictionary.php:13
 msgid ""
 "You can multilingualize by 'Multisite Language Switcher' with grouping the sites of the plural "
 "same languages."
 msgstr ""
-
-#: inc/asm-MSLS-Grouping.php:225
-msgid "(*) If there is some blogs with the same language, you define \"Group Key\" to same blog-set."
-msgstr ""
-
-#: inc/asm-MSLS-Grouping.php:456
-msgid "Same Language Sites List"
-msgstr ""
-
-#: inc/asm-MSLS-Grouping.php:459 inc/asm-MSLS-Grouping.php:476
-msgid "Same Language Sites"
-msgstr ""
-
-#: inc/asm-MSLS-Grouping.php:535
-msgid "Title:"
-msgstr ""
-
-#: inc/asm-MSLS-Grouping.php:537
-msgid "Template:"
-msgstr ""

msls-gouping/trunk/readme.txt

@@ -1 @@
-=== Plugin Name ===
+=== MSLS Grouping ===
 Contributors: Asumaru
-Donate link: http://asumaru.com/
-Tags: multilingual, multisite, language, switcher, international, localization, i18n, grouping
+Donate link: http://asumaru.com/business/wp-plugins/asm-msls-grouping/
+Tags: multilingual, multisite, language, switcher, international, localization, i18n, grouping, flag, WPLANG
 Requires at least: 4.6
 Tested up to: 4.7.2
-Stable tag: 0.1
+Stable tag: 0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -19 +19 @@
 * Site A (Japanese)  example-site.com/jp/
 * Site B (English)   example-site.com/siteB/
-* Site B (Japanese)  example-site.com/siteB-jp/
+* Site B (Japanese)  example-site.com/siteB/jp/
 * Site C (English)   example-site.com/siteC/
-* Site C (Japanese)  example-site.com/siteC-jp/
+* Site C (Japanese)  example-site.com/siteC/jp/
 
 "Multisite Language Switcher" cannot tell the difference between site A, site B and site C.
@@ -37 +37 @@
 * Site A (English)  => Site B (English), Site C (English)
 * Site B (Japanese) => Site A (Japanese), Site C (Japanese)
+
+And, it provide "Language" column on the Table of Sites in network.
+
+And, it provide "Language Flag" in Admin-Bar.
 
 == Installation ==
@@ -59 +63 @@
 * %after_item% : Suffix of the list item.
 
+= How do you not come to display language column on the Table of Sites in network? =
+You must add the following cord to functions.php in the theme.
+> add_filter( 'asm_language-column.blogs.network', create_function( '', 'return false;' ) );
+
+= How do you not come to display language flags? =
+You must add the following cord to functions.php in the theme.
+> add_filter( 'asm_language-flags.admin-bar', create_function( '', 'return false;' ) );
+
+= How do you not come to force WPLANG in the setting-general? =
+You must add the following cord to functions.php in the theme.
+> add_filter( 'asm_force_WPLANG.options_general', create_function( '', 'return false;' ) );
+
 == Screenshots ==
 
@@ -75 +91 @@
 7. e.g. Japanese Site.
 
+8. Language flags in Admin-Bar.
+
 == Changelog ==
 
@@ -80 +98 @@
 * created 2017.01.01.
 
+= 0.2 =
+* po/mo files updated.
+* Language column on the Table of Sites in network added.
+* Language flags in Admin-Bar displayed.
+* Malfunction of WPLANG in the setting-general supported.
+
 == Upgrade Notice ==