IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-27 17:31:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Extended views and language.

Browse Source
This commit is contained in:
James Cole 2016-08-12 10:07:53 +02:00
parent 5e310776b4
commit 76649cb7de
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/ImportController.php
View File

@ -37,7 +37,7 @@ class ImportController extends Controller
{
parent::__construct();
View::share('mainTitleIcon', 'fa-archive');
View::share('title', trans('firefly.import_data'));
View::share('title', trans('firefly.import_data_full'));
}
/**
@ -215,7 +215,7 @@ class ImportController extends Controller
}
Log::debug('Continue in settings()');
$importer = $this->makeImporter($job);
$subTitle = trans('firefy.settings_for_import');
$subTitle = trans('firefly.settings_for_import');
$subTitleIcon = 'fa-wrench';
// now show settings screen to user.

8
resources/lang/en_US/csv.php
View File

@ -12,7 +12,7 @@ declare(strict_types = 1);
return [
'import_configure_title' => 'Configure your import',
'import_configure_intro' => 'There are some options for your CSV import.',
'import_configure_intro' => 'There are some options for your CSV import. Please indicate if your CSV file contains headers on the first column, and what the date format of your date-fields is. That might require some experimentation. The field delimiter is usually a ",", but could also be a ";". Check this carefully.',
'import_configure_form' => 'Form',
'header_help' => 'Check this if the first row of your CSV file are the column titles',
'date_help' => 'Date time format in your CSV. Follow the format like <a href="https://secure.php.net/manual/en/datetime.createfromformat.php#refsect1-datetime.createfromformat-parameters">this page</a> indicates. The default value will parse dates that look like this: :dateExample.',
@ -23,7 +23,7 @@ return [
// roles
'column_roles_title' => 'Define column roles',
'column_roles_text' => 'Each column contains some data. What data?',
'column_roles_text' => '<p>Firefly III cannot guess what data each column contains. You must tell Firefly which kinds of data to expect. The example data can guide you into picking the correct type from the dropdown. If a column cannot be matched to a useful data type, please let me know <a href="https://github.com/JC5/firefly-iii/issues/new">by creating an issue</a>.</p><p>Some values in your CSV file, such as account names or categories, may already exist in your Firefly III database. If you select "map these values" Firefly will not attempt to search for matching values itself but allow you to match the CSV values against the values in your database. This allows you to fine-tune the import.</p>',
'column_roles_table' => 'Table',
'column_name' => 'Name of column',
'column_example' => 'Column example data',
@ -33,8 +33,8 @@ return [
'no_example_data' => 'No example data available',
'store_column_roles' => 'Continue import',
'do_not_map' => '(do not map)',
'map_title' => 'Connect data in your files',
'map_text' => 'Connect data in your files',
'map_title' => 'Connect import data to Firefly III data',
'map_text' => 'In the following tables, the left value shows you information found in your uploaded CSV 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.',
'field_value' => 'Field value',
'field_mapped_to' => 'Mapped to',

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

@ -326,13 +326,6 @@ return [
'title_transfer' => 'Transfers',
'title_transfers' => 'Transfers',
// import routine
'import_data' => 'Import data',
'import' => 'Import',
'import_intro_text' => 'Some intro here',
'import_file_help' => 'Select your file',
// create new stuff:
'create_new_withdrawal' => 'Create new withdrawal',
'create_new_deposit' => 'Create new deposit',
@ -775,8 +768,13 @@ return [
'import_finish_configuration' => 'Finish configuration',
'settings_for_import' => 'Settings',
'import_complete' => 'Import configuration complete!',
'import_complete_text' => 'Download the config file. You can also run it from the command line.',
'import_complete_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 need to execute the following command in your console. Unfortunately, a web-based import is not yet possible.',
'import_download_config' => 'Download configuration',
'import_start_import' => 'Start import',
'import_intro_beta' => 'The import function is currently being developed and will most probably not work.',
'import_intro_beta' => 'The import function of Firefly III is in beta. Many users of Firefly III have tried many different files. Although each individual compontent of this import routine works (really), the combination might break. If your file cannot be imported by Firefly, please read <a href="https://github.com/JC5/firefly-iii/wiki/Submit-issues-with-sensitive-data-in-them">this wiki page</a> so I can fix the problem you have run into.',
'import_data' => 'Import data',
'import_data_full' => 'Import data into Firefly III',
'import' => 'Import',
'import_intro_text' => 'Welcome to the Firefly III data import routine. At the moment, this routine can help you import files into Firefly. To do so, you must download or export transactions from other systems or software, and upload them here. The next steps will let you help Firefly III determin what the content is of your file, and how to handle it. Please select a file, and read all instructions carefully.',
'import_file_help' => 'Select your file',
];

2
resources/views/import/complete.twig
View File

@ -22,7 +22,7 @@
<a href="{{ route('import.download', [job.key]) }}" class="btn btn-default"><i class="fa fa-fw fa-download"></i> {{ 'import_download_config'|_ }}</a>
</div>
<div class="col-lg-4">
<a href="#" class="btn btn-default"><i class="fa fa-fw fa-gears"></i> {{ 'import_start_import'|_ }}</a>
<!-- <a href="#" class="btn btn-default"><i class="fa fa-fw fa-gears"></i> {{ 'import_start_import'|_ }}</a>-->
</div>
</div>
</div>

2
resources/views/import/csv/roles.twig
View File

@ -13,7 +13,7 @@
<h3 class="box-title">{{ trans('csv.column_roles_title') }}</h3>
</div>
<div class="box-body">
<p>{{ trans('csv.column_roles_text') }}</p>
<p>{{ trans('csv.column_roles_text')|raw }}</p>
</div>
</div>