Fixes #3064. Checking for views/default/welcome.php and aborting upgrade if found. Need to add documention for how to replace views directory to wiki. Also fixed ajax loader during upgrade.

git-svn-id: http://code.elgg.org/elgg/trunk@8678 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 11 insertions, 0 deletions

diff --git a/languages/en.php b/languages/en.php
index c597743e9..c65aaefd3 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -955,6 +955,17 @@ Once you have logged in, we highly recommend that you change your password.
 	'upgrading' => 'Upgrading...',
 	'upgrade:db' => 'Your database was upgraded.',
 	'upgrade:core' => 'Your elgg installation was upgraded.',
+	'upgrade:unable_to_upgrade' => 'Unable to upgrade.',
+	'upgrade:unable_to_upgrade_info' =>
+		'This installation cannot be upgraded because legacy views
+		were detected in the Elgg core views directory. These views have been deprecated and need to be
+		removed for Elgg to function correctly. If you have not made changes to Elgg core, you can
+		simply delete the views directory and replace it with the one from the latest
+		package of Elgg downloaded from <a href="http://elgg.org">elgg.org</a>.<br /><br />
+
+		If you need detailed instructions, please visit the <a href="http://docs.elgg.org/wiki/Upgrading_Elgg">
+		Upgrading Elgg documentation</a>.  If you require assistance, please post to the
+		<a href="http://community.elgg.org/pg/groups/discussion/">Community Support Forums</a>.',
 
 	'deprecated:function' => '%s() was deprecated by %s()',