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

Load Language strings from other locations #1488

Merged
merged 2 commits into from
Nov 16, 2018

Conversation

natanfelles
Copy link
Contributor

@natanfelles natanfelles commented Nov 15, 2018

Description

Fixes #1433

Checklist:

  • Securely signed commits
  • Component(s) with PHPdocs
  • Unit testing, with >80% coverage
  • User guide updated
  • Conforms to style guide

@@ -270,10 +270,15 @@ protected function requireFile(string $path): array
// on this command returning boolean instead
// of array during testing, so we've removed
// the require_once for now.
return require $file;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

No performance issues here. $files comes with only the matching files.

@natanfelles
Copy link
Contributor Author

The fallback was not added...

@lonnieezell lonnieezell merged commit 73aa521 into codeigniter4:develop Nov 16, 2018
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.

2 participants