diff --git a/installation/language/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini
index 3fd261a21af7..e4f973d98f8e 100644
--- a/installation/language/en-GB/joomla.ini
+++ b/installation/language/en-GB/joomla.ini
@@ -108,19 +108,20 @@ INSTL_ADMIN_USERNAME_DESC="Set the username for your Super User account."
INSTL_LOGIN_DATA="Login Data"
INSTL_SETUP_SITE_NAME="Setup Site Name"
INSTL_SITE="Main Configuration"
-INSTL_SITE_DEVMODE_LABEL="We detected development mode"
+INSTL_SITE_DEVMODE_LABEL="We detected development mode. The \"%s\" folder should be deleted if you are not testing locally."
INSTL_SITE_NAME_DESC="Enter the name of your Joomla site."
; Complete view
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="The \"%s\" folder could not be deleted. Please manually delete the folder."
-INSTL_COMPLETE_REMOVE_FOLDER="Remove \"%s\" folder"
-INSTL_COMPLETE_CONGRAT="Congratulations!"
-INSTL_COMPLETE_TITLE="Congratulations! Your Joomla site is ready."
-INSTL_COMPLETE_SITE_BTN="Complete & Open Site"
+INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Install Additional Languages"
INSTL_COMPLETE_ADMIN_BTN="Complete & Open Admin"
+INSTL_COMPLETE_CONGRAT="Congratulations!"
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="The \"%s\" folder could not be deleted. Please manually delete the folder."
INSTL_COMPLETE_FINAL="Installation is Complete"
INSTL_COMPLETE_FINAL_DESC="Your Joomla installation is now complete and ready to use."
-INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Install Additional Languages"
+INSTL_COMPLETE_REMOVE_FOLDER="Remove \"%s\" folder"
+INSTL_COMPLETE_REMOVE_INSTALLATION="PLEASE REMEMBER TO COMPLETELY REMOVE THE INSTALLATION FOLDER. You will not be able to proceed beyond this point until the \"%s\" folder has been removed. This is a security feature of Joomla!"
+INSTL_COMPLETE_SITE_BTN="Complete & Open Site"
+INSTL_COMPLETE_TITLE="Congratulations! Your Joomla site is ready."
INSTL_REMOVE_INST_FOLDER="Are you sure you want to delete? Confirming will permanently delete the \"%s\" folder."
; Languages view
diff --git a/installation/language/en-US/joomla.ini b/installation/language/en-US/joomla.ini
index 5ae3a0632dbd..87c988818451 100644
--- a/installation/language/en-US/joomla.ini
+++ b/installation/language/en-US/joomla.ini
@@ -31,7 +31,6 @@ BUILD_NOXML_LANGUAGE="English US"
BUILD_NOXML_TEXT="Your host needs to use PHP with support for the XML library to run this version of Joomla!"
BUILD_NOXML_URL_TEXT="Help me resolve this"
-
; Main Config
INSTL_SELECT_INSTALL_LANG="Select Installation Language"
INSTL_SELECT_LANGUAGE_TITLE="Select Language"
@@ -109,19 +108,20 @@ INSTL_ADMIN_USERNAME_DESC="Set the username for your Super User account."
INSTL_LOGIN_DATA="Login Data"
INSTL_SETUP_SITE_NAME="Setup Site Name"
INSTL_SITE="Main Configuration"
-INSTL_SITE_DEVMODE_LABEL="We detected development mode"
+INSTL_SITE_DEVMODE_LABEL="We detected development mode. The \"%s\" folder should be deleted if you are not testing locally."
INSTL_SITE_NAME_DESC="Enter the name of your Joomla site."
; Complete view
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="The \"%s\" folder could not be deleted. Please manually delete the folder."
-INSTL_COMPLETE_REMOVE_FOLDER="Remove \"%s\" folder"
-INSTL_COMPLETE_CONGRAT="Congratulations!"
-INSTL_COMPLETE_TITLE="Congratulations! Your Joomla site is ready."
-INSTL_COMPLETE_SITE_BTN="Complete & Open Site"
+INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Install Additional Languages"
INSTL_COMPLETE_ADMIN_BTN="Complete & Open Admin"
+INSTL_COMPLETE_CONGRAT="Congratulations!"
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="The \"%s\" folder could not be deleted. Please manually delete the folder."
INSTL_COMPLETE_FINAL="Installation is Complete"
INSTL_COMPLETE_FINAL_DESC="Your Joomla installation is now complete and ready to use."
-INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Install Additional Languages"
+INSTL_COMPLETE_REMOVE_FOLDER="Remove \"%s\" folder"
+INSTL_COMPLETE_REMOVE_INSTALLATION="PLEASE REMEMBER TO COMPLETELY REMOVE THE INSTALLATION FOLDER. You will not be able to proceed beyond this point until the \"%s\" folder has been removed. This is a security feature of Joomla!"
+INSTL_COMPLETE_SITE_BTN="Complete & Open Site"
+INSTL_COMPLETE_TITLE="Congratulations! Your Joomla site is ready."
INSTL_REMOVE_INST_FOLDER="Are you sure you want to delete? Confirming will permanently delete the \"%s\" folder."
; Languages view
diff --git a/installation/template/js/remove.js b/installation/template/js/remove.js
index 71c44f5317c1..36f55f1d9944 100644
--- a/installation/template/js/remove.js
+++ b/installation/template/js/remove.js
@@ -47,9 +47,10 @@ if (document.getElementById('removeInstallationFolder')) {
customInstallation.parentNode.removeChild(customInstallation);
const removeInstallationTab = document.getElementById('removeInstallationTab');
removeInstallationTab.parentNode.removeChild(removeInstallationTab);
+ document.getElementById('langInstall').classList.remove('active');
},
onError: function (xhr) {
- Joomla.renderMessages({ error: [xhr] }, '#system-message-container');
+ Joomla.renderMessages({ error: [xhr] }, '#system-message-container');
}
}
);
diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss
index 534ea7042b36..2a347e3d836a 100644
--- a/installation/template/scss/template.scss
+++ b/installation/template/scss/template.scss
@@ -236,3 +236,11 @@ caption {
.table > :not(:last-child) > :last-child > * {
border-bottom-color: $table-border-color;
}
+
+.install-lang.active {
+ display: block;
+}
+
+.install-lang {
+ display: none;
+}
diff --git a/installation/tmpl/remove/default.php b/installation/tmpl/remove/default.php
index a0c11d51d7b9..60ffa0c15b4e 100644
--- a/installation/tmpl/remove/default.php
+++ b/installation/tmpl/remove/default.php
@@ -22,8 +22,10 @@
-