From 5ef01b0a872ee5846240d7a4900cf374d645ea3a Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 2 Dec 2009 12:17:56 +0000 Subject: closes #876 - profile language strings moved to profile plugin git-svn-id: http://code.elgg.org/elgg/trunk@3713 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/usersettings.php | 1 - languages/en.php | 82 ++------------------------------------------- 2 files changed, 3 insertions(+), 80 deletions(-) diff --git a/engine/lib/usersettings.php b/engine/lib/usersettings.php index 4843ffc99..baaf41562 100644 --- a/engine/lib/usersettings.php +++ b/engine/lib/usersettings.php @@ -38,7 +38,6 @@ function usersettings_pagesetup() { if (get_context() == "settings") { $user = get_loggedin_user(); add_submenu_item(elgg_echo('usersettings:user:opt:linktext'),$CONFIG->wwwroot . "pg/settings/user/{$user->username}/"); - //add_submenu_item(elgg_echo('profile:editicon'), $CONFIG->wwwroot . 'mod/profile/editicon.php'); add_submenu_item(elgg_echo('usersettings:plugins:opt:linktext'),$CONFIG->wwwroot . "pg/settings/plugins/{$user->username}/"); add_submenu_item(elgg_echo('usersettings:statistics:opt:linktext'),$CONFIG->wwwroot . "pg/settings/statistics/{$user->username}/"); } diff --git a/languages/en.php b/languages/en.php index 7764e9d68..8a63d6429 100644 --- a/languages/en.php +++ b/languages/en.php @@ -38,8 +38,6 @@ $english = array( 'actionundefined' => "The requested action (%s) was not defined in the system.", 'actionloggedout' => "Sorry, you cannot perform this action while logged out.", - 'notfound' => "The requested resource could not be found, or you do not have access to it.", - 'SecurityException:Codeblock' => "Denied access to execute privileged code block", 'DatabaseException:WrongCredentials' => "Elgg couldn't connect to the database using the given credentials.", 'DatabaseException:NoConnect' => "Elgg couldn't select the database '%s', please check that the database is created and you have access to it.", @@ -248,87 +246,11 @@ To remove a widget drag it back to the Widget gallery.", 'item:group' => "Groups", /** - * Profile + * Users */ - 'profile' => "Profile", - 'profile:edit:default' => 'Replace profile fields', - 'profile:preview' => 'Preview', 'user' => "User", 'item:user' => "Users", - 'riveritem:single:user' => 'a user', - 'riveritem:plural:user' => 'some users', - - - -/** - * Profile menu items and titles - */ - - 'profile:yours' => "Your profile", - 'profile:user' => "%s's profile", - - 'profile:edit' => "Edit profile", - 'profile:profilepictureinstructions' => "The profile picture is the image that's displayed on your profile page.
You can change it as often as you'd like. (File formats accepted: GIF, JPG or PNG)", - 'profile:icon' => "Profile picture", - 'profile:createicon' => "Create your avatar", - 'profile:currentavatar' => "Current avatar", - 'profile:createicon:header' => "Profile picture", - 'profile:profilepicturecroppingtool' => "Profile picture cropping tool", - 'profile:createicon:instructions' => "Click and drag a square below to match how you want your picture cropped. A preview of your cropped picture will appear in the box on the right. When you are happy with the preview, click 'Create your avatar'. This cropped image will be used throughout the site as your avatar. ", - - 'profile:editdetails' => "Edit details", - 'profile:editicon' => "Edit profile icon", - - 'profile:aboutme' => "About me", - 'profile:description' => "About me", - 'profile:briefdescription' => "Brief description", - 'profile:location' => "Location", - 'profile:skills' => "Skills", - 'profile:interests' => "Interests", - 'profile:contactemail' => "Contact email", - 'profile:phone' => "Telephone", - 'profile:mobile' => "Mobile phone", - 'profile:website' => "Website", - - 'profile:banned' => 'This user account has been suspended.', - 'profile:deleteduser' => 'Deleted user', - - 'profile:river:update' => "%s updated their profile", - 'profile:river:iconupdate' => "%s updated their profile icon", - - 'profile:label' => "Profile label", - 'profile:type' => "Profile type", - - 'profile:editdefault:fail' => 'Default profile could not be saved', - 'profile:editdefault:success' => 'Item successfully added to default profile', - - - 'profile:editdefault:delete:fail' => 'Removed default profile item field failed', - 'profile:editdefault:delete:success' => 'Default profile item deleted!', - - '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 - */ - - 'profile:saved' => "Your profile was successfully saved.", - 'profile:icon:uploaded' => "Your profile picture was successfully uploaded.", - -/** - * Profile error messages - */ - - 'profile:noaccess' => "You do not have permission to edit this profile.", - 'profile:notfound' => "Sorry; we could not find the specified profile.", - 'profile:cantedit' => "Sorry; you do not have permission to edit this profile.", - 'profile:icon:notfound' => "Sorry; there was a problem uploading your profile picture.", /** * Friends @@ -402,6 +324,8 @@ To remove a widget drag it back to the Widget gallery.", 'river:relationship:friend' => 'is now friends with', 'river:noaccess' => 'You do not have permission to view this item.', 'river:posted:generic' => '%s posted', + 'riveritem:single:user' => 'a user', + 'riveritem:plural:user' => 'some users', /** * Plugins -- cgit v1.2.3