Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
25f1083d
Commit
25f1083d
authored
Jun 10, 2014
by
Alexander Makarov
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3769 from creocoder/db-message-source-code-style-fix
\yii\i18n\DbMessageSource code style fixes
parents
efda450a
333f521f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
DbMessageSource.php
framework/i18n/DbMessageSource.php
+3
-3
No files found.
framework/i18n/DbMessageSource.php
View file @
25f1083d
...
@@ -141,7 +141,7 @@ class DbMessageSource extends MessageSource
...
@@ -141,7 +141,7 @@ class DbMessageSource extends MessageSource
{
{
$mainQuery
=
new
Query
();
$mainQuery
=
new
Query
();
$mainQuery
->
select
([
't1.message message'
,
't2.translation translation'
])
$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'
)
->
where
(
't1.id = t2.id AND t1.category = :category AND t2.language = :language'
)
->
params
([
':category'
=>
$category
,
':language'
=>
$language
]);
->
params
([
':category'
=>
$category
,
':language'
=>
$language
]);
...
@@ -149,9 +149,9 @@ class DbMessageSource extends MessageSource
...
@@ -149,9 +149,9 @@ class DbMessageSource extends MessageSource
if
(
$fallbackLanguage
!=
$language
)
{
if
(
$fallbackLanguage
!=
$language
)
{
$fallbackQuery
=
new
Query
();
$fallbackQuery
=
new
Query
();
$fallbackQuery
->
select
([
't1.message message'
,
't2.translation translation'
])
$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'
)
->
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
]);
->
params
([
':category'
=>
$category
,
':language'
=>
$language
,
':fallbackLanguage'
=>
$fallbackLanguage
]);
$mainQuery
->
union
(
$fallbackQuery
,
true
);
$mainQuery
->
union
(
$fallbackQuery
,
true
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment