aboutsummaryrefslogtreecommitdiff
path: root/languages/en.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-12 23:27:18 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-12 23:27:18 +0000
commitc194b2ad8b99621c5bd7bf32f68d3c3d2399073c (patch)
tree04112f964396aebdb2369dc8cc4ebb523ee83063 /languages/en.php
parent210b27ec56ce6f5fffc14c89270865932638c779 (diff)
downloadelgg-c194b2ad8b99621c5bd7bf32f68d3c3d2399073c.tar.gz
elgg-c194b2ad8b99621c5bd7bf32f68d3c3d2399073c.tar.bz2
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
Diffstat (limited to 'languages/en.php')
-rw-r--r--languages/en.php11
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()',