MNT Ensure default_locale to en_US #11570
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This will affect project unit tests as well - please make sure to add a quick note about this in the 5.4 changelog. |
GuySartorelli
requested changes
Jan 21, 2025
src/Dev/SapphireTest.php
Outdated
| @@ -282,7 +282,9 @@ protected function setUp(): void | |||
|
|
|||
| // i18n needs to be set to the defaults or tests fail | |||
| if (class_exists(i18n::class)) { | |||
| i18n::set_locale(i18n::config()->uninherited('default_locale')); | |||
| $defaultLocale = 'en_US'; | |||
| i18n::config()->set('default_locale', $defaultLocale); | |||
There was a problem hiding this comment.
Why are we changing the config here? We don't need to set the active locale, done we?
There was a problem hiding this comment.
Requirements_Backend::add_i18n_javascript() reads i18n::config()->get('default_locale') directly, it's what caused the unit test to fail in the first place
|
I've just realised why |
emteknetnz
force-pushed
the
pulls/5/default-locale
branch
from
ca79a73 to
ce43f89
Compare
emteknetnz
force-pushed
the
pulls/5/default-locale
branch
from
ce43f89 to
6f2b81c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue silverstripe/.github#357
For whatever reason, CMS 5 sink now uses cwp/cwp-core 3.x-dev instead of 3.0.2, and 3.x-dev sets the default_locale with yml rather than _config.php silverstripe/cwp-core@3.0.2...3
This causes a few i18n tests to fail https://github.com/silverstripe/recipe-kitchen-sink/actions/runs/12877846807/job/35902983644#step:12:334
Also causes a locale date test to fail -
Failed asserting that '29/02/2020, 17:00' matches PCRE pattern "#2/29/20,\h5:00\hPM#iu".https://github.com/silverstripe/recipe-kitchen-sink/actions/runs/12877846807/job/35902983814Note that CMS 6 doesn't have this issue as cwp-core is no longer in CMS 6 sink
New CI sink run with this PR and also this PR https://github.com/creative-commoners/recipe-kitchen-sink/actions/runs/12899443197 (broken behat test is unrelated)