diff options
| -rw-r--r-- | languages/en.php | 15 | ||||
| -rw-r--r-- | mod/profile/views/default/profile/editdefaultprofile.php | 1 |
2 files changed, 10 insertions, 6 deletions
diff --git a/languages/en.php b/languages/en.php index 90d6f61cd..828e6ce2e 100644 --- a/languages/en.php +++ b/languages/en.php @@ -164,8 +164,8 @@ 'memcache:notinstalled' => 'PHP memcache module not installed, you must install php5-memcache',
'memcache:noservers' => 'No memcache servers defined, please populate the $CONFIG->memcache_servers variable',
'memcache:versiontoolow' => 'Memcache needs at least version %s to run, you are running %s',
- 'memcache:noaddserver' => 'Multiple server support disabled, you may need to upgrade your PECL memcache library', - + 'memcache:noaddserver' => 'Multiple server support disabled, you may need to upgrade your PECL memcache library',
+
'deprecatedfunction' => 'Warning: This code uses the deprecated function \'%s\' and is not compatible with this version of Elgg',
/**
* API
@@ -291,6 +291,9 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", 'profile:defaultprofile:reset' => 'Default system profile reset',
'profile:resetdefault' => 'Reset default profile',
+ 'profile:explainchangefields' => 'You can replace the existing profile fields with your own using the form below. First you give the new profile field a label, for example, \'Favourite team\'. Next you need to select the field type, for example, tags, url, text and so on. At any time you can revert back to the default profile set up.',
+
+
/**
* Profile status messages
@@ -436,8 +439,8 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", 'registerok' => "You have successfully registered for %s.",
'registerbad' => "Your registration was unsuccessful. The username may already exist, your passwords might not match, or your username or password may be too short.",
'registerdisabled' => "Registration has been disabled by the system administrator",
- - 'firstadminlogininstructions' => 'Your new Elgg site has been successfully installed and your administrator account created. You can now configure your site further by enabling various installed plugin tools.', +
+ 'firstadminlogininstructions' => 'Your new Elgg site has been successfully installed and your administrator account created. You can now configure your site further by enabling various installed plugin tools.',
'registration:notemail' => 'The email address you provided does not appear to be a valid email address.',
'registration:userexists' => 'That username already exists',
@@ -637,8 +640,8 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", 'content:latest:blurb' => 'Alternatively, click here to view the latest content from across the site.',
'link:text' => 'view link',
- - 'enableall' => 'Enable All', +
+ 'enableall' => 'Enable All',
'disableall' => 'Disable All',
/**
diff --git a/mod/profile/views/default/profile/editdefaultprofile.php b/mod/profile/views/default/profile/editdefaultprofile.php index b65746e01..60ff53190 100644 --- a/mod/profile/views/default/profile/editdefaultprofile.php +++ b/mod/profile/views/default/profile/editdefaultprofile.php @@ -29,6 +29,7 @@ $submit_control</p> END; echo "<div class=\"contentWrapper\">"; + echo "<p>" . elgg_echo('profile:explainchangefields') . "</p>"; echo elgg_view('input/form', array('body' => $formbody, 'action' => $vars['url'] . 'action/profile/editdefault')); echo "</div>"; ?>
\ No newline at end of file |