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

New code for import routine, part 3

Browse Source
This commit is contained in:
James Cole
2017-12-16 19:47:14 +01:00
parent 9086259a65
commit 8176356509
11 changed files with 428 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1085,10 +1085,6 @@ return [
// import status page:
'import_status_bread_crumb' => 'Import status',
'import_status_sub_title' => 'Import status',
'import_status_wait_title' => 'Please hold...',
'import_status_wait_text' => 'This box will disappear in a moment.',
'import_status_ready_title' => 'Import is ready to start',
'import_status_ready_text' => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.',
'import_status_ready_config' => 'Download configuration',
'import_status_ready_start' => 'Start the import',
'import_status_ready_share' => 'Please consider downloading your configuration and sharing it at the <strong><a href="https://github.com/firefly-iii/import-configurations/wiki">import configuration center</a></strong>. This will allow other users of Firefly III to import their files more easily.',
@@ -1097,9 +1093,6 @@ return [
'import_status_errors_title' => 'Errors during the import',
'import_status_errors_single' => 'An error has occured during the import. It does not appear to be fatal.',
'import_status_errors_multi' => 'Some errors occured during the import. These do not appear to be fatal.',
'import_status_fatal_title' => 'A fatal error occurred',
'import_status_fatal_text' => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.',
'import_status_fatal_more' => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.',
'import_status_finished_title' => 'Import routine finished',
'import_status_finished_text' => 'The import routine has imported your file.',
'import_status_finished_job' => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',