Browse Source

Merge pull request #3769 from creocoder/db-message-source-code-style-fix

\yii\i18n\DbMessageSource code style fixes
tags/2.0.0-rc
Alexander Makarov 10 years ago
parent
commit
25f1083d5a
  1. 6
      framework/i18n/DbMessageSource.php

6
framework/i18n/DbMessageSource.php

@ -141,7 +141,7 @@ class DbMessageSource extends MessageSource
{
$mainQuery = new Query();
$mainQuery->select(['t1.message message', 't2.translation translation'])
->from([$this->sourceMessageTable . ' t1', $this->messageTable . ' t2'])
->from(["$this->sourceMessageTable t1", "$this->messageTable t2"])
->where('t1.id = t2.id AND t1.category = :category AND t2.language = :language')
->params([':category' => $category, ':language' => $language]);
@ -149,9 +149,9 @@ class DbMessageSource extends MessageSource
if ($fallbackLanguage != $language) {
$fallbackQuery = new Query();
$fallbackQuery->select(['t1.message message', 't2.translation translation'])
->from([$this->sourceMessageTable . ' t1', $this->messageTable . ' t2'])
->from(["$this->sourceMessageTable t1", "$this->messageTable t2"])
->where('t1.id = t2.id AND t1.category = :category AND t2.language = :fallbackLanguage')
->andWhere('t2.id NOT IN (SELECT id FROM '.$this->messageTable.' WHERE language = :language)')
->andWhere("t2.id NOT IN (SELECT id FROM $this->messageTable WHERE language = :language)")
->params([':category' => $category, ':language' => $language, ':fallbackLanguage' => $fallbackLanguage]);
$mainQuery->union($fallbackQuery, true);

Loading…
Cancel
Save