mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Add newlines and remove some unused translations.
This commit is contained in:
parent
64ac3927ec
commit
f3ac8a5888
2
.github/lock.yml
vendored
2
.github/lock.yml
vendored
@ -32,4 +32,4 @@ setLockReason: true
|
||||
# daysUntilLock: 30
|
||||
|
||||
# Repository to extend settings from
|
||||
# _extends: repo
|
||||
# _extends: repo
|
||||
|
@ -230,4 +230,4 @@ trait AccountCollection
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -84,4 +84,4 @@ trait AmountCollection
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -56,4 +56,4 @@ trait CollectorProperties
|
||||
private $total;
|
||||
/** @var User The user object. */
|
||||
private $user;
|
||||
}
|
||||
}
|
||||
|
@ -288,4 +288,4 @@ trait MetaCollection
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -108,4 +108,4 @@ class BudgetController extends Controller
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -72,4 +72,4 @@ class Telemetry extends Model
|
||||
'value' => 'array',
|
||||
];
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -198,4 +198,4 @@ class OperationsRepository implements OperationsRepositoryInterface
|
||||
{
|
||||
throw new FireflyException(sprintf('%s is not yet implemented', __METHOD__));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -84,4 +84,4 @@ interface OperationsRepositoryInterface
|
||||
* @return array
|
||||
*/
|
||||
public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array;
|
||||
}
|
||||
}
|
||||
|
@ -302,4 +302,4 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
|
||||
->where('start_date', $start->format('Y-m-d 00:00:00'))
|
||||
->where('end_date', $end->format('Y-m-d 00:00:00'))->first();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -154,4 +154,4 @@ interface AvailableBudgetRepositoryInterface
|
||||
*/
|
||||
public function updateAvailableBudget(AvailableBudget $availableBudget, array $data): AvailableBudget;
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -463,4 +463,4 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
|
||||
$budget->budgetlimits()->delete();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -146,4 +146,4 @@ interface BudgetLimitRepositoryInterface
|
||||
*/
|
||||
public function updateLimitAmount(Budget $budget, Carbon $start, Carbon $end, string $amount): ?BudgetLimit;
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -200,4 +200,4 @@ class NoBudgetRepository implements NoBudgetRepositoryInterface
|
||||
|
||||
return $array;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -70,4 +70,4 @@ interface NoBudgetRepositoryInterface
|
||||
*/
|
||||
public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?TransactionCurrency $currency = null): array;
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -433,4 +433,4 @@ class OperationsRepository implements OperationsRepositoryInterface
|
||||
|
||||
return $repos->getActiveBudgets();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -123,4 +123,4 @@ interface OperationsRepositoryInterface
|
||||
*/
|
||||
public function listExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null): array;
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -240,4 +240,4 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface
|
||||
|
||||
return $array;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -88,4 +88,4 @@ interface NoCategoryRepositoryInterface
|
||||
public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -317,4 +317,4 @@ class OperationsRepository implements OperationsRepositoryInterface
|
||||
|
||||
return $set;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -89,4 +89,4 @@ interface OperationsRepositoryInterface
|
||||
* @return array
|
||||
*/
|
||||
public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $categories = null): array;
|
||||
}
|
||||
}
|
||||
|
@ -251,4 +251,4 @@ class OperationsRepository implements OperationsRepositoryInterface
|
||||
|
||||
return $repository->get();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -90,4 +90,4 @@ interface OperationsRepositoryInterface
|
||||
* @return array
|
||||
*/
|
||||
public function sumIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $tags = null): array;
|
||||
}
|
||||
}
|
||||
|
@ -64,4 +64,4 @@ class TelemetryRepository implements TelemetryRepositoryInterface
|
||||
// created_at is never NULL.
|
||||
Telemetry::whereNotNull('submitted')->delete();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -56,4 +56,4 @@ interface TelemetryRepositoryInterface
|
||||
*/
|
||||
public function deleteSubmitted(): void;
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -71,4 +71,4 @@ class IsTransferAccount implements Rule
|
||||
|
||||
return !(false === $validAccount);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -217,4 +217,4 @@ class UpdateRequest implements UpdateRequestInterface
|
||||
|
||||
return $return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -36,4 +36,4 @@ interface UpdateRequestInterface
|
||||
*/
|
||||
public function getUpdateInformation(string $channel): array;
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -53,4 +53,4 @@ trait LocationServiceTrait
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -264,4 +264,4 @@ class FrontpageChartGenerator
|
||||
return $currencyData;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -86,4 +86,4 @@ class AutoBudgetCronjob extends AbstractCronjob
|
||||
app('fireflyconfig')->set('last_ab_job', (int)$this->date->format('U'));
|
||||
Log::info('Done with auto budget cron job task.');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -143,4 +143,4 @@ class AccountSearch implements GenericSearchInterface
|
||||
$this->user = $user;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -35,4 +35,4 @@ interface GenericSearchInterface
|
||||
*/
|
||||
public function search(): Collection;
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -37,4 +37,4 @@ class TransactionSearch implements GenericSearchInterface
|
||||
{
|
||||
// TODO: Implement search() method.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -145,4 +145,4 @@ class TransferSearch implements GenericSearchInterface
|
||||
$this->source = $this->accountRepository->findByName($source, $this->types);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -109,4 +109,4 @@ class OAuthKeys
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -49,4 +49,4 @@ trait AccountValidatorProperties
|
||||
private $transactionType;
|
||||
/** @var User */
|
||||
private $user;
|
||||
}
|
||||
}
|
||||
|
@ -139,4 +139,4 @@ trait DepositValidation
|
||||
// don't expect to end up here:
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -145,4 +145,4 @@ trait OBValidation
|
||||
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -104,4 +104,4 @@ trait ReconciliationValidation
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -120,4 +120,4 @@ trait TransferValidation
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -117,4 +117,4 @@ trait WithdrawalValidation
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -69,4 +69,4 @@ trait CurrencyValidation
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -129,4 +129,4 @@ trait GroupValidation
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1,139 +0,0 @@
|
||||
<!--
|
||||
- Index.vue
|
||||
- Copyright (c) 2019 james@firefly-iii.org
|
||||
-
|
||||
- This file is part of Firefly III (https://github.com/firefly-iii).
|
||||
-
|
||||
- This program is free software: you can redistribute it and/or modify
|
||||
- it under the terms of the GNU Affero General Public License as
|
||||
- published by the Free Software Foundation, either version 3 of the
|
||||
- License, or (at your option) any later version.
|
||||
-
|
||||
- This program is distributed in the hope that it will be useful,
|
||||
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
- GNU Affero General Public License for more details.
|
||||
-
|
||||
- You should have received a copy of the GNU Affero General Public License
|
||||
- along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<table class="table table-hover sortable">
|
||||
<caption>Bills table</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col" class="hidden-sm hidden-xs" data-defaultsort="disabled"> </th>
|
||||
<th scope="col">{{ 'list.name' | trans }}</th>
|
||||
<th scope="col"data-defaultsign="az" class="hidden-sm hidden-md hidden-xs">{{ 'list.matchesOn' | trans }}</th>
|
||||
<th scope="col" data-defaultsign="_19" colspan="2">{{ 'list.amount' | trans }}</th>
|
||||
<th scope="col" data-defaultsign="month" class="hidden-sm hidden-xs">{{ 'list.paid_current_period' | trans }}</th>
|
||||
<th scope="col" data-defaultsign="month" class="hidden-sm hidden-xs">{{ 'list.next_expected_match' | trans }}</th>
|
||||
<th scope="col" class="hidden-sm hidden-xs hidden-md">{{ 'list.active' | trans }}</th>
|
||||
<th scope="col" class="hidden-sm hidden-xs hidden-md">{{ 'list.automatch' | trans }}</th>
|
||||
<th scope="col" data-defaultsign="az" class="hidden-sm hidden-xs">{{ 'list.repeat_freq' | trans }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(bill, index) in list">
|
||||
<td class="hidden-sm hidden-xs">
|
||||
<div class="btn-group btn-group-xs edit_tr_buttons"><a href="x" class="btn btn-default btn-xs"><i class="fa fa-fw fa-pencil"></i></a><a href="x" class="btn btn-danger btn-xs"><i class="fa fa-fw fa-trash-o"></i></a></div>
|
||||
</td>
|
||||
<td :data-value="bill.attributes.name">
|
||||
<a href="x" :title="bill.attributes.name">{{ bill.attributes.name }}</a>
|
||||
<i v-if='bill.attributes.attachments_count > 0' class="fa fa-paperclip"></i>
|
||||
</td>
|
||||
<td class="hidden-sm hidden-md hidden-xs">
|
||||
<span v-for="(word) in bill.attributes.match"><span class="label label-info">{{ word }}</span> </span>
|
||||
</td>
|
||||
<td :data-value="bill.attributes.amount_min" style="text-align: right;">
|
||||
<span style="margin-right:5px;" v-html="formatAmount(bill.attributes.amount_min)"></span>
|
||||
</td>
|
||||
<td :data-value="bill.attributes.amount_max" style="text-align: right;">
|
||||
<span style="margin-right:5px;" v-html="formatAmount(bill.attributes.amount_max)"></span>
|
||||
</td>
|
||||
<!-- first two -->
|
||||
<td v-if="bill.attributes.paid_dates.length == 0 && bill.attributes.pay_dates.length == 0 && bill.attributes.active" class="paid_in_period text-muted">
|
||||
{{ 'components.not_expected_period' | trans }}
|
||||
</td>
|
||||
<td v-if="bill.attributes.paid_dates.length == 0 && bill.attributes.pay_dates.length == 0 && bill.attributes.active" class="expected_in_period hidden-sm hidden-xs">
|
||||
{{ bill.attributes.next_expected_match|formatDate }}
|
||||
</td>
|
||||
|
||||
<!-- second set -->
|
||||
<td v-if="bill.attributes.paid_dates.length == 0 && bill.attributes.pay_dates.length > 0 && bill.attributes.active" class="paid_in_period text-danger">
|
||||
{{ 'components.not_or_not_yet' | trans }}
|
||||
</td>
|
||||
<td v-if="bill.attributes.paid_dates.length == 0 && bill.attributes.pay_dates.length > 0 && bill.attributes.active" class="expected_in_period hidden-sm hidden-xs">
|
||||
{{ bill.attributes.next_expected_match|formatDate }}
|
||||
</td>
|
||||
|
||||
<!-- third set -->
|
||||
<td v-if="bill.attributes.paid_dates.length > 0 && bill.attributes.active" class="paid_in_period text-success">
|
||||
<span v-for="date in bill.attributes.paid_dates">{{ date|formatDate }}<br /></span>
|
||||
</td>
|
||||
<td v-if="bill.attributes.paid_dates.length > 0 && bill.attributes.active" class="expected_in_period hidden-sm hidden-xs">
|
||||
{{ bill.attributes.next_expected_match|formatDate }}
|
||||
</td>
|
||||
|
||||
<!-- last set -->
|
||||
<td v-if="bill.attributes.active === false" class="paid_in_period text-muted" data-value="0000-00-00 00-00-00">
|
||||
~
|
||||
</td>
|
||||
<td v-if="bill.attributes.active === false" class="expected_in_period text-muted hidden-sm hidden-xs" data-value="0">
|
||||
~
|
||||
</td>
|
||||
<td class="hidden-sm hidden-xs hidden-md" :data-value="bill.attributes.active">
|
||||
<i v-if="bill.attributes.active === true" class="fa fa-fw fa-check"></i>
|
||||
<i v-if="bill.attributes.active === false" class="fa fa-fw fa-ban"></i>
|
||||
</td>
|
||||
<td class="hidden-sm hidden-xs hidden-md" :data-value="bill.attributes.automatch">
|
||||
<i v-if="bill.attributes.automatch === true" class="fa fa-fw fa-check"></i>
|
||||
<i v-if="bill.attributes.automatch === false" class="fa fa-fw fa-ban"></i>
|
||||
</td>
|
||||
<td class="hidden-sm hidden-xs" :data-value="bill.attributes.repeat_freq + bill.attributes.skip">
|
||||
{{ bill.attributes.repeat_freq }}
|
||||
<span v-if="bill.attributes.skip > 0">Skips over {{ bill.attributes.skip }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<!--<button @click="deleteBill(bill.attributes.id)" class="btn btn-danger btn-xs pull-right">Delete</button>-->
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
list: [],
|
||||
bill: {
|
||||
id: '',
|
||||
name: ''
|
||||
}
|
||||
};
|
||||
},
|
||||
|
||||
created() {
|
||||
this.fetchBillList();
|
||||
},
|
||||
|
||||
methods: {
|
||||
formatAmount: Vue.filter('formatAmount'),
|
||||
trans: Vue.filter('trans'),
|
||||
fetchBillList() {
|
||||
axios.get('api/v1/bill', {params: {start: window.sessionStart, end: window.sessionEnd}}).then((res) => {
|
||||
this.list = res.data.data;
|
||||
});
|
||||
},
|
||||
|
||||
deleteBill(id) {
|
||||
axios.delete('api/bills/' + id)
|
||||
.then((res) => {
|
||||
this.fetchBillList()
|
||||
})
|
||||
.catch((err) => console.error(err));
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
2
resources/assets/js/create_transaction.js
vendored
2
resources/assets/js/create_transaction.js
vendored
@ -73,4 +73,4 @@ new Vue({
|
||||
render: (createElement) => {
|
||||
return createElement(CreateTransaction, { props: props });
|
||||
},
|
||||
});
|
||||
});
|
||||
|
2
resources/assets/js/edit_transaction.js
vendored
2
resources/assets/js/edit_transaction.js
vendored
@ -73,4 +73,4 @@ new Vue({
|
||||
render: (createElement) => {
|
||||
return createElement(EditTransaction, { props: props })
|
||||
},
|
||||
});
|
||||
});
|
||||
|
2
resources/assets/js/i18n.js
vendored
2
resources/assets/js/i18n.js
vendored
@ -25,4 +25,4 @@ module.exports = new vuei18n({
|
||||
'sv': require('./locales/sv.json'),
|
||||
'vi': require('./locales/vi.json'),
|
||||
}
|
||||
});
|
||||
});
|
||||
|
2
resources/assets/js/profile.js
vendored
2
resources/assets/js/profile.js
vendored
@ -46,4 +46,4 @@ new Vue({
|
||||
render: (createElement) => {
|
||||
return createElement(ProfileOptions, { props: props })
|
||||
},
|
||||
});
|
||||
});
|
||||
|
2
resources/lang/.gitignore
vendored
2
resources/lang/.gitignore
vendored
@ -8,4 +8,4 @@ uk_UA
|
||||
sr_CS
|
||||
et_EE
|
||||
bg_BG
|
||||
tlh_AA
|
||||
tlh_AA
|
||||
|
@ -23,4 +23,4 @@ declare(strict_types=1);
|
||||
|
||||
return [
|
||||
|
||||
];
|
||||
];
|
||||
|
@ -24,9 +24,6 @@ declare(strict_types=1);
|
||||
|
||||
return [
|
||||
// profile
|
||||
'personal_access_tokens' => 'Personal access tokens',
|
||||
|
||||
// bills:
|
||||
'not_expected_period' => 'Not expected this period',
|
||||
'not_or_not_yet' => 'Not (yet)',
|
||||
];
|
||||
|
@ -32,7 +32,6 @@ return [
|
||||
'clone' => 'Clone',
|
||||
'last_seven_days' => 'Last seven days',
|
||||
'last_thirty_days' => 'Last thirty days',
|
||||
'welcomeBack' => 'What\'s playing?',
|
||||
'welcome_back' => 'What\'s playing?',
|
||||
'everything' => 'Everything',
|
||||
'today' => 'today',
|
||||
@ -1319,9 +1318,7 @@ return [
|
||||
'summary' => 'Summary',
|
||||
'average' => 'Average',
|
||||
'balanceFor' => 'Balance for :name',
|
||||
'no_tags_for_cloud' => 'No tags to generate cloud',
|
||||
'no_tags' => '(no tags)',
|
||||
'tag_cloud' => 'Tag cloud',
|
||||
|
||||
// piggy banks:
|
||||
'add_money_to_piggy' => 'Add money to piggy bank ":name"',
|
||||
@ -1419,7 +1416,6 @@ return [
|
||||
'split_transaction_title' => 'Description of the split transaction',
|
||||
'split_transaction_title_help' => 'If you create a split transaction, there must be a global description for all splits of the transaction.',
|
||||
'split_title_help' => 'If you create a split transaction, there must be a global description for all splits of the transaction.',
|
||||
'transaction_information' => 'Transaction information',
|
||||
'you_create_transfer' => 'You\'re creating a transfer.',
|
||||
'you_create_withdrawal' => 'You\'re creating a withdrawal.',
|
||||
'you_create_deposit' => 'You\'re creating a deposit.',
|
||||
@ -1490,11 +1486,6 @@ return [
|
||||
// split a transaction:
|
||||
'splits' => 'Splits',
|
||||
'add_another_split' => 'Add another split',
|
||||
'split-transactions' => 'Split transactions',
|
||||
'do_split' => 'Do a split',
|
||||
'split_this_withdrawal' => 'Split this withdrawal',
|
||||
'split_this_deposit' => 'Split this deposit',
|
||||
'split_this_transfer' => 'Split this transfer',
|
||||
'cannot_edit_opening_balance' => 'You cannot edit the opening balance of an account.',
|
||||
'no_edit_multiple_left' => 'You have selected no valid transactions to edit.',
|
||||
'breadcrumb_convert_group' => 'Convert transaction',
|
||||
@ -1508,7 +1499,6 @@ return [
|
||||
|
||||
// Import page (general strings only)
|
||||
'import_index_title' => 'Import transactions into Firefly III',
|
||||
'import_data' => 'Import data',
|
||||
'import_transactions' => 'Import transactions',
|
||||
'import_tools_title' => 'Import tools',
|
||||
'tools_index_intro' => 'Several tools exist to import data into Firefly III. Check them out below. For more information, check out <a href="https://docs.firefly-iii.org/importing-data/introduction">this page</a>.',
|
||||
@ -1599,10 +1589,6 @@ return [
|
||||
'recurring_never_cron' => 'It seems the cron job that is necessary to support recurring transactions has never run. This is of course normal when you have just installed Firefly III, but this should be something to set up as soon as possible. Please check out the help-pages using the (?)-icon in the top right corner of the page.',
|
||||
'recurring_cron_long_ago' => 'It looks like it has been more than 36 hours since the cron job to support recurring transactions has fired for the last time. Are you sure it has been set up correctly? Please check out the help-pages using the (?)-icon in the top right corner of the page.',
|
||||
|
||||
'recurring_meta_field_tags' => 'Tags',
|
||||
'recurring_meta_field_notes' => 'Notes',
|
||||
'recurring_meta_field_bill_id' => 'Bill',
|
||||
'recurring_meta_field_piggy_bank_id' => 'Piggy bank',
|
||||
'create_new_recurrence' => 'Create new recurring transaction',
|
||||
'help_first_date' => 'Indicate the first expected recurrence. This must be in the future.',
|
||||
'help_first_date_no_past' => 'Indicate the first expected recurrence. Firefly III will not create transactions in the past.',
|
||||
@ -1645,7 +1631,6 @@ return [
|
||||
'box_spent_in_currency' => 'Spent (:currency)',
|
||||
'box_earned_in_currency' => 'Earned (:currency)',
|
||||
'box_budgeted_in_currency' => 'Budgeted (:currency)',
|
||||
'box_sum_in_currency' => 'Sum (:currency)',
|
||||
'box_bill_paid_in_currency' => 'Bills paid (:currency)',
|
||||
'box_bill_unpaid_in_currency' => 'Bills unpaid (:currency)',
|
||||
'box_left_to_spend_in_currency' => 'Left to spend (:currency)',
|
||||
|
@ -40,35 +40,25 @@ return [
|
||||
'repeat_freq' => 'Repeats',
|
||||
'location' => 'Location',
|
||||
'update_channel' => 'Update channel',
|
||||
'journal_currency_id' => 'Currency',
|
||||
'currency_id' => 'Currency',
|
||||
'transaction_currency_id' => 'Currency',
|
||||
'auto_budget_currency_id' => 'Currency',
|
||||
'external_ip' => 'Your server\'s external IP',
|
||||
'attachments' => 'Attachments',
|
||||
'journal_amount' => 'Amount',
|
||||
'journal_source_name' => 'Revenue account (source)',
|
||||
'keep_bill_id' => 'Bill',
|
||||
'journal_source_id' => 'Asset account (source)',
|
||||
'BIC' => 'BIC',
|
||||
'verify_password' => 'Verify password security',
|
||||
'source_account' => 'Source account',
|
||||
'destination_account' => 'Destination account',
|
||||
'journal_destination_id' => 'Asset account (destination)',
|
||||
'asset_destination_account' => 'Destination account',
|
||||
'include_net_worth' => 'Include in net worth',
|
||||
'asset_source_account' => 'Source account',
|
||||
'journal_description' => 'Description',
|
||||
'note' => 'Notes',
|
||||
'store_new_transaction' => 'Store new transaction',
|
||||
'split_journal' => 'Split this transaction',
|
||||
'split_journal_explanation' => 'Split this transaction in multiple parts',
|
||||
'currency' => 'Currency',
|
||||
'account_id' => 'Asset account',
|
||||
'budget_id' => 'Budget',
|
||||
'opening_balance' => 'Opening balance',
|
||||
'tagMode' => 'Tag mode',
|
||||
'tag_position' => 'Tag location',
|
||||
'virtual_balance' => 'Virtual balance',
|
||||
'targetamount' => 'Target amount',
|
||||
'account_role' => 'Account role',
|
||||
@ -83,10 +73,7 @@ return [
|
||||
'expense_account' => 'Expense account',
|
||||
'revenue_account' => 'Revenue account',
|
||||
'decimal_places' => 'Decimal places',
|
||||
'exchange_rate_instruction' => 'Foreign currencies',
|
||||
'source_amount' => 'Amount (source)',
|
||||
'destination_amount' => 'Amount (destination)',
|
||||
'native_amount' => 'Native amount',
|
||||
'new_email_address' => 'New email address',
|
||||
'verification' => 'Verification',
|
||||
'api_key' => 'API key',
|
||||
@ -95,10 +82,6 @@ return [
|
||||
'interest' => 'Interest',
|
||||
'interest_period' => 'Interest period',
|
||||
|
||||
'source_account_asset' => 'Source account (asset account)',
|
||||
'destination_account_expense' => 'Destination account (expense account)',
|
||||
'destination_account_asset' => 'Destination account (asset account)',
|
||||
'source_account_revenue' => 'Source account (revenue account)',
|
||||
'type' => 'Type',
|
||||
'convert_Withdrawal' => 'Convert withdrawal',
|
||||
'convert_Deposit' => 'Convert deposit',
|
||||
@ -106,7 +89,6 @@ return [
|
||||
|
||||
'amount' => 'Amount',
|
||||
'foreign_amount' => 'Foreign amount',
|
||||
'existing_attachments' => 'Existing attachments',
|
||||
'date' => 'Date',
|
||||
'interest_date' => 'Interest date',
|
||||
'book_date' => 'Book date',
|
||||
@ -128,12 +110,6 @@ return [
|
||||
'date_format' => 'Date format',
|
||||
'specifix' => 'Bank- or file specific fixes',
|
||||
'attachments[]' => 'Attachments',
|
||||
'store_new_withdrawal' => 'Store new withdrawal',
|
||||
'store_new_deposit' => 'Store new deposit',
|
||||
'store_new_transfer' => 'Store new transfer',
|
||||
'add_new_withdrawal' => 'Add a new withdrawal',
|
||||
'add_new_deposit' => 'Add a new deposit',
|
||||
'add_new_transfer' => 'Add a new transfer',
|
||||
'title' => 'Title',
|
||||
'notes' => 'Notes',
|
||||
'filename' => 'File name',
|
||||
@ -143,8 +119,6 @@ return [
|
||||
'stop_processing' => 'Stop processing',
|
||||
'start_date' => 'Start of range',
|
||||
'end_date' => 'End of range',
|
||||
'include_attachments' => 'Include uploaded attachments',
|
||||
'include_old_uploads' => 'Include imported data',
|
||||
'delete_account' => 'Delete account ":name"',
|
||||
'delete_bill' => 'Delete bill ":name"',
|
||||
'delete_budget' => 'Delete budget ":name"',
|
||||
@ -217,10 +191,7 @@ return [
|
||||
'csv_tab' => 'A tab (invisible)',
|
||||
'csv_delimiter' => 'CSV field delimiter',
|
||||
'csv_import_account' => 'Default import account',
|
||||
'csv_config' => 'CSV import configuration',
|
||||
'client_id' => 'Client ID',
|
||||
'service_secret' => 'Service secret',
|
||||
'app_secret' => 'App secret',
|
||||
'app_id' => 'App ID',
|
||||
'secret' => 'Secret',
|
||||
'public_key' => 'Public key',
|
||||
|
@ -27,8 +27,6 @@ return [
|
||||
'index_breadcrumb' => 'Import data into Firefly III',
|
||||
'prerequisites_breadcrumb_fake' => 'Prerequisites for the fake import provider',
|
||||
'prerequisites_breadcrumb_spectre' => 'Prerequisites for Spectre',
|
||||
'prerequisites_breadcrumb_bunq' => 'Prerequisites for bunq',
|
||||
'prerequisites_breadcrumb_ynab' => 'Prerequisites for YNAB',
|
||||
'job_configuration_breadcrumb' => 'Configuration for ":key"',
|
||||
'job_status_breadcrumb' => 'Import status for ":key"',
|
||||
'disabled_for_demo_user' => 'disabled in demo',
|
||||
@ -43,26 +41,14 @@ return [
|
||||
// import provider strings (index):
|
||||
'button_fake' => 'Fake an import',
|
||||
'button_file' => 'Import a file',
|
||||
'button_bunq' => 'Import from bunq',
|
||||
'button_spectre' => 'Import using Spectre',
|
||||
'button_plaid' => 'Import using Plaid',
|
||||
'button_yodlee' => 'Import using Yodlee',
|
||||
'button_quovo' => 'Import using Quovo',
|
||||
'button_ynab' => 'Import from You Need A Budget',
|
||||
'button_fints' => 'Import using FinTS',
|
||||
|
||||
|
||||
// prerequisites box (index)
|
||||
'need_prereq_title' => 'Import prerequisites',
|
||||
'need_prereq_intro' => 'Some import methods need your attention before they can be used. For example, they might require special API keys or application secrets. You can configure them here. The icon indicates if these prerequisites have been met.',
|
||||
'do_prereq_fake' => 'Prerequisites for the fake provider',
|
||||
'do_prereq_file' => 'Prerequisites for file imports',
|
||||
'do_prereq_bunq' => 'Prerequisites for imports from bunq',
|
||||
'do_prereq_spectre' => 'Prerequisites for imports using Spectre',
|
||||
'do_prereq_plaid' => 'Prerequisites for imports using Plaid',
|
||||
'do_prereq_yodlee' => 'Prerequisites for imports using Yodlee',
|
||||
'do_prereq_quovo' => 'Prerequisites for imports using Quovo',
|
||||
'do_prereq_ynab' => 'Prerequisites for imports from YNAB',
|
||||
|
||||
// prerequisites:
|
||||
'prereq_fake_title' => 'Prerequisites for an import from the fake import provider',
|
||||
@ -70,18 +56,10 @@ return [
|
||||
'prereq_spectre_title' => 'Prerequisites for an import using the Spectre API',
|
||||
'prereq_spectre_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the <a href="https://www.saltedge.com/clients/profile/secrets">secrets page</a>.',
|
||||
'prereq_spectre_pub' => 'Likewise, the Spectre API needs to know the public key you see below. Without it, it will not recognize you. Please enter this public key on your <a href="https://www.saltedge.com/clients/profile/secrets">secrets page</a>.',
|
||||
'prereq_bunq_title' => 'Prerequisites for an import from bunq',
|
||||
'prereq_bunq_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.',
|
||||
'prereq_bunq_ip' => 'bunq requires your externally facing IP address. Firefly III has tried to fill this in using <a href="https://www.ipify.org/">the ipify service</a>. Make sure this IP address is correct, or the import will fail.',
|
||||
'prereq_ynab_title' => 'Prerequisites for an import from YNAB',
|
||||
'prereq_ynab_text' => 'In order to be able to download transactions from YNAB, please create a new application on your <a href="https://app.youneedabudget.com/settings/developer">Developer Settings Page</a> and enter the client ID and secret on this page.',
|
||||
'prereq_ynab_redirect' => 'To complete the configuration, enter the following URL at the <a href="https://app.youneedabudget.com/settings/developer">Developer Settings Page</a> under the "Redirect URI(s)".',
|
||||
'callback_not_tls' => 'Firefly III has detected the following callback URI. It seems your server is not set up to accept TLS-connections (https). YNAB will not accept this URI. You may continue with the import (because Firefly III could be wrong) but please keep this in mind.',
|
||||
// prerequisites success messages:
|
||||
'prerequisites_saved_for_fake' => 'Fake API key stored successfully!',
|
||||
'prerequisites_saved_for_spectre' => 'App ID and secret stored!',
|
||||
'prerequisites_saved_for_bunq' => 'API key and IP stored!',
|
||||
'prerequisites_saved_for_ynab' => 'YNAB client ID and secret stored!',
|
||||
|
||||
// job configuration:
|
||||
'job_config_apply_rules_title' => 'Job configuration - apply your rules?',
|
||||
@ -134,42 +112,8 @@ return [
|
||||
'job_config_spectre_apply_rules_text' => 'By default, your rules will be applied to the transactions created during this import routine. If you do not want this to happen, deselect this checkbox.',
|
||||
|
||||
// job configuration for bunq:
|
||||
'job_config_bunq_accounts_title' => 'bunq accounts',
|
||||
'job_config_bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.',
|
||||
'bunq_no_mapping' => 'It seems you have not selected any accounts.',
|
||||
'should_download_config' => 'You should download <a href=":route">the configuration file</a> for this job. This will make future imports way easier.',
|
||||
'share_config_file' => 'If you have imported data from a public bank, you should <a href="https://github.com/firefly-iii/import-configurations/wiki">share your configuration file</a> so it will be easy for other users to import their data. Sharing your configuration file will not expose your financial details.',
|
||||
'job_config_bunq_apply_rules' => 'Apply rules',
|
||||
'job_config_bunq_apply_rules_text' => 'By default, your rules will be applied to the transactions created during this import routine. If you do not want this to happen, deselect this checkbox.',
|
||||
'bunq_savings_goal' => 'Savings goal: :amount (:percentage%)',
|
||||
'bunq_account_status_CANCELLED' => 'Closed bunq account',
|
||||
|
||||
'ynab_account_closed' => 'Account is closed!',
|
||||
'ynab_account_deleted' => 'Account is deleted!',
|
||||
'ynab_account_type_savings' => 'savings account',
|
||||
'ynab_account_type_checking' => 'checking account',
|
||||
'ynab_account_type_cash' => 'cash account',
|
||||
'ynab_account_type_creditCard' => 'credit card',
|
||||
'ynab_account_type_lineOfCredit' => 'line of credit',
|
||||
'ynab_account_type_otherAsset' => 'other asset account',
|
||||
'ynab_account_type_otherLiability' => 'other liabilities',
|
||||
'ynab_account_type_payPal' => 'Paypal',
|
||||
'ynab_account_type_merchantAccount' => 'merchant account',
|
||||
'ynab_account_type_investmentAccount' => 'investment account',
|
||||
'ynab_account_type_mortgage' => 'mortgage',
|
||||
'ynab_do_not_import' => '(do not import)',
|
||||
'job_config_ynab_apply_rules' => 'Apply rules',
|
||||
'job_config_ynab_apply_rules_text' => 'By default, your rules will be applied to the transactions created during this import routine. If you do not want this to happen, deselect this checkbox.',
|
||||
|
||||
// job configuration for YNAB:
|
||||
'job_config_ynab_select_budgets' => 'Select your budget',
|
||||
'job_config_ynab_select_budgets_text' => 'You have :count budgets stored at YNAB. Please select the one from which Firefly III will import the transactions.',
|
||||
'job_config_ynab_no_budgets' => 'There are no budgets available to be imported from.',
|
||||
'ynab_no_mapping' => 'It seems you have not selected any accounts to import from.',
|
||||
'job_config_ynab_bad_currency' => 'You cannot import from the following budget(s), because you do not have accounts with the same currency as these budgets.',
|
||||
'job_config_ynab_accounts_title' => 'Select accounts',
|
||||
'job_config_ynab_accounts_text' => 'You have the following accounts available in this budget. Please select from which accounts you want to import, and where the transactions should be stored.',
|
||||
|
||||
|
||||
// keys from "extra" array:
|
||||
'spectre_extra_key_iban' => 'IBAN',
|
||||
@ -192,41 +136,6 @@ return [
|
||||
'spectre_extra_key_unit_price' => 'Unit price',
|
||||
'spectre_extra_key_transactions_count' => 'Transaction count',
|
||||
|
||||
//job configuration for finTS
|
||||
'fints_connection_failed' => 'An error occurred while trying to connecting to your bank. Please make sure that all the data you entered is correct. Original error message: :originalError',
|
||||
|
||||
'job_config_fints_url_help' => 'E.g. https://banking-dkb.s-fints-pt-dkb.de/fints30',
|
||||
'job_config_fints_username_help' => 'For many banks this is your account number.',
|
||||
'job_config_fints_port_help' => 'The default port is 443.',
|
||||
'job_config_fints_account_help' => 'Choose the bank account for which you want to import transactions.',
|
||||
'job_config_local_account_help' => 'Choose the Firefly III account corresponding to your bank account chosen above.',
|
||||
// specifics:
|
||||
'specific_ing_name' => 'ING NL',
|
||||
'specific_ing_descr' => 'Create better descriptions in ING exports',
|
||||
'specific_sns_name' => 'SNS / Volksbank NL',
|
||||
'specific_sns_descr' => 'Trim quotes from SNS / Volksbank export files',
|
||||
'specific_abn_name' => 'ABN AMRO NL',
|
||||
'specific_abn_descr' => 'Fixes potential problems with ABN AMRO files',
|
||||
'specific_rabo_name' => 'Rabobank NL',
|
||||
'specific_rabo_descr' => 'Fixes potential problems with Rabobank files',
|
||||
'specific_pres_name' => 'President\'s Choice Financial CA',
|
||||
'specific_pres_descr' => 'Fixes potential problems with PC files',
|
||||
'specific_belfius_name' => 'Belfius BE',
|
||||
'specific_belfius_descr' => 'Fixes potential problems with Belfius files',
|
||||
'specific_ingbelgium_name' => 'ING BE',
|
||||
'specific_ingbelgium_descr' => 'Fixes potential problems with ING Belgium files',
|
||||
// job configuration for file provider (stage: roles)
|
||||
'job_config_roles_title' => 'Import setup (3/4) - Define each column\'s role',
|
||||
'job_config_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.',
|
||||
'job_config_roles_submit' => 'Continue',
|
||||
'job_config_roles_column_name' => 'Name of column',
|
||||
'job_config_roles_column_example' => 'Column example data',
|
||||
'job_config_roles_column_role' => 'Column data meaning',
|
||||
'job_config_roles_do_map_value' => 'Map these values',
|
||||
'job_config_roles_no_example' => 'No example data available',
|
||||
'job_config_roles_fa_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.',
|
||||
'job_config_roles_rwarning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.',
|
||||
'job_config_roles_colum_count' => 'Column',
|
||||
// job config for the file provider (stage: mapping):
|
||||
'job_config_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data',
|
||||
'job_config_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.',
|
||||
@ -256,64 +165,9 @@ return [
|
||||
'result_one_transaction' => 'Exactly one transaction has been imported. It is stored under tag <a href=":route" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a> where you can inspect it further.',
|
||||
'result_many_transactions' => 'Firefly III has imported :count transactions. They are stored under tag <a href=":route" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a> where you can inspect them further.',
|
||||
|
||||
|
||||
// general errors and warnings:
|
||||
'bad_job_status' => 'To access this page, your import job cannot have status ":status".',
|
||||
|
||||
// column roles for CSV import:
|
||||
'column__ignore' => '(ignore this column)',
|
||||
'column_account-iban' => 'Asset account (IBAN)',
|
||||
'column_account-id' => 'Asset account ID (matching FF3)',
|
||||
'column_account-name' => 'Asset account (name)',
|
||||
'column_account-bic' => 'Asset account (BIC)',
|
||||
'column_amount' => 'Amount',
|
||||
'column_amount_foreign' => 'Amount (in foreign currency)',
|
||||
'column_amount_debit' => 'Amount (debit column)',
|
||||
'column_amount_credit' => 'Amount (credit column)',
|
||||
'column_amount_negated' => 'Amount (negated column)',
|
||||
'column_amount-comma-separated' => 'Amount (comma as decimal separator)',
|
||||
'column_bill-id' => 'Bill ID (matching FF3)',
|
||||
'column_bill-name' => 'Bill name',
|
||||
'column_budget-id' => 'Budget ID (matching FF3)',
|
||||
'column_budget-name' => 'Budget name',
|
||||
'column_category-id' => 'Category ID (matching FF3)',
|
||||
'column_category-name' => 'Category name',
|
||||
'column_currency-code' => 'Currency code (ISO 4217)',
|
||||
'column_foreign-currency-code' => 'Foreign currency code (ISO 4217)',
|
||||
'column_currency-id' => 'Currency ID (matching FF3)',
|
||||
'column_currency-name' => 'Currency name (matching FF3)',
|
||||
'column_currency-symbol' => 'Currency symbol (matching FF3)',
|
||||
'column_date-interest' => 'Interest calculation date',
|
||||
'column_date-book' => 'Transaction booking date',
|
||||
'column_date-process' => 'Transaction process date',
|
||||
'column_date-transaction' => 'Date',
|
||||
'column_date-due' => 'Transaction due date',
|
||||
'column_date-payment' => 'Transaction payment date',
|
||||
'column_date-invoice' => 'Transaction invoice date',
|
||||
'column_description' => 'Description',
|
||||
'column_opposing-iban' => 'Opposing account (IBAN)',
|
||||
'column_opposing-bic' => 'Opposing account (BIC)',
|
||||
'column_opposing-id' => 'Opposing account ID (matching FF3)',
|
||||
'column_external-id' => 'External ID',
|
||||
'column_opposing-name' => 'Opposing account (name)',
|
||||
'column_rabo-debit-credit' => 'Rabobank specific debit/credit indicator',
|
||||
'column_ing-debit-credit' => 'ING specific debit/credit indicator',
|
||||
'column_generic-debit-credit' => 'Generic bank debit/credit indicator',
|
||||
'column_sepa_ct_id' => 'SEPA end-to-end Identifier',
|
||||
'column_sepa_ct_op' => 'SEPA Opposing Account Identifier',
|
||||
'column_sepa_db' => 'SEPA Mandate Identifier',
|
||||
'column_sepa_cc' => 'SEPA Clearing Code',
|
||||
'column_sepa_ci' => 'SEPA Creditor Identifier',
|
||||
'column_sepa_ep' => 'SEPA External Purpose',
|
||||
'column_sepa_country' => 'SEPA Country Code',
|
||||
'column_sepa_batch_id' => 'SEPA Batch ID',
|
||||
'column_tags-comma' => 'Tags (comma separated)',
|
||||
'column_tags-space' => 'Tags (space separated)',
|
||||
'column_account-number' => 'Asset account (account number)',
|
||||
'column_opposing-number' => 'Opposing account (account number)',
|
||||
'column_note' => 'Note(s)',
|
||||
'column_internal-reference' => 'Internal reference',
|
||||
|
||||
// error message
|
||||
'duplicate_row' => 'Row #:row (":description") could not be imported. It already exists.',
|
||||
|
||||
|
@ -41,13 +41,11 @@ return [
|
||||
'transaction_type' => 'Type',
|
||||
'lastActivity' => 'Last activity',
|
||||
'balanceDiff' => 'Balance difference',
|
||||
'matchesOn' => 'Matched on',
|
||||
'other_meta_data' => 'Other meta data',
|
||||
'account_type' => 'Account type',
|
||||
'created_at' => 'Created at',
|
||||
'account' => 'Account',
|
||||
'matchingAmount' => 'Amount',
|
||||
'split_number' => 'Split #',
|
||||
'destination' => 'Destination',
|
||||
'source' => 'Source',
|
||||
'next_expected_match' => 'Next expected match',
|
||||
@ -55,7 +53,6 @@ return [
|
||||
'repeat_freq' => 'Repeats',
|
||||
'description' => 'Description',
|
||||
'amount' => 'Amount',
|
||||
'internal_reference' => 'Internal reference',
|
||||
'date' => 'Date',
|
||||
'interest_date' => 'Interest date',
|
||||
'book_date' => 'Book date',
|
||||
@ -63,7 +60,6 @@ return [
|
||||
'due_date' => 'Due date',
|
||||
'payment_date' => 'Payment date',
|
||||
'invoice_date' => 'Invoice date',
|
||||
'interal_reference' => 'Internal reference',
|
||||
'notes' => 'Notes',
|
||||
'from' => 'From',
|
||||
'piggy_bank' => 'Piggy bank',
|
||||
|
@ -27,4 +27,4 @@
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</table>
|
||||
|
@ -29,4 +29,4 @@
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tfoot>
|
||||
</table>
|
||||
</table>
|
||||
|
@ -28,4 +28,4 @@
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</table>
|
||||
|
@ -43,4 +43,4 @@
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tfoot>
|
||||
</table>
|
||||
</table>
|
||||
|
@ -41,4 +41,4 @@
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tfoot>
|
||||
</table>
|
||||
</table>
|
||||
|
@ -52,4 +52,4 @@
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tfoot>
|
||||
</table>
|
||||
</table>
|
||||
|
@ -37,4 +37,4 @@
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</table>
|
||||
|
@ -43,4 +43,4 @@
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tfoot>
|
||||
</table>
|
||||
</table>
|
||||
|
@ -1 +1 @@
|
||||
<!-- do not use -->
|
||||
<!-- do not use -->
|
||||
|
@ -93,4 +93,4 @@ class ShowControllerTest extends TestCase
|
||||
$response->assertSee('<ol class="breadcrumb">');
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -492,4 +492,4 @@ trait TestDataTrait
|
||||
return $data;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user