From fcdeebcc0649105c6b0f49ef1010429794d4a45b Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 14 Oct 2016 16:51:38 +0200 Subject: [PATCH] Some last minute updated texts. --- resources/lang/en_US/firefly.php | 8 ++++- resources/lang/en_US/help.php | 54 ---------------------------- resources/views/import/complete.twig | 6 ++++ resources/views/import/finished.twig | 4 ++- resources/views/import/index.twig | 31 ++++++++++++---- 5 files changed, 40 insertions(+), 63 deletions(-) diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 2573074654..300779635f 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -782,7 +782,10 @@ return [ '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_intro_what_it_does' => 'This page allows you to import data into Firefly III. To do so, export data from your bank, or from another financial management system. Upload that file here. Firefly III will convert the data. You need to give it some directions. Please select a file and follow the instructions.', + 'import_intro_import_conf_title' => 'Import "configuration"', + 'import_intro_beta_warning' => 'Warning', + 'import_intro_import_conf_text' => 'As you will discover over the next few pages, this import routine has a lot of settings. These settings are mainly dependent on the bank (or financial management software) your file comes from. There is a good chance somebody else already imported such a file and has shared their configuration file. Please visit the import configuration center to see if there already is a configuration available for your bank or system. If there is, you should download this configuration file and upload it here as well. It will save you a lot of time!', 'import_file_help' => 'Select your file', 'import_status_settings_complete' => 'The import is ready to start.', 'import_status_import_complete' => 'The import has completed.', @@ -798,6 +801,9 @@ return [ 'import_double' => 'Row #:row: This row has been imported before, and is stored in :description.', 'import_finished_all' => 'The import has finished. Please check out the results below.', 'import_with_key' => 'Import with key \':key\'', + + 'import_share_configuration' => 'Please consider downloading your configuration and sharing it at the import configuration center. This will allow other users of Firefly III to import their files more easily.', + 'import_finished_report' => 'The import has finished. Please note any errors in the block above this line. All transactions imported during this particular session have been tagged, and you can check them out below. ', 'import_finished_link' => 'The transactions imported can be found in tag :tag.', diff --git a/resources/lang/en_US/help.php b/resources/lang/en_US/help.php index 8ab4d7202a..e2d5c67c87 100644 --- a/resources/lang/en_US/help.php +++ b/resources/lang/en_US/help.php @@ -30,58 +30,4 @@ return [ 'main-content-end-text' => 'Remember that every page has a small question mark at the right top. Click it to get help about the page you\'re on.', 'index' => 'index', 'home' => 'home', - 'accounts-index' => 'accounts.index', - 'accounts-create' => 'accounts.create', - 'accounts-edit' => 'accounts.edit', - 'accounts-delete' => 'accounts.delete', - 'accounts-show' => 'accounts.show', - 'attachments-edit' => 'attachments.edit', - 'attachments-delete' => 'attachments.delete', - 'attachments-show' => 'attachments.show', - 'attachments-preview' => 'attachments.preview', - 'bills-index' => 'bills.index', - 'bills-create' => 'bills.create', - 'bills-edit' => 'bills.edit', - 'bills-delete' => 'bills.delete', - 'bills-show' => 'bills.show', - 'budgets-index' => 'budgets.index', - 'budgets-create' => 'budgets.create', - 'budgets-edit' => 'budgets.edit', - 'budgets-delete' => 'budgets.delete', - 'budgets-show' => 'budgets.show', - 'budgets-noBudget' => 'budgets.noBudget', - 'categories-index' => 'categories.index', - 'categories-create' => 'categories.create', - 'categories-edit' => 'categories.edit', - 'categories-delete' => 'categories.delete', - 'categories-show' => 'categories.show', - 'categories-show-date' => 'categories.show.date', - 'categories-noCategory' => 'categories.noCategory', - 'currency-index' => 'currency.index', - 'currency-create' => 'currency.create', - 'currency-edit' => 'currency.edit', - 'currency-delete' => 'currency.delete', - 'new-user-index' => 'new-user.index', - 'piggy-banks-index' => 'piggy-banks.index', - 'piggy-banks-create' => 'piggy-banks.create', - 'piggy-banks-edit' => 'piggy-banks.edit', - 'piggy-banks-delete' => 'piggy-banks.delete', - 'piggy-banks-show' => 'piggy-banks.show', - 'preferences' => 'preferences', - 'profile' => 'profile', - 'profile-change-password' => 'profile.change-password', - 'profile-delete-account' => 'profile.delete-account', - 'reports-index' => 'reports.index', - 'reports-report' => 'reports.report', - 'search' => 'search', - 'tags-index' => 'tags.index', - 'tags-create' => 'tags.create', - 'tags-show' => 'tags.show', - 'tags-edit' => 'tags.edit', - 'tags-delete' => 'tags.delete', - 'transactions-index' => 'transactions.index', - 'transactions-create' => 'transactions.create', - 'transactions-edit' => 'transactions.edit', - 'transactions-delete' => 'transactions.delete', - 'transactions-show' => 'transactions.show', ]; diff --git a/resources/views/import/complete.twig b/resources/views/import/complete.twig index 9d4df06c5d..4272cc3648 100644 --- a/resources/views/import/complete.twig +++ b/resources/views/import/complete.twig @@ -27,6 +27,12 @@ class="fa fa-fw fa-gears"> {{ 'import_start_import'|_ }} +

+   +

+

+ {{ 'import_share_configuration'|_ }} +

diff --git a/resources/views/import/finished.twig b/resources/views/import/finished.twig index 4a6f7e9903..abf47a20c6 100644 --- a/resources/views/import/finished.twig +++ b/resources/views/import/finished.twig @@ -11,9 +11,11 @@

{{ 'import_finished'|_ }}

- This import has beeen done. Link to tag or set of transactions. +

+ {{ 'import_share_configuration'|_ }} +

diff --git a/resources/views/import/index.twig b/resources/views/import/index.twig index c1b02b329a..137d87bf9d 100644 --- a/resources/views/import/index.twig +++ b/resources/views/import/index.twig @@ -11,20 +11,37 @@

{{ 'import'|_ }}

-

- {{ 'import_intro_text'|_ }} -

+
+
+

+ {{ 'import_data_full'|_ }} +

+

+ {{ 'import_intro_what_it_does'|_ }} +

+

+ {{ 'import_intro_import_conf_title'|_ }} +

+

+ {{ 'import_intro_import_conf_text'|_ }} +

+

+ {{ 'import_intro_beta_warning'|_ }} +

+ +

+  {{ 'import_intro_beta'|_ }} +

+
+
-

-  {{ 'import_intro_beta'|_ }} -

-
+
{{ ExpandedForm.file('import_file', {helpText: 'import_file_help'|_}) }} {{ ExpandedForm.file('configuration_file', {helpText: 'configuration_file_help'|_|raw}) }}