Fixed document title issue..

akaunting · Jun 27, 2021 · 3ba2926 · 3ba2926
1 parent e803b4a
commit 3ba2926
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/app/Abstracts/View/Components/DocumentShow.php b/app/Abstracts/View/Components/DocumentShow.php
@@ -1151,16 +1151,16 @@ protected function getTextDocumentTitle($type, $textDocumentTitle)
             return $textDocumentTitle;
         }
 
-        $translation = $this->getTextFromConfig($type, 'document_title', 'title');
-
-        if (!empty($translation)) {
-            return $translation;
-        }
-
         if (!empty(setting($type . '.title'))) {
             return setting($type . '.title');
         }
 
+        $translation = $this->getTextFromConfig($type, 'document_title', Str::plural($type), 'trans_choice');
+
+        if (!empty($translation)) {
+            return trans_choice($translation, 1);
+        }
+
         return setting('invoice.title');
     }
 
@@ -1170,17 +1170,17 @@ protected function getTextDocumentSubheading($type, $textDocumentSubheading)
             return $textDocumentSubheading;
         }
 
+        if (!empty(setting($type . '.subheading'))) {
+            return setting($type . '.subheading');
+        }
+
         $translation = $this->getTextFromConfig($type, 'document_subheading', 'subheading');
 
         if (!empty($translation)) {
-            return $translation;
-        }
-
-        if (!empty(setting($type . '.subheading'))) {
-            return setting($type . '.subheading');
+            return trans($translation);
         }
 
-        return setting('invoice.subheading');
+        return false;
     }
 
     protected function getTextTimelineCreateTitle($type, $textTimelineCreateTitle)

diff --git a/app/Abstracts/View/Components/DocumentTemplate.php b/app/Abstracts/View/Components/DocumentTemplate.php
@@ -279,7 +279,7 @@ protected function getTextDocumentTitle($type, $textDocumentTitle)
             return setting($type . '.title');
         }
 
-        $translation = $this->getTextFromConfig($type, 'document_title', Str::plural($type));
+        $translation = $this->getTextFromConfig($type, 'document_title', Str::plural($type), 'trans_choice');
 
         if (!empty($translation)) {
             return trans_choice($translation, 1);