kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/5.2.8'

Browse Source
This commit is contained in:
James Cole
2020-06-06 12:19:11 +02:00
parent 326bef66ee 28d6885178
commit 389ffa820f
10 changed files with 65 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Support/FireflyConfig.php
View File

@@ -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 */

38
app/Support/Telemetry.php
View File

@@ -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.
}
}
}

15
changelog.md
View File

@@ -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
@@ -18,12 +23,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

2
config/firefly.php
View File

@@ -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,

4
resources/lang/de_DE/firefly.php
View File

@@ -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',

2
resources/lang/de_DE/form.php
View File

@@ -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',

2
resources/lang/id_ID/breadcrumbs.php
View File

@@ -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',

22
resources/lang/id_ID/firefly.php
View File

@@ -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 <a href="https://docs.firefly-iii.org/faq/other#i-lost-my-two-factor-authentication-codes-and-backup-codes">this entry in the FAQ</a> for instructions.',
'two_factor_lost_fix_owner' => 'Jika tidak, kirimkan email ke pemilik situs, <a href="mailto::site_owner">:site_owner</a> dan mintalah mereka untuk menyetel ulang autentikasi dua faktor Anda.',
'two_factor_lost_fix_owner' => 'Jika tidak, kirimkan email ke pemilik situs, <a href="mailto::site_owner">:site_owner</a> 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.',

4
resources/lang/it_IT/firefly.php
View File

@@ -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',

2
resources/lang/it_IT/form.php
View File

@@ -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',