-
Notifications
You must be signed in to change notification settings - Fork 111
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FIX: Source locale indicator correction. #840
Open
mfendeksilverstripe
wants to merge
2
commits into
7
Choose a base branch
from
bugfix/source-locale-indicator
base: 7
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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 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 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 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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| <?php | ||
|
|
||
| namespace TractorCow\Fluent\Tests\Extension; | ||
|
|
||
| use Page; | ||
| use SilverStripe\CMS\Model\SiteTree; | ||
| use SilverStripe\Dev\SapphireTest; | ||
| use SilverStripe\ORM\ValidationException; | ||
| use SilverStripe\Versioned\Versioned; | ||
| use TractorCow\Fluent\Extension\FluentExtension; | ||
| use TractorCow\Fluent\Extension\FluentSiteTreeExtension; | ||
| use TractorCow\Fluent\State\FluentState; | ||
|
|
||
| class LocaleInheritanceTest extends SapphireTest | ||
| { | ||
| protected static $fixture_file = 'LocaleInheritanceTest.yml'; | ||
|
|
||
| protected static $required_extensions = [ | ||
| SiteTree::class => [ | ||
| FluentSiteTreeExtension::class, | ||
| ], | ||
| ]; | ||
|
|
||
| /** | ||
| * @param string $cmsInheritanceMode | ||
| * @param string $frontendInheritanceMode | ||
| * @param bool $frontendContext | ||
| * @param string $locale | ||
| * @param string|null $expected | ||
| * @return void | ||
| * @throws ValidationException | ||
| * @dataProvider sourceLocaleCasesProvider | ||
| */ | ||
| public function testGetSourceLocale( | ||
| string $cmsInheritanceMode, | ||
| string $frontendInheritanceMode, | ||
| bool $frontendContext, | ||
| string $locale, | ||
| ?string $expected | ||
| ): void { | ||
| Page::config() | ||
| ->set('cms_localisation_required', $cmsInheritanceMode) | ||
| ->set('frontend_publish_required', $frontendInheritanceMode); | ||
|
|
||
| Versioned::withVersionedMode(function () use ($frontendContext, $locale, $expected): void { | ||
| // Make sure we have the correct stage set | ||
| Versioned::set_stage(Versioned::DRAFT); | ||
|
|
||
| // Create the page in the default locale | ||
| FluentState::singleton()->withState( | ||
| function (FluentState $state) use ($frontendContext, $locale, $expected): void { | ||
| $state | ||
| ->setLocale('en_US') | ||
| ->setIsFrontend($frontendContext); | ||
|
|
||
| /** @var Page|FluentExtension $page */ | ||
| $page = Page::create(); | ||
| $page->Title = 'Page title'; | ||
| $page->URLSegment = 'test-page'; | ||
| $page->write(); | ||
|
|
||
| $localeInformation = $page->LocaleInformation($locale); | ||
| $sourceLocaleObject = $localeInformation->getSourceLocale(); | ||
| $sourceLocale = $sourceLocaleObject?->Locale; | ||
| $this->assertEquals( | ||
| $expected, | ||
| $sourceLocale, | ||
| 'We expect a specific source locale (locale information)' | ||
| ); | ||
|
|
||
| if (!$sourceLocale) { | ||
| return; | ||
| } | ||
|
|
||
| // Re-fetch the page in the target locale | ||
| $state->setLocale($locale); | ||
|
|
||
| /** @var Page|FluentExtension $page */ | ||
| $page = Page::get()->byID($page->ID); | ||
|
|
||
| $this->assertNotNull($page, 'We expect the page to be available in this locale'); | ||
| $sourceLocaleObject = $page->getSourceLocale(); | ||
| $this->assertEquals( | ||
| $expected, | ||
| $sourceLocaleObject->Locale, | ||
| 'We expect a specific source locale (page shorthand method)' | ||
| ); | ||
| } | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
| public function sourceLocaleCasesProvider(): array | ||
| { | ||
| return [ | ||
| 'default locale, cms with any mode, frontend with any mode, frontend context' => [ | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| true, | ||
| 'en_US', | ||
| 'en_US', | ||
| ], | ||
| 'default locale, cms with exact mode, frontend with any mode, frontend context' => [ | ||
| FluentExtension::INHERITANCE_MODE_EXACT, | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| true, | ||
| 'en_US', | ||
| 'en_US', | ||
| ], | ||
| 'default locale, cms with any mode, frontend with exact mode, frontend context' => [ | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| FluentExtension::INHERITANCE_MODE_EXACT, | ||
| true, | ||
| 'en_US', | ||
| 'en_US', | ||
| ], | ||
| 'fallback locale, cms with any mode, frontend with any mode, frontend context' => [ | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| true, | ||
| 'de_DE', | ||
| 'en_US', | ||
| ], | ||
| 'fallback locale, cms with exact mode, frontend with any mode, frontend context' => [ | ||
| FluentExtension::INHERITANCE_MODE_EXACT, | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| true, | ||
| 'de_DE', | ||
| 'en_US', | ||
| ], | ||
| 'fallback locale, cms with any mode, frontend with exact mode, frontend context' => [ | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| FluentExtension::INHERITANCE_MODE_EXACT, | ||
| true, | ||
| 'de_DE', | ||
| null, | ||
| ], | ||
| 'fallback locale, cms with any mode, frontend with fallback mode, frontend context' => [ | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| FluentExtension::INHERITANCE_MODE_FALLBACK, | ||
| true, | ||
| 'de_DE', | ||
| 'en_US', | ||
| ], | ||
| 'fallback locale, cms with any mode, frontend with exact mode, cms context' => [ | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| FluentExtension::INHERITANCE_MODE_EXACT, | ||
| false, | ||
| 'de_DE', | ||
| 'en_US', | ||
| ], | ||
| 'no fallback locale, cms with any mode, frontend with any mode, frontend context' => [ | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| true, | ||
| 'es_ES', | ||
| null, | ||
| ], | ||
| 'no fallback locale, cms with exact mode, frontend with any mode, frontend context' => [ | ||
| FluentExtension::INHERITANCE_MODE_EXACT, | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| true, | ||
| 'es_ES', | ||
| null, | ||
| ], | ||
| 'no fallback locale, cms with any mode, frontend with exact mode, frontend context' => [ | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| FluentExtension::INHERITANCE_MODE_EXACT, | ||
| true, | ||
| 'es_ES', | ||
| null, | ||
| ], | ||
| 'no fallback locale, cms with any mode, frontend with fallback mode, frontend context' => [ | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| FluentExtension::INHERITANCE_MODE_FALLBACK, | ||
| true, | ||
| 'es_ES', | ||
| null, | ||
| ], | ||
| 'no fallback locale, cms with any mode, frontend with exact mode, cms context' => [ | ||
| FluentExtension::INHERITANCE_MODE_ANY, | ||
| FluentExtension::INHERITANCE_MODE_EXACT, | ||
| false, | ||
| 'es_ES', | ||
| null, | ||
| ], | ||
| ]; | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| TractorCow\Fluent\Model\Locale: | ||
| default: | ||
| Title: US English | ||
| Locale: en_US | ||
| IsGlobalDefault: true | ||
| german: | ||
| Title: German | ||
| Locale: de_DE | ||
| Fallbacks: | ||
| - =>TractorCow\Fluent\Model\Locale.default | ||
| spanish: | ||
| Title: Spanish | ||
| Locale: es_ES |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! I was trying to remind myself how inheritance worked, but this line seems to obviously fix the issue. We should never care about fallbacks if inheritance is exact mode only.