shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #2306 Fixed: Bill columns names show translation keys instead of localized strings

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-11-22 19:34:25 +03:00
parent f612e90b04
commit 88b048d9a7
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Abstracts/View/Components/DocumentForm.php
View File

@ -782,7 +782,9 @@ abstract class DocumentForm extends Base
return $textItems;
}
if (setting($this->getSettingKey($type, 'item_name')) !== null) {
if (setting($this->getSettingKey($type, 'item_name')) !== null &&
(trans(setting($this->getSettingKey($type, 'item_name'))) != setting($this->getSettingKey($type, 'item_name')))
) {
return setting($this->getSettingKey($type, 'item_name'));
}
@ -810,7 +812,9 @@ abstract class DocumentForm extends Base
return $textQuantity;
}
if (setting($this->getSettingKey($type, 'quantity_name')) !== null) {
if (setting($this->getSettingKey($type, 'quantity_name')) !== null &&
(trans(setting($this->getSettingKey($type, 'quantity_name'))) != setting($this->getSettingKey($type, 'quantity_name')))
) {
return setting($this->getSettingKey($type, 'quantity_name'));
}
@ -838,7 +842,9 @@ abstract class DocumentForm extends Base
return $textPrice;
}
if (setting($this->getSettingKey($type, 'price_name')) !== null) {
if (setting($this->getSettingKey($type, 'price_name')) !== null &&
(trans(setting($this->getSettingKey($type, 'price_name'))) != setting($this->getSettingKey($type, 'price_name')))
) {
return setting($this->getSettingKey($type, 'price_name'));
}

20
app/Abstracts/View/Components/DocumentTemplate.php
View File

@ -419,7 +419,7 @@ abstract class DocumentTemplate extends Base
}
// if you use settting translation
if (setting($this->getSettingKey($type, 'item_name'), 'items') == 'custom') {
if (setting($this->getSettingKey($type, 'item_name'), 'items') === 'custom') {
if (empty($textItems = setting($this->getSettingKey($type, 'item_name_input')))) {
$textItems = 'general.items';
}
@ -427,6 +427,12 @@ abstract class DocumentTemplate extends Base
return $textItems;
}
if (setting($this->getSettingKey($type, 'item_name')) !== null &&
(trans(setting($this->getSettingKey($type, 'item_name'))) != setting($this->getSettingKey($type, 'item_name')))
) {
return setting($this->getSettingKey($type, 'item_name'));
}
$translation = $this->getTextFromConfig($type, 'items');
if (!empty($translation)) {
@ -451,6 +457,12 @@ abstract class DocumentTemplate extends Base
return $textQuantity;
}
if (setting($this->getSettingKey($type, 'quantity_name')) !== null &&
(trans(setting($this->getSettingKey($type, 'quantity_name'))) != setting($this->getSettingKey($type, 'quantity_name')))
) {
return setting($this->getSettingKey($type, 'quantity_name'));
}
$translation = $this->getTextFromConfig($type, 'quantity');
if (!empty($translation)) {
@ -475,6 +487,12 @@ abstract class DocumentTemplate extends Base
return $textPrice;
}
if (setting($this->getSettingKey($type, 'price_name')) !== null &&
(trans(setting($this->getSettingKey($type, 'price_name'))) != setting($this->getSettingKey($type, 'price_name')))
) {
return setting($this->getSettingKey($type, 'price_name'));
}
$translation = $this->getTextFromConfig($type, 'price');
if (!empty($translation)) {