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

extensions/apidoc/templates/BaseRenderer.php

@@ -50,7 +50,6 @@ abstract class BaseRenderer extends Component
 	 * @param array $files list of markdown files to render
 	 * @param Context $context the api documentation context to render.
 	 * @param Controller $controller the apidoc controller instance. Can be used to control output.
-	 * @return
 	 */
 	public abstract function renderMarkdownFiles($controller);
 

extensions/apidoc/templates/html/views/constSummary.php

@@ -33,7 +33,7 @@ ArrayHelper::multisort($constants, 'name');
 	<tr<?= $constant->definedBy != $type->name ? ' class="inherited"' : '' ?> id="<?= $constant->name ?>">
 	  <td><?= $constant->name ?><a name="<?= $constant->name ?>-detail"></a></td>
 	  <td><?= $constant->value ?></td>
-	  <td><?= APiMarkdown::process($constant->shortDescription . "\n" . $constant->description, $constant->definedBy, true) ?></td>
+	  <td><?= ApiMarkdown::process($constant->shortDescription . "\n" . $constant->description, $constant->definedBy, true) ?></td>
 	  <td><?= $this->context->typeLink($constant->definedBy) ?></td>
 	</tr>
 <?php endforeach; ?>

extensions/bootstrap/Tabs.php

@@ -92,7 +92,7 @@ class Tabs extends Widget
 	 */
 	public $encodeLabels = true;
 	/**
-	 * @var string, specifies the Bootstrap tab styling.
+	 * @var string specifies the Bootstrap tab styling.
 	 */
 	public $navType = 'nav-tabs';
 

extensions/jui/CHANGELOG.md

@@ -6,6 +6,7 @@ Yii Framework 2 jui extension Change Log
 
 - Bug #1550: fixed the issue that JUI input widgets did not property input IDs. (qiangxue)
 - Bug #2514: Jui sortable clientEvents were not working because of wrong naming assumptions. (cebe)
+- Enh #2573: Jui datepicker now uses the current appliaction language by default. (andy5)
 
 2.0.0 alpha, December 1, 2013
 -----------------------------

extensions/jui/DatePicker.php

@@ -7,11 +7,12 @@
 
 namespace yii\jui;
 
+use Yii;
 use yii\helpers\Html;
 use yii\helpers\Json;
 
 /**
- * DatePicker renders an datepicker jQuery UI widget.
+ * DatePicker renders a datepicker jQuery UI widget.
  *
  * For example:
  *
@@ -46,9 +47,9 @@ class DatePicker extends InputWidget
 {
 	/**
 	 * @var string the locale ID (eg 'fr', 'de') for the language to be used by the date picker.
-	 * If this property set to false, I18N will not be involved. That is, the date picker will show in English.
+	 * If this property is empty, then the current application language will be used.
 	 */
-	public $language = false;
+	public $language;
 	/**
 	 * @var boolean If true, shows the widget as an inline calendar and the input as a hidden field.
 	 */
@@ -77,15 +78,16 @@ class DatePicker extends InputWidget
 	{
 		echo $this->renderWidget() . "\n";
 		$containerID = $this->inline ? $this->containerOptions['id'] : $this->options['id'];
-		if ($this->language !== false) {
+		$language = $this->language ? $this->language : Yii::$app->language;
+		if ($language != 'en') {
 			$view = $this->getView();
 			DatePickerRegionalAsset::register($view);
 
 			$options = Json::encode($this->clientOptions);
-			$view->registerJs("$('#{$containerID}').datepicker($.extend({}, $.datepicker.regional['{$this->language}'], $options));");
+			$view->registerJs("$('#{$containerID}').datepicker($.extend({}, $.datepicker.regional['{$language}'], $options));");
 
 			$options = $this->clientOptions;
-			$this->clientOptions = false;  // the datepicker js widget is already registered
+			$this->clientOptions = false; // the datepicker js widget is already registered
 			$this->registerWidget('datepicker', DatePickerAsset::className(), $containerID);
 			$this->clientOptions = $options;
 		} else {

extensions/redis/LuaScriptBuilder.php

@@ -7,6 +7,7 @@
 
 namespace yii\redis;
 
+use yii\base\InvalidParamException;
 use yii\base\NotSupportedException;
 use yii\db\Exception;
 use yii\db\Expression;

extensions/sphinx/QueryBuilder.php

@@ -77,7 +77,7 @@ class QueryBuilder extends Object
 
 		$clauses = [
 			$this->buildSelect($query->select, $params, $query->distinct, $query->selectOption),
-			$this->buildFrom($from, $Params),
+			$this->buildFrom($from, $params),
 			$this->buildWhere($query->from, $query->where, $params),
 			$this->buildGroupBy($query->groupBy),
 			$this->buildWithin($query->within),