From 8182cf1efaf0d04c6e9e9d9831d176ed4240ded2 Mon Sep 17 00:00:00 2001
From: James Cole
Date: Wed, 26 Feb 2020 19:50:36 +0100
Subject: [PATCH] New texts.
---
resources/lang/en_US/import.php | 1 +
resources/views/v1/import/file/configure-upload.twig | 3 ---
resources/views/v1/import/file/map.twig | 3 ---
resources/views/v1/import/file/new.twig | 4 ++--
resources/views/v1/import/file/roles.twig | 3 ---
resources/views/v1/import/index.twig | 4 ++--
6 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/resources/lang/en_US/import.php b/resources/lang/en_US/import.php
index 40829eea08..71506af1bc 100644
--- a/resources/lang/en_US/import.php
+++ b/resources/lang/en_US/import.php
@@ -38,6 +38,7 @@ return [
// notices about the CSV importer:
'deprecate_csv_import' => 'As outlined in this Patreon post, the way Firefly III manages importing data is going to change. That means that the CSV importer will be moved to a new, separate tool. You can already beta-test this tool if you visit this GitHub repository. I would appreciate it if you would test the new importer and let me know what you think.',
+ 'final_csv_import' => 'As outlined in this Patreon post, the way Firefly III manages importing data is going to change. That means that this is the last version of Firefly III that will feature a CSV importer. A separated tool is available that you should try for yourself: the Firefly III CSV importer. I would appreciate it if you would test the new importer and let me know what you think.',
// import provider strings (index):
'button_fake' => 'Fake an import',
diff --git a/resources/views/v1/import/file/configure-upload.twig b/resources/views/v1/import/file/configure-upload.twig
index 22df3a621f..63fefe4a3f 100644
--- a/resources/views/v1/import/file/configure-upload.twig
+++ b/resources/views/v1/import/file/configure-upload.twig
@@ -16,9 +16,6 @@
{{ trans('import.job_config_uc_text') }}
-
- {{ trans('import.deprecate_csv_import')|raw }}
-
diff --git a/resources/views/v1/import/file/map.twig b/resources/views/v1/import/file/map.twig
index 272a642a34..3f2035d263 100644
--- a/resources/views/v1/import/file/map.twig
+++ b/resources/views/v1/import/file/map.twig
@@ -22,9 +22,6 @@
{{ trans('import.job_config_map_nothing') }}
{% endif %}
-
- {{ trans('import.deprecate_csv_import')|raw }}
-
diff --git a/resources/views/v1/import/file/new.twig b/resources/views/v1/import/file/new.twig
index f8d0839656..758c9a6a65 100644
--- a/resources/views/v1/import/file/new.twig
+++ b/resources/views/v1/import/file/new.twig
@@ -14,8 +14,8 @@
{{ trans('import.job_config_file_upload_text') }}
-
- {{ trans('import.deprecate_csv_import')|raw }}
+
+ {{ trans('import.final_csv_import')|raw }}
diff --git a/resources/views/v1/import/file/roles.twig b/resources/views/v1/import/file/roles.twig
index 4fdd165c55..a983dc1b35 100644
--- a/resources/views/v1/import/file/roles.twig
+++ b/resources/views/v1/import/file/roles.twig
@@ -16,9 +16,6 @@
{{ trans('import.job_config_roles_text') }}
-
- {{ trans('import.deprecate_csv_import')|raw }}
-
diff --git a/resources/views/v1/import/index.twig b/resources/views/v1/import/index.twig
index beaa3f1a9c..d91cd0adff 100644
--- a/resources/views/v1/import/index.twig
+++ b/resources/views/v1/import/index.twig
@@ -14,8 +14,8 @@
{{ trans('import.general_index_intro') }}
-
- {{ trans('import.deprecate_csv_import')|raw }}
+
+ {{ trans('import.final_csv_import')|raw }}
{% for name, provider in providers %}