Merge branch 'v6.2' of github.com:firefly-iii/firefly-iii into v6.2

app/Support/Steam.php

@@ -298,7 +298,8 @@ class Steam
             ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
             ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))
-                          ->get(['transaction_currencies.code', 'transactions.amount'])->toArray();
+            ->get(['transaction_currencies.code', 'transactions.amount'])->toArray()
+        ;
         $others            = $this->groupAndSumTransactions($array, 'code', 'amount');
         //        Log::debug('All others are (joined)', $others);
 

resources/assets/v1/src/locales/de.json

@@ -130,15 +130,15 @@
         "response": "Antwort",
         "visit_webhook_url": "Webhook-URL besuchen",
         "reset_webhook_secret": "Webhook Secret zur\u00fccksetzen",
-        "header_exchange_rates": "Wechselkurse",
+        "header_exchange_rates": "Exchange rates",
-        "exchange_rates_intro": "Firefly III unterst\u00fctzt das Herunterladen und Verwenden von Wechselkursen. Lesen Sie mehr dar\u00fcber in <a href=\u201ehttps:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\u201c>der Dokumentation<\/a>.",
+        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Zwischen {from} und {to} (und umgekehrt)",
+        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
         "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.",
-        "header_exchange_rates_rates": "Wechselkurse",
+        "header_exchange_rates_rates": "Exchange rates",
-        "header_exchange_rates_table": "Tabelle mit Wechselkursen",
+        "header_exchange_rates_table": "Table with exchange rates",
-        "help_rate_form": "An diesem Tag, wie viele {to} werden Sie f\u00fcr einen {from} bekommen?",
+        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
-        "add_new_rate": "Neuen Wechselkurs hinzuf\u00fcgen",
+        "add_new_rate": "Add a new exchange rate",
-        "save_new_rate": "Neuen Kurs speichern"
+        "save_new_rate": "Save new rate"
     },
     "form": {
         "url": "URL",
@@ -158,7 +158,7 @@
         "webhook_delivery": "Zustellung",
         "from_currency_to_currency": "{from} &rarr; {to}",
         "to_currency_from_currency": "{to} &rarr; {from}",
-        "rate": "Kurs"
+        "rate": "Rate"
     },
     "list": {
         "active": "Aktiv?",

resources/assets/v1/src/locales/fr.json

@@ -130,12 +130,12 @@
         "response": "R\u00e9ponse",
         "visit_webhook_url": "Visiter l'URL du webhook",
         "reset_webhook_secret": "R\u00e9initialiser le secret du webhook",
-        "header_exchange_rates": "Taux de change",
+        "header_exchange_rates": "Exchange rates",
-        "exchange_rates_intro": "Firefly III prend en charge le chargement et l'utilisation des taux de change. En savoir plus \u00e0 ce sujet dans <a href=\"https:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\">la documentation<\/a>.",
+        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Entre {from} et {to} (et l'inverse)",
+        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
         "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.",
-        "header_exchange_rates_rates": "Taux de change",
+        "header_exchange_rates_rates": "Exchange rates",
-        "header_exchange_rates_table": "Table avec taux de change",
+        "header_exchange_rates_table": "Table with exchange rates",
         "help_rate_form": "On this day, how many {to} will you get for one {from}?",
         "add_new_rate": "Add a new exchange rate",
         "save_new_rate": "Save new rate"

resources/assets/v1/src/locales/pl.json

@@ -130,15 +130,15 @@
         "response": "Odpowied\u017a",
         "visit_webhook_url": "Odwied\u017a adres URL webhooka",
         "reset_webhook_secret": "Resetuj sekret webhooka",
-        "header_exchange_rates": "Kursy wymiany",
+        "header_exchange_rates": "Exchange rates",
-        "exchange_rates_intro": "Firefly III obs\u0142uguje pobieranie i korzystanie z kurs\u00f3w wymiany walut. Wi\u0119cej informacji na ten temat w <a href=\"https:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\">dokumentacji<\/a>.",
+        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Pomi\u0119dzy {from} i {to} (i odwrotnie)",
+        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
-        "exchange_rates_intro_rates": "Firefly III bla bla bla kurs wymiany. Odwrotno\u015b\u0107 jest obliczana automatycznie, je\u015bli nie zosta\u0142a podana. Zostanie u\u017cyty ostatni znaleziony kurs.",
+        "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.",
-        "header_exchange_rates_rates": "Kursy wymiany",
+        "header_exchange_rates_rates": "Exchange rates",
-        "header_exchange_rates_table": "Tabela z kursami wymiany walut",
+        "header_exchange_rates_table": "Table with exchange rates",
-        "help_rate_form": "W tym dniu, ile {to} otrzymasz za jeden {from}?",
+        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
-        "add_new_rate": "Dodaj nowy kurs wymiany",
+        "add_new_rate": "Add a new exchange rate",
-        "save_new_rate": "Zapisz nowy kurs"
+        "save_new_rate": "Save new rate"
     },
     "form": {
         "url": "URL",
@@ -158,7 +158,7 @@
         "webhook_delivery": "Dor\u0119czenie",
         "from_currency_to_currency": "{from} &rarr; {to}",
         "to_currency_from_currency": "{to} &rarr; {from}",
-        "rate": "Kurs"
+        "rate": "Rate"
     },
     "list": {
         "active": "Jest aktywny?",