tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:invoiceninja/invoiceninja

Browse source
This commit is contained in:
Hillel Coren 2019-10-27 11:41:28 +02:00
commit 22bc25253e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Constants.php
View file

@ -695,7 +695,7 @@ if (! defined('APP_NAME')) {
}
// include modules in translations
function mtrans($entityType, $text = false)
function mtrans($entityType, $text = false, $replace = [])
{
if (! $text) {
$text = $entityType;
@ -704,7 +704,7 @@ if (! defined('APP_NAME')) {
// check if this has been translated in a module language file
if (! Utils::isNinjaProd() && $module = Module::find($entityType)) {
$key = "{$module->getLowerName()}::texts.{$text}";
$value = trans($key);
$value = trans($key, $replace);
if ($key != $value) {
return $value;
}