kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Reinstate ability to download config.

Browse Source
This commit is contained in:
James Cole
2018-05-30 18:36:21 +02:00
parent b33ca786ae
commit 49e302e1bc
6 changed files with 68 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/en_US/import.php
View File

@@ -131,6 +131,8 @@ return [
'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.',
// keys from "extra" array:
'spectre_extra_key_iban' => 'IBAN',

9
resources/views/import/status.twig
View File

@@ -139,6 +139,9 @@
<p id="import-status-intro">
{{ trans('import.status_finished_text') }}
<span id="import-status-more-info"></span>
</p>
<p id="import-status-download">
</p>
<p id="import-status-error-txt" style="display:none;">{{ trans('import.finished_with_errors') }}</p>
<ul id="import-status-errors" class="text-danger">
@@ -176,9 +179,9 @@
var jobStorageStartUri = '{{ route('import.job.store', [importJob.key]) }}';
// import is running:
var langImportRunning = '{{ trans('import.status_job_running') }}';
var langImportStoring = '{{ trans('import.status_job_storing') }}';
var langImportRules = '{{ trans('import.status_job_rules') }}';
var langImportRunning = '{{ trans('import.status_job_running')|escape('js') }}';
var langImportStoring = '{{ trans('import.status_job_storing')|escape('js') }}';
var langImportRules = '{{ trans('import.status_job_rules')|escape('js') }}';
// some useful translations.
{#var langImportTimeOutError = '(time out thing)';#}