Merge branch 'master' of github.com:yiisoft/yii2

* 'master' of github.com:yiisoft/yii2:
  Fixes #968: clientOptions should not be ignored when enabling internationalization.
  minor doc fix.

docs/guide/active-record.md

@@ -175,7 +175,9 @@ $customer->delete();
 Customer::updateAllCounters(array('age' => 1));
 ```
 
-Notice that you can always use the `save` method, and ActiveRecord will automatically perform an INSERT for new records and an UPDATE for existing ones.
+> Info: The `save()` method will either perform an `INSERT` or `UPDATE` SQL statement, depending
+  on whether the ActiveRecord being saved is new or not by checking `ActiveRecord::isNewRecord`.
+
 
 Data Input and Validation
 -------------------------

docs/guide/validation.md

@@ -38,7 +38,7 @@ Compares the specified attribute value with another value and validates if they
 
 Verifies if the attribute represents a date, time or datetime in a proper format.
 
-- `format` the date format that the value being validated should follow accodring to [[http://www.php.net/manual/en/datetime.createfromformat.php]]. _('Y-m-d')_
+- `format` the date format that the value being validated should follow according to [[http://www.php.net/manual/en/datetime.createfromformat.php]]. _('Y-m-d')_
 - `timestampAttribute` the name of the attribute to receive the parsing result.
 
 ### `default`: [[DefaultValueValidator]]

extensions/jui/yii/jui/DatePicker.php

@@ -9,6 +9,7 @@ namespace yii\jui;
 
 use Yii;
 use yii\helpers\Html;
+use yii\helpers\Json;
 
 /**
  * DatePicker renders an datepicker jQuery UI widget.
@@ -61,11 +62,19 @@ class DatePicker extends InputWidget
 	public function run()
 	{
 		echo $this->renderWidget() . "\n";
-		$this->registerWidget('datepicker', DatePickerAsset::className());
 		if ($this->language !== false) {
 			$view = $this->getView();
 			DatePickerRegionalAsset::register($view);
-			$view->registerJs("$('#{$this->options['id']}').datepicker('option', $.datepicker.regional['{$this->language}']);");
+			// do not pass in any options when creating the widget
+			// set the options later so that the options can be combined with regional options
+			$options = $this->clientOptions;
+			$this->clientOptions = array();
+			$this->registerWidget('datepicker', DatePickerAsset::className());
+			$this->clientOptions = $options;
+			$options = Json::encode($options);
+			$view->registerJs("$('#{$this->options['id']}').datepicker('option', $.extend({}, $.datepicker.regional['{$this->language}'], $options));");
+		} else {
+			$this->registerWidget('datepicker', DatePickerAsset::className());
 		}
 	}