mcndave/tell
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: mcndave/tell:1683435d5d9a68fcc223810b1d651dd705b26afe
mcndave/tell:master
mcndave/tell:v1.0.0
...
compare: mcndave/tell:c7c955ecadb9cb5746eb7605717ae57b1ec21628
mcndave/tell:master
mcndave/tell:v1.0.0
2 Commits
1683435d5d ... c7c955ecad
Author SHA1 Message Date
mcndave c7c955ecad Merge branch 'master' of https://git.mcnd.ca/mcndave/tell 2022-10-12 18:37:34 +00:00
mcndave af4be4ed7f - Small fix for a bug found within PHP 8 2022-10-12 18:37:23 +00:00
1 changed files with 2 additions and 3 deletions
Expand all files Collapse all files
src/I18n.php
+2 -3
View File
@@ -31,8 +31,6 @@ class I18n implements MissingKeyInterface
$this->dataReader = $dataReader; $this->dataReader = $dataReader;
$this->cacheReader = $cacheReader; $this->cacheReader = $cacheReader;
$this->missingKey = $missingKey; $this->missingKey = $missingKey;
$this->locale = \Locale::getDefault() ?: $this->locale;
} }
public function initialize(bool $useCache) : bool public function initialize(bool $useCache) : bool
@@ -136,7 +134,8 @@ class I18n implements MissingKeyInterface
$search = []; $search = [];
foreach($matches as $item) { foreach($matches as $item) {
$search[ $item[0] ] = Iterate::arrayGet($parameters, $item[1]); $iterate = Iterate::arrayGet($parameters, $item[1]);
$search[ $item[0] ] = $iterate !== null ? $iterate : $item[0];
} }
return str_replace(array_keys($search), array_values($search), $string); return str_replace(array_keys($search), array_values($search), $string);