From d216d0f27f40f9a426adf7c53c93be6934e50b93 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com>
Date: Thu, 16 Jul 2020 00:02:13 -0700
Subject: [PATCH] Reword import help text

---
 data/interfaces/default/app_import.html    | 11 ++++++++---
 data/interfaces/default/config_import.html | 12 ++++++------
 data/interfaces/default/settings.html      |  4 ++--
 plexpy/webserve.py                         |  2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/data/interfaces/default/app_import.html b/data/interfaces/default/app_import.html
index b03e253f..5f256bd6 100644
--- a/data/interfaces/default/app_import.html
+++ b/data/interfaces/default/app_import.html
@@ -32,7 +32,7 @@
                             </div>
                         </div>
                     </div>
-                    <p class="help-block">Upload the ${app} database you wish to import.</p>
+                    <p class="help-block">Upload the ${app} database file you wish to import.</p>
                 </div>
                 <div class="form-group">
                     <label for="import_database_path">Option 2: Browse for a Database File</label>
@@ -46,7 +46,7 @@
                             </div>
                         </div>
                     </div>
-                    <p class="help-block">Browse for the ${app} database you wish to import.</p>
+                    <p class="help-block">Browse for the ${app} database file you wish to import.</p>
                 </div>
                 % if app == 'Tautulli':
                 <div class="form-group">
@@ -73,7 +73,12 @@
                 </div>
                 <div class="form-group">
                     <label>Import Notes</label>
-                    <p class="help-block">Libraries, users, notification agents, newsletter agents, and registered mobile devices will also be imported</p>
+                    <p class="help-block">The following data will also be imported:</p>
+                    <ul class="help-block" style="padding-inline-start: 15px;">
+                        <li>Libraries and Users</li>
+                        <li>Notification / Newsletter Agents</li>
+                        <li>Registered Mobile Devices</li>
+                    </ul>
                 </div>
                 % else:
                 <div class="form-group">
diff --git a/data/interfaces/default/config_import.html b/data/interfaces/default/config_import.html
index 8c83a809..e41e1b40 100644
--- a/data/interfaces/default/config_import.html
+++ b/data/interfaces/default/config_import.html
@@ -7,7 +7,7 @@
         <div class="modal-body" id="modal-text">
             <form id="import_config_form" enctype="multipart/form-data" method="post" name="import_config_form">
                 <div class="form-group">
-                    <label for="import_config_file">Option 1: Upload a Config File</label>
+                    <label for="import_config_file">Option 1: Upload a Configuration File</label>
                     <div class="row">
                         <div class="col-xs-12">
                             <div class="input-group">
@@ -19,10 +19,10 @@
                             </div>
                         </div>
                     </div>
-                    <p class="help-block">Upload the Tautulli config you wish to import.</p>
+                    <p class="help-block">Upload the Tautulli configuration file you wish to import.</p>
                 </div>
                 <div class="form-group">
-                    <label for="import_config_path">Option 2: Browse for a Config File</label>
+                    <label for="import_config_path">Option 2: Browse for a Configuration File</label>
                     <div class="row">
                         <div class="col-xs-12">
                             <div class="input-group">
@@ -33,13 +33,13 @@
                             </div>
                         </div>
                     </div>
-                    <p class="help-block">Browse for the Tautulli config you wish to import.</p>
+                    <p class="help-block">Browse for the Tautulli configuration file you wish to import.</p>
                 </div>
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" name="import_backup_config" id="import_backup_config" value="1" checked> Backup Current Config
+                        <input type="checkbox" name="import_backup_config" id="import_backup_config" value="1" checked> Backup Current Configuration
                     </label>
-                    <p class="help-block">Automatically create a backup of the current config before importing.</p>
+                    <p class="help-block">Automatically create a backup of the current configuration before importing.</p>
                 </div>
                 <div class="form-group">
                     <label>Import Notes</label>
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 1eb11906..ce4e7b58 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -1319,8 +1319,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="config_import">Config Import</label>
-                            <p class="help-block">Click the button below to import a previous Tautulli config.</p>
+                            <label for="config_import">Configuration Import</label>
+                            <p class="help-block">Click the button below to import a previous Tautulli configuration.</p>
                             <div class="row">
                                 <div class="col-md-9">
                                     <div class="btn-group">
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index a9480a7a..d5ddc943 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -3898,7 +3898,7 @@ class WebInterface(object):
     @cherrypy.expose
     @requireAuth(member_of("admin"))
     def import_config_tool(self, **kwargs):
-        return serve_template(templatename="config_import.html", title="Import Tautulli Config")
+        return serve_template(templatename="config_import.html", title="Import Tautulli Configuration")
 
     @cherrypy.expose
     @cherrypy.tools.json_out()