* improve console version output
* fix empty string issue in csv export (DDE protection) - fixes #3189
* fix twig sort deprecation in php 8
* sort user by displayName in users report
* fix missing custom translations in edit modal
* fix font-family in invoice.css
* invoice template "freelancer pdf" - added customer number, moved some fields around
* invoice template "default" - relocate customer number and order number in
This commit is contained in:
Kevin Papst
2022-03-11 23:25:23 +01:00
committed by GitHub
parent 317ac59f47
commit 00b5a65859
21 changed files with 363 additions and 300 deletions

View File

@@ -25,7 +25,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA
/**
* @var array
*/
private $localDomains = [];
private $localDomains;
public function __construct(BaseTranslator $translator, array $localDomains = [])
{
@@ -51,8 +51,6 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA
protected function hasLocalOverwrite($id, $domain, $locale = null): bool
{
$found = false;
$catalogue = $this->getCatalogue($locale);
while (false === ($found = $catalogue->defines($id, $domain))) {
if ($cat = $catalogue->getFallbackCatalogue()) {