Skip to content
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 Correctly identify i18n yaml dir for colymba module #17

Merged

Conversation

GuySartorelli
Copy link
Member

@@ -563,7 +563,7 @@ private function log(string $message, bool $isVerbose = false): void
/**
* Gets the module lang dir
*/
private function getYmlLangDirectory(string $modulePath): string
private function getYmlLangDirectory(string $modulePath): ?string
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're explicitly returning null

if (preg_match('#source_file\s=\s(?<path>\S+)#', $line, $matches)) {
if (preg_match('#source_file\s+=\s+(?<path>\S+)#', $line, $matches)) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The colymba/gridfield-bulk-editing-tools tx config has multiple spaces, so it wasn't matching this regex.

@emteknetnz emteknetnz merged commit 7886360 into silverstripe:1.1 Aug 21, 2023
1 check passed
@emteknetnz emteknetnz deleted the pulls/1.1/fix-finding-yaml-dir branch August 21, 2023 00:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants