Skip to content

Commit

Permalink
Merge branch '6.x' into 7.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
driesvints committed Sep 8, 2020
2 parents 2f9c3ff + ee660e8 commit 60a58ae
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Translator.php
Expand Up @@ -122,7 +122,7 @@ public function get($key, array $replace = [], $locale = null, $fallback = true)
$locales = $fallback ? $this->localeArray($locale) : [$locale];

foreach ($locales as $locale) {
if (! is_null($line = $this->getLine(
if (! empty($line = $this->getLine(
$namespace, $group, $locale, $item, $replace
))) {
return $line ?? $key;
Expand Down

0 comments on commit 60a58ae

Please sign in to comment.