Upgrade cms for new i18n backend #1724
Conversation
| @@ -6,7 +6,7 @@ | |||
| charset = utf-8 | |||
| end_of_line = lf | |||
| indent_size = 4 | |||
| indent_style = tab | |||
| indent_style = space | |||
There was a problem hiding this comment.
Yay! But was this really supposed to be in this PR?
There was a problem hiding this comment.
We should be using psr2 now; I think some upgrades were missing from cms module though. I should run a formatter over it.
There was a problem hiding this comment.
Oh look, we never merged it. =( #1688
There was a problem hiding this comment.
Rebuilt at #1727. I'll revert from this PR.
tractorcow
force-pushed
the
pulls/4.0/i18n-symfony
branch
from
dbc49a0 to
7de8207
Compare
|
I've reverted any presumptuous psr2 reformatting on SiteTree.php; I'll wait until we merge the main psr2 PR instead :D |
tractorcow
force-pushed
the
pulls/4.0/i18n-symfony
branch
from
7de8207 to
f2f347b
Compare
tractorcow
force-pushed
the
pulls/4.0/i18n-symfony
branch
from
f2f347b to
fa2b871
Compare
|
Ok, I've updated the tests and fixed some german localisations for plurals. Should be passing now. :D note: CMS pr can be merged ahead of the framework, since it only fixes problems, it doesn't RELY on the new api for it to work. |
|
This is ready to merge. |
Required for silverstripe/silverstripe-framework#6558