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

Merge branch 'develop' into feature/credit_calc

Browse Source 
# Conflicts:
#	app/Factory/TransactionJournalMetaFactory.php
#	app/Repositories/Account/AccountRepository.php
#	app/Transformers/AccountTransformer.php
#	config/firefly.php
#	frontend/src/components/accounts/Create.vue
This commit is contained in:
James Cole
2021-04-27 06:54:38 +02:00
parent 8ef6595ced f03b0569cf
commit 65c49c7a71
259 changed files with 3163 additions and 2520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/lang/en_US/config.php
View File

@@ -40,8 +40,11 @@ return [
'date_time_js' => 'MMMM Do, YYYY, @ HH:mm:ss',
'specific_day_js' => 'D MMMM YYYY',
'week_in_year_js' => '[Week] w, YYYY',
'week_in_year_fns' => "'Week' w, yyyy",
'year_js' => 'YYYY',
'half_year_js' => 'Q YYYY',
'quarter_fns' => "'Q'Q, yyyy",
'half_year_fns' => "'H{half}', yyyy",
'dow_1' => 'Monday',
'dow_2' => 'Tuesday',
'dow_3' => 'Wednesday',

6
resources/lang/en_US/firefly.php
View File

@@ -298,6 +298,8 @@ return [
'search_modifier_has_any_category' => 'The transaction must have a (any) category',
'search_modifier_has_no_budget' => 'The transaction must have no budget',
'search_modifier_has_any_budget' => 'The transaction must have a (any) budget',
'search_modifier_has_no_bill' => 'The transaction must have no bill',
'search_modifier_has_any_bill' => 'The transaction must have a (any) bill',
'search_modifier_has_no_tag' => 'The transaction must have no tags',
'search_modifier_has_any_tag' => 'The transaction must have a (any) tag',
'search_modifier_notes_contain' => 'The transaction notes contain ":value"',
@@ -525,6 +527,10 @@ return [
'rule_trigger_has_no_budget' => 'Transaction has no budget',
'rule_trigger_has_any_budget_choice' => 'Has a (any) budget',
'rule_trigger_has_any_budget' => 'Transaction has a (any) budget',
'rule_trigger_has_no_bill_choice' => 'Has no bill',
'rule_trigger_has_no_bill' => 'Transaction has no bill',
'rule_trigger_has_any_bill_choice' => 'Has a (any) bill',
'rule_trigger_has_any_bill' => 'Transaction has a (any) bill',
'rule_trigger_has_no_tag_choice' => 'Has no tag(s)',
'rule_trigger_has_no_tag' => 'Transaction has no tag(s)',
'rule_trigger_has_any_tag_choice' => 'Has one or more (any) tags',