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
914d37ab
Commit
914d37ab
authored
Mar 20, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2834 from yiisoft/i18n-fix-overriding-default-message-sources
Fixed overriding default message sources
parents
ba5bfc09
b18033ba
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
I18N.php
framework/i18n/I18N.php
+2
-2
No files found.
framework/CHANGELOG.md
View file @
914d37ab
...
...
@@ -60,6 +60,7 @@ Yii Framework 2 Change Log
-
Bug #2739: Fixed the issue that
`CreateAction::run()`
was using obsolete
`Controller::createAbsoluteUrl()`
method (tonydspaniard)
-
Bug #2740: Fixed the issue that
`CaptchaAction::run()`
was using obsolete
`Controller::createUrl()`
method (tonydspaniard)
-
Bug #2760: Fixed GridView
`filterUrl`
parameters (qiangxue, AlexGx)
-
Bug #2834: When overriding i18n translation sources from config using
`app*`
or
`yii*`
default
`app`
and
`yii`
sources were not removed (samdark)
-
Bug: Fixed
`Call to a member function registerAssetFiles() on a non-object`
in case of wrong
`sourcePath`
for an asset bundle (samdark)
-
Bug: Fixed incorrect event name for
`yii\jui\Spinner`
(samdark)
-
Bug: Json::encode() did not handle objects that implement JsonSerializable interface correctly (cebe)
...
...
framework/i18n/I18N.php
View file @
914d37ab
...
...
@@ -54,14 +54,14 @@ class I18N extends Component
public
function
init
()
{
parent
::
init
();
if
(
!
isset
(
$this
->
translations
[
'yii'
]))
{
if
(
!
isset
(
$this
->
translations
[
'yii'
])
&&
!
isset
(
$this
->
translations
[
'yii*'
])
)
{
$this
->
translations
[
'yii'
]
=
[
'class'
=>
'yii\i18n\PhpMessageSource'
,
'sourceLanguage'
=>
'en'
,
'basePath'
=>
'@yii/messages'
,
];
}
if
(
!
isset
(
$this
->
translations
[
'app'
]))
{
if
(
!
isset
(
$this
->
translations
[
'app'
])
&&
!
isset
(
$this
->
translations
[
'app*'
])
)
{
$this
->
translations
[
'app'
]
=
[
'class'
=>
'yii\i18n\PhpMessageSource'
,
'sourceLanguage'
=>
Yii
::
$app
->
sourceLanguage
,
...
...
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