From 1cba62aa429cf6bf60a359dcbf74d5b0eb0e966d Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 6 Jun 2020 07:26:22 +0200 Subject: [PATCH 1/4] Cleanup changelog, forgot some unused entries. --- changelog.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/changelog.md b/changelog.md index 072de3515b..2a3351511d 100644 --- a/changelog.md +++ b/changelog.md @@ -18,12 +18,6 @@ This project adheres to [Semantic Versioning](http://semver.org/). - [Issue 3404](https://github.com/firefly-iii/firefly-iii/issues/3404) The profile page has been translated. See the note at the bottom. Thanks to @sephrat - [Issue 3405](https://github.com/firefly-iii/firefly-iii/issues/3405) All error pages have been translated. See the note at the bottom. Thanks to @sephrat -### Deprecated -- Initial release. - -### Removed -- Initial release. - ### Fixed - [Issue 3309](https://github.com/firefly-iii/firefly-iii/issues/3309) New budgets would create bad budget limits. - [Issue 3390](https://github.com/firefly-iii/firefly-iii/issues/3390) Typos and minor text inconsistencies fixed by @sephrat From a35bccb94088f193633652bb22b677b1a6628b13 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 6 Jun 2020 12:14:55 +0200 Subject: [PATCH 2/4] Fix #3443 --- app/Support/FireflyConfig.php | 17 ++++++++++++++-- app/Support/Telemetry.php | 38 ++++++++++++++++++++++------------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php index ecc7ae508e..d4e9619f2c 100644 --- a/app/Support/FireflyConfig.php +++ b/app/Support/FireflyConfig.php @@ -25,6 +25,7 @@ namespace FireflyIII\Support; use Cache; use Exception; use FireflyIII\Models\Configuration; +use Illuminate\Database\QueryException; use Log; /** @@ -80,7 +81,11 @@ class FireflyConfig return Cache::get($fullName); } - $config = Configuration::where('name', $name)->first(['id', 'name', 'data']); + try { + $config = Configuration::where('name', $name)->first(['id', 'name', 'data']); + } catch (QueryException|Exception $e) { + return null; + } if ($config) { Cache::forever($fullName, $config); @@ -148,7 +153,15 @@ class FireflyConfig } Log::debug('Set new value for ', ['name' => $name]); /** @var Configuration $config */ - $config = Configuration::whereName($name)->first(); + try { + $config = Configuration::whereName($name)->first(); + } catch (QueryException|Exception $e) { + $item = new Configuration; + $item->name = $name; + $item->data = $value; + + return $item; + } if (null === $config) { Log::debug('Does not exist yet ', ['name' => $name]); /** @var Configuration $item */ diff --git a/app/Support/Telemetry.php b/app/Support/Telemetry.php index 7b8a5cba76..14ef9cc927 100644 --- a/app/Support/Telemetry.php +++ b/app/Support/Telemetry.php @@ -23,8 +23,10 @@ declare(strict_types=1); namespace FireflyIII\Support; use Carbon\Carbon; +use Exception; use FireflyIII\Models\Telemetry as TelemetryModel; use FireflyIII\Support\System\GeneratesInstallationId; +use Illuminate\Database\QueryException; use JsonException; use Log; @@ -126,12 +128,17 @@ class Telemetry Log::error(sprintf('JSON Exception encoding the following value: %s: %s', $value, $e->getMessage())); $jsonEncoded = []; } + try { + $count = TelemetryModel + ::where('type', $type) + ->where('key', $key) + ->where('value', $jsonEncoded) + ->count(); + } catch (QueryException|Exception $e) { + $count = 0; + } - return TelemetryModel - ::where('type', $type) - ->where('key', $key) - ->where('value', $jsonEncoded) - ->count() > 0; + return $count > 0; } /** @@ -171,14 +178,17 @@ class Telemetry $this->generateInstallationId(); $config = app('fireflyconfig')->get('installation_id', null); $installationId = null !== $config ? $config->data : 'empty'; - TelemetryModel::create( - [ - 'installation_id' => $installationId, - 'key' => $name, - 'type' => $type, - 'value' => $value, - ] - ); + try { + TelemetryModel::create( + [ + 'installation_id' => $installationId, + 'key' => $name, + 'type' => $type, + 'value' => $value, + ] + ); + } catch (QueryException|Exception $e) { + // ignore. + } } - } From 00f579909ee2b17585ef5a270d2eed65600a2cf4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 6 Jun 2020 12:16:32 +0200 Subject: [PATCH 3/4] Update meta files. --- resources/lang/de_DE/firefly.php | 4 ++-- resources/lang/de_DE/form.php | 2 +- resources/lang/id_ID/breadcrumbs.php | 2 +- resources/lang/id_ID/firefly.php | 22 +++++++++++----------- resources/lang/it_IT/firefly.php | 4 ++-- resources/lang/it_IT/form.php | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index c987097720..42ffae2c75 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -436,8 +436,8 @@ return [ 'rule_trigger_tag_is' => 'Ein Schlagwort ist ":trigger_value"', 'rule_trigger_currency_is_choice' => 'Buchungswährung ist …', 'rule_trigger_currency_is' => 'Buchungswährung ist „:trigger_value”', - 'rule_trigger_foreign_currency_is_choice' => 'Transaction foreign currency is..', - 'rule_trigger_foreign_currency_is' => 'Transaction foreign currency is ":trigger_value"', + 'rule_trigger_foreign_currency_is_choice' => 'Fremdwährung der Buchung ist …', + 'rule_trigger_foreign_currency_is' => 'Fremdwährung der Buchung ist „:trigger_value”', 'rule_trigger_has_attachments_choice' => 'Hat mindestens so viele Anhänge', 'rule_trigger_has_attachments' => 'Hat mindestens :count Anhang|Hat mindestens :count Anhänge', 'rule_trigger_store_journal' => 'Wenn eine Buchung erstellt wird', diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php index 8821cd1476..abdd166591 100644 --- a/resources/lang/de_DE/form.php +++ b/resources/lang/de_DE/form.php @@ -38,7 +38,7 @@ return [ 'match' => 'Reagiert auf', 'strict' => 'Strenger Modus', 'repeat_freq' => 'Wiederholungen', - 'object_group' => 'Group', + 'object_group' => 'Gruppe', 'location' => 'Herkunft', 'update_channel' => 'Aktualisierungskanal', 'currency_id' => 'Währung', diff --git a/resources/lang/id_ID/breadcrumbs.php b/resources/lang/id_ID/breadcrumbs.php index eed57d0103..689832fcd2 100644 --- a/resources/lang/id_ID/breadcrumbs.php +++ b/resources/lang/id_ID/breadcrumbs.php @@ -43,7 +43,7 @@ return [ 'deposit_list' => 'Pendapatan, pemasukan, dan deposit', 'transfer_list' => 'Transfer', 'transfers_list' => 'Transfer', - 'reconciliation_list' => 'Rekonsiliasi', + 'reconciliation_list' => 'Penyesuaian', 'create_withdrawal' => 'Buat penarikan baru', 'create_deposit' => 'Buat deposit baru', 'create_transfer' => 'Buat transfer baru', diff --git a/resources/lang/id_ID/firefly.php b/resources/lang/id_ID/firefly.php index e3a27368c2..22fb11299c 100644 --- a/resources/lang/id_ID/firefly.php +++ b/resources/lang/id_ID/firefly.php @@ -51,17 +51,17 @@ return [ 'asset_account_role_help' => 'Setiap pilihan tambahan yang dihasilkan dari pilihan Anda dapat diatur nanti.', 'Opening balance' => 'Saldo awal', 'create_new_stuff' => 'Buat barang baru', - 'new_withdrawal' => 'Penarikan baru', + 'new_withdrawal' => 'Pengambilan baru', 'create_new_transaction' => 'Membuat transaksi baru', 'sidebar_frontpage_create' => 'Create', 'new_transaction' => 'Transaksi baru', - 'no_rules_for_bill' => 'Tagihan ini tidak terkait dengan aturan yang telah ada.', + 'no_rules_for_bill' => 'Bill ini tidak terkait dengan aturan yang telah ada.', 'go_to_asset_accounts' => 'Menampilkan rekening aset', 'go_to_budgets' => 'Pergi ke anggaran mu', 'new_clone_instructions' => 'Tombol ini secara otomatis menyalin transaksi dan mengatur tanggal dengan tanggal hari ini. Apakah ada yakin?', 'clones_journal_x' => 'Transaksi ini adalah salinan dari ":description" (#:id)', 'go_to_categories' => 'Menuju ke kategori yang anda miliki', - 'go_to_bills' => 'Menuju ke tagihan yang anda miliki', + 'go_to_bills' => 'Menuju ke bill yang anda miliki', 'go_to_expense_accounts' => 'Melihat akun pengeluaran anda', 'go_to_revenue_accounts' => 'See your revenue accounts', 'go_to_piggies' => 'Go to your piggy banks', @@ -73,8 +73,8 @@ return [ 'new_revenue_account' => 'Akun pendapatan baru', 'new_liabilities_account' => 'New liability', 'new_budget' => 'Anggaran baru', - 'new_bill' => 'Tagihan baru', - 'block_account_logout' => 'Kamu telah keluar Akun yang diblokir tidak dapat menggunakan situs ini. Apakah Anda mendaftar dengan alamat email yang benar?', + 'new_bill' => 'Bill baru', + 'block_account_logout' => 'Kamu telah keluar Akun yang ditangguhkan tidak dapat menggunakan situs ini. Apakah Anda mendaftar dengan alamat email yang benar?', 'flash_success' => 'Keberhasilan!', 'flash_info' => 'Pesan', 'flash_warning' => 'PERINGATAN!', @@ -87,16 +87,16 @@ return [ 'no_help_could_be_found' => 'No help text could be found.', 'no_help_title' => 'Apologies, an error occurred.', 'two_factor_welcome' => 'Hello!', - 'two_factor_enter_code' => 'Untuk melanjutkan, masukkan kode otentikasi dua faktor Anda. Aplikasi Anda bisa menghasilkannya untuk Anda.', + 'two_factor_enter_code' => 'Untuk melanjutkan, masukkan kode Pengecekan keamanan dua faktor Anda. Aplikasi Anda bisa menghasilkannya untuk Anda.', 'two_factor_code_here' => 'Masukkan kode di sini', - 'two_factor_title' => 'Dua faktor otentikasi', - 'authenticate' => 'Otentikasi', - 'two_factor_forgot_title' => 'Kehilangan dua faktor otentikasi', + 'two_factor_title' => 'Pengecekan keamanan Dua faktor', + 'authenticate' => 'Pengecekan keamanan', + 'two_factor_forgot_title' => 'Kehilangan Pengecekan keamanan dua faktor', 'two_factor_forgot' => 'Saya lupa dua faktor saya.', - 'two_factor_lost_header' => 'Kehilangan autentikasi dua faktor Anda?', + 'two_factor_lost_header' => 'Kehilangan Pengecekan keamanan dua faktor Anda?', 'two_factor_lost_intro' => 'If you lost your backup codes as well, you have bad luck. This is not something you can fix from the web interface. You have two choices.', 'two_factor_lost_fix_self' => 'If you run your own instance of Firefly III, read this entry in the FAQ for instructions.', - 'two_factor_lost_fix_owner' => 'Jika tidak, kirimkan email ke pemilik situs, :site_owner dan mintalah mereka untuk menyetel ulang autentikasi dua faktor Anda.', + 'two_factor_lost_fix_owner' => 'Jika tidak, kirimkan email ke pemilik situs, :site_owner dan mintalah mereka untuk menyetel ulang Pengecekan keamanan dua faktor Anda.', 'mfa_backup_code' => 'You have used a backup code to login to Firefly III. It can\'t be used again, so cross it from your list.', 'pref_two_factor_new_backup_codes' => 'Get new backup codes', 'pref_two_factor_backup_code_count' => 'You have :count valid backup code.|You have :count valid backup codes.', diff --git a/resources/lang/it_IT/firefly.php b/resources/lang/it_IT/firefly.php index 11e5395e82..59c070fbb6 100644 --- a/resources/lang/it_IT/firefly.php +++ b/resources/lang/it_IT/firefly.php @@ -436,8 +436,8 @@ return [ 'rule_trigger_tag_is' => 'Una etichetta è ":trigger_value"', 'rule_trigger_currency_is_choice' => 'La valuta della transazione è...', 'rule_trigger_currency_is' => 'La valuta della transazione è ":trigger_value"', - 'rule_trigger_foreign_currency_is_choice' => 'Transaction foreign currency is..', - 'rule_trigger_foreign_currency_is' => 'Transaction foreign currency is ":trigger_value"', + 'rule_trigger_foreign_currency_is_choice' => 'La valuta estera della transazione è...', + 'rule_trigger_foreign_currency_is' => 'La valuta estera della transazione è ":trigger_value"', 'rule_trigger_has_attachments_choice' => 'Ha almeno così tanti allegati', 'rule_trigger_has_attachments' => 'Ha almeno :count allegato|Ha almeno :count allegati', 'rule_trigger_store_journal' => 'Quando una transazione viene creata', diff --git a/resources/lang/it_IT/form.php b/resources/lang/it_IT/form.php index 83c3daf0bd..72982bc9f1 100644 --- a/resources/lang/it_IT/form.php +++ b/resources/lang/it_IT/form.php @@ -38,7 +38,7 @@ return [ 'match' => 'Abbina con', 'strict' => 'Modalità severa', 'repeat_freq' => 'Si ripete', - 'object_group' => 'Group', + 'object_group' => 'Gruppo', 'location' => 'Posizione', 'update_channel' => 'Canale di aggiornamento', 'currency_id' => 'Valuta', From 28d6885178d8d6f4e05ef780129bd2eb6f911762 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 6 Jun 2020 12:18:42 +0200 Subject: [PATCH 4/4] Update meta files for 5.2.8 --- changelog.md | 9 +++++++-- config/firefly.php | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index 2a3351511d..f622e9ab46 100644 --- a/changelog.md +++ b/changelog.md @@ -2,13 +2,18 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [5.2.7 (API 1.1.0) - 2020-06-01 +## [5.2.8 (API 1.1.0)] - 2020-06-02 + +### Fixed +- [Issue 3443](https://github.com/firefly-iii/firefly-iii/issues/3443) Fixed issue with composer installation. + +## [5.2.7 (API 1.1.0)] - 2020-06-01 ### Added - Firefly III **optional + opt-in** telemetry can now be enabled, if you want to. Read more about it [here](https://docs.firefly-iii.org/support/telemetry). - [Issue 3133](https://github.com/firefly-iii/firefly-iii/issues/3133) You can remove attachments before you create a transaction. - [Issue 3395](https://github.com/firefly-iii/firefly-iii/issues/3395) Emails sent by Firefly III have been translated. See the note at the bottom. Thanks to @sephrat -- [Issue 3393](https://github.com/firefly-iii/firefly-iii/issues/3393) New SSL options for LDAP and MySQL. Thanks to @sephrat +- [Issue 3393](https://github.com/firefly-iii/firefly-iii/issues/3393) New SSL options for LDAP and MySQL. Thanks to @bpatath. - [Issue 3413](https://github.com/firefly-iii/firefly-iii/issues/3413) Better string pluralization. Thanks to @sephrat - [Issue 3297](https://github.com/firefly-iii/firefly-iii/issues/3297) Rule trigger for foreign currency ID diff --git a/config/firefly.php b/config/firefly.php index ae0f91fbb1..61dde484a5 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -144,7 +144,7 @@ return [ ], 'encryption' => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'), - 'version' => '5.2.7', + 'version' => '5.2.8', 'api_version' => '1.1.0', 'db_version' => 13, 'maxUploadSize' => 15242880,