diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-17 01:16:48 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-17 01:16:48 +0000 |
| commit | 0a6f7c1914cf78655d4700a84269faadf7ef69e3 (patch) | |
| tree | 565bbcc5b5bb84a60d3fd2986b0a53cd95224644 /languages | |
| parent | d0bcc0fcb2953baaabbfb886c90f88ab17a13163 (diff) | |
| download | elgg-0a6f7c1914cf78655d4700a84269faadf7ef69e3.tar.gz elgg-0a6f7c1914cf78655d4700a84269faadf7ef69e3.tar.bz2 | |
Fixes #3141. Disabling twitter_api and oauth_api upon upgrade because we can't check previous states. Adding an admin notice. twitter_api conflicts with twitterservice and oauth_api conflicts with oauth_lib.
git-svn-id: http://code.elgg.org/elgg/trunk@8742 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'languages')
| -rw-r--r-- | languages/en.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/languages/en.php b/languages/en.php index ad052870a..6efc4da3f 100644 --- a/languages/en.php +++ b/languages/en.php @@ -973,7 +973,8 @@ Once you have logged in, we highly recommend that you change your password. 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>.', - 'update:twitter_api:settings_found_unknown_status' => 'Twitter API (previously Twitter Service) settings were found, but its status could not be determined. Please re-activate it manually.', + 'update:twitter_api:deactivated' => 'Twitter API (previously Twitter Service) was deactivated during the upgrade. Please activate it manually if required.', + 'update:oauth_api:deactivated' => 'OAuth API (previously OAuth Lib) was deactivated during the upgrade. Please activate it manually if required.', 'deprecated:function' => '%s() was deprecated by %s()', |