From 4dfad6633344040b263b24fcada3123d0976f980 Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Wed, 27 Apr 2022 00:22:21 +0000 Subject: [PATCH 1/3] new crowdin translations --- resources/lang/bs-BA/maintenance.php | 2 ++ resources/lang/en-AU/maintenance.php | 2 ++ resources/lang/es-ES/maintenance.php | 2 ++ resources/lang/pt-BR/maintenance.php | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/lang/bs-BA/maintenance.php b/resources/lang/bs-BA/maintenance.php index 4395d8cd4..f34318a09 100644 --- a/resources/lang/bs-BA/maintenance.php +++ b/resources/lang/bs-BA/maintenance.php @@ -6,4 +6,6 @@ return [ 'message' => 'Žao nam je, trenutno smo na održavanju. Molimo pokušajte ponovo kasnije!', + 'read_only' => 'Omogućen je samo režim za čitanje. Dozvoljen vam je pregled, ali ništa ne možete mijenjati!', + ]; diff --git a/resources/lang/en-AU/maintenance.php b/resources/lang/en-AU/maintenance.php index 49b62ed72..645b59fed 100644 --- a/resources/lang/en-AU/maintenance.php +++ b/resources/lang/en-AU/maintenance.php @@ -6,4 +6,6 @@ return [ 'message' => 'Sorry, we\'re down for maintenance. Please, try again later!', + 'read_only' => 'Read-only mode is enabled. You are allowed to view but not change anything!', + ]; diff --git a/resources/lang/es-ES/maintenance.php b/resources/lang/es-ES/maintenance.php index b457e72ac..e85c8109a 100644 --- a/resources/lang/es-ES/maintenance.php +++ b/resources/lang/es-ES/maintenance.php @@ -6,4 +6,6 @@ return [ 'message' => 'Lo sentimos, estamos en mantenimiento. Por favor, inténtalo de nuevo más tarde!', + 'read_only' => 'El modo de solo lectura está activo. Puede ver pero no hacer cambios.', + ]; diff --git a/resources/lang/pt-BR/maintenance.php b/resources/lang/pt-BR/maintenance.php index 77b7343fc..f0bfdccbc 100644 --- a/resources/lang/pt-BR/maintenance.php +++ b/resources/lang/pt-BR/maintenance.php @@ -6,6 +6,6 @@ return [ 'message' => 'Desculpe, estamos em manutenção. Por favor, tente novamente mais tarde!', - 'read_only' => 'Modo somente leitura está ativado. Você poderá visualizar, mas não pode alterar nada!', + 'read_only' => 'O modo somente leitura está ativado. É permitido visualizar, mas não altera nada!', ]; From 07ef2228f832cd77b14140813018ba5a96069453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 27 Apr 2022 12:23:15 +0300 Subject: [PATCH 2/3] close #2390 Fixed: Transactions index page broken --- app/Models/Banking/Transaction.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php index 36081fa84..b870bc1ea 100644 --- a/app/Models/Banking/Transaction.php +++ b/app/Models/Banking/Transaction.php @@ -387,18 +387,18 @@ class Transaction extends Model } if ($this->isIncome()) { - if ($this->document->type != 'invoice') { + if (! empty($this->document) && $this->document->type != 'invoice') { return $this->getRouteFromConfig(); } else { - return !empty($this->document_id) ? 'invoices.show' : 'revenues.show'; + return ! empty($this->document_id) ? 'invoices.show' : 'revenues.show'; } } if ($this->isExpense()) { - if ($this->document->type != 'bill') { + if (! empty($this->document) && $this->document->type != 'bill') { return $this->getRouteFromConfig(); } else { - return !empty($this->document_id) ? 'bills.show' : 'payments.show'; + return ! empty($this->document_id) ? 'bills.show' : 'payments.show'; } } From 739a5d230547d353128fbd1ef20cfe9ad9ab9a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 27 Apr 2022 15:25:37 +0300 Subject: [PATCH 3/3] version update 2.1.34 to 2.1.35 --- config/version.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/version.php b/config/version.php index 0681f8d3a..38a81f0b3 100644 --- a/config/version.php +++ b/config/version.php @@ -10,15 +10,15 @@ return [ 'minor' => '1', - 'patch' => '34', + 'patch' => '35', 'build' => '', 'status' => 'Stable', - 'date' => '26-April-2021', + 'date' => '27-April-2021', - 'time' => '12:00', + 'time' => '14:00', 'zone' => 'GMT +3',