Upgrade to release v1.1.0

kartik-v · Oct 8, 2014 · c142831 · c142831
1 parent 18b74d7
commit c142831
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 20 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,7 +1,11 @@
+version 1.0.0
+=============
+- PSR4 alias change
+- (enh #8): Allow language configuration for Facebook, Twitter, and Google plugins.
+
 version 1.0.0
 =============
 
 *Date:* 01-Dec-2013
 
 - Initial release
-- PSR4 alias change
diff --git a/FacebookPlugin.php b/FacebookPlugin.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2013
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014
  * @package yii2-social
- * @version 1.0.0
+ * @version 1.1.0
  */
 
 namespace kartik\social;
@@ -109,7 +109,7 @@ protected function registerAssets()
         return;
     js = d.createElement(s);
     js.id = id;
-    js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId={$this->appId}";
+    js.src = "//connect.facebook.net/{$this->language}/all.js#xfbml=1&appId={$this->appId}";
     fjs.parentNode.insertBefore(js, fjs);
 }(document, 'script', 'facebook-jssdk'));                
 SCRIPT;

diff --git a/GooglePlugin.php b/GooglePlugin.php
@@ -1,16 +1,18 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2013
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014
  * @package yii2-social
- * @version 1.0.0
+ * @version 1.1.0
  */
 
 namespace kartik\social;
 
 use Yii;
 use yii\base\InvalidConfigException;
 use yii\helpers\Html;
+use yii\helpers\Json;
+use yii\web\View;
 
 /**
  * Widget to render various Google plugins
@@ -144,16 +146,12 @@ protected function setPluginOptions($convertLowerCase = true)
     protected function registerAssets()
     {
         $view = $this->getView();
-        $js = <<< SCRIPT
-(function() {
-    var po = document.createElement('script');
-    po.type = 'text/javascript';
-    po.async = true;
-    po.src = 'https://apis.google.com/js/plusone.js?onload=onLoadCallback';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-  })();
-SCRIPT;
-        $view->registerJs($js);
+        $view->registerJsFile('https://apis.google.com/js/platform.js', [
+            'position'=>View::POS_HEAD, 
+            'async'=>true, 
+            'defer'=>true
+        ]);
+        $view->registerJs("\nwindow.___gcfg={lang:'{$this->language}'};\n", View::POS_HEAD);
     }
 
 }
diff --git a/TwitterPlugin.php b/TwitterPlugin.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2013
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014
  * @package yii2-social
- * @version 1.0.0
+ * @version 1.1.0
  */
 
 namespace kartik\social;
@@ -76,6 +76,7 @@ public function init()
         parent::init();
         $this->tag = ($this->type === self::TWEET) ? 'blockquote' : 'a';
         $this->setConfig('twitter');
+        $this->settings['lang'] = $this->language;
         if ($this->type === self::HASHTAG && empty($this->hashTag) && empty($this->options['data-href'])) {
             throw new InvalidConfigException("The Twitter 'hashTag' must be set for displaying the 'hashtag' button.");
         }

diff --git a/Widget.php b/Widget.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2013
+ * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014
  * @package yii2-social
- * @version 1.0.0
+ * @version 1.1.0
  */
 
 namespace kartik\social;
@@ -20,6 +20,17 @@
  */
 class Widget extends \yii\base\Widget
 {
+    private static $defaultLanguage = [
+        'facebook' => 'en_US',
+        'twitter' => 'en',
+        'google' => 'en-US'
+    ];
+
+    /**
+     * @var string the language used in displaying content. 
+     * If not provided, defaults to `en_US`.
+     */
+    public $language;
 
     /**
      * @var string the tag for enclosing the plugin. Defaults to 'div'.
@@ -134,6 +145,9 @@ public function setConfig($widget)
                 }
             }
         }
+        if (empty($this->language) && isset(self::$defaultLanguage[$widget])) {
+            $this->language = self::$defaultLanguage[$widget];
+        }
     }
 
     /**