aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-12-04 21:53:39 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-12-04 21:53:39 +0000
commit0d252393cb42b48bffa30f0c02658a3f9b928550 (patch)
treee4cf40d0a67964a99d9e85d15e379d73b9ca68e9
parentf22f70eaabf60605a2664db0d9fcc70a16d314b6 (diff)
downloadelgg-0d252393cb42b48bffa30f0c02658a3f9b928550.tar.gz
elgg-0d252393cb42b48bffa30f0c02658a3f9b928550.tar.bz2
Closes #501
git-svn-id: https://code.elgg.org/elgg/trunk@2504 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--languages/en.php34
-rw-r--r--views/default/friends/collectiontabs.php6
2 files changed, 21 insertions, 19 deletions
diff --git a/languages/en.php b/languages/en.php
index a25c7c810..283d926b2 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -230,7 +230,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
'group' => "Group",
'item:group' => "Groups",
-
+
/**
* Profile
*/
@@ -238,8 +238,8 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
'profile' => "Profile",
'profile:edit:default' => 'Replace profile fields',
'user' => "User",
- 'item:user' => "Users",
- 'riveritem:single:user' => 'a user',
+ 'item:user' => "Users",
+ 'riveritem:single:user' => 'a user',
'riveritem:plural:user' => 'some users',
/**
@@ -350,6 +350,8 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
'friends:nocollectionname' => "You need to give your collection a name before it can be created.",
'friends:expandall' => 'Expand all',
'friends:closeall' => 'Close all',
+ 'friends:collections:members' => "Collection members",
+ 'friends:collections:edit' => "Edit collection",
'friends:river:created' => "%s added the friends widget.",
'friends:river:updated' => "%s updated their friends widget.",
@@ -503,8 +505,8 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
'admin:plugins:label:copyright' => "Copyright",
'admin:plugins:label:licence' => "Licence",
'admin:plugins:label:website' => "URL",
- "admin:plugins:label:moreinfo" => 'more info',
- 'admin:plugins:reorder:yes' => "Plugin %s was reordered successfully.",
+ "admin:plugins:label:moreinfo" => 'more info',
+ 'admin:plugins:reorder:yes' => "Plugin %s was reordered successfully.",
'admin:plugins:reorder:no' => "Plugin %s could not be reordered.",
'admin:plugins:disable:yes' => "Plugin %s was disabled successfully.",
'admin:plugins:disable:no' => "Plugin %s could not be disabled.",
@@ -585,15 +587,15 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
'enable' => "Enable",
'disable' => "Disable",
'request' => "Request",
- 'complete' => "Complete",
- 'open' => 'Open',
+ 'complete' => "Complete",
+ 'open' => 'Open',
'close' => 'Close',
'reply' => "Reply",
-
- 'up' => 'Up',
- 'down' => 'Down',
- 'top' => 'Top',
- 'bottom' => 'Bottom',
+
+ 'up' => 'Up',
+ 'down' => 'Down',
+ 'top' => 'Top',
+ 'bottom' => 'Bottom',
'invite' => "Invite",
@@ -718,7 +720,7 @@ Alternatively, you can enter your database settings below and we will try and do
'installation:disableapi' => "The RESTful API is a flexible and extensible interface that enables applications to use certain Elgg features remotely.",
'installation:disableapi:label' => "Enable the RESTful API",
-
+
'upgrading' => 'Upgrading',
'upgrade:db' => 'Your database was upgraded.',
'upgrade:core' => 'Your elgg installation was upgraded',
@@ -779,9 +781,9 @@ If you requested this click on the link below, otherwise ignore this email.
* Comments
*/
- 'comments:count' => "%s comments",
-
- 'riveraction:annotation:generic_comment' => '%s commented on %s',
+ 'comments:count' => "%s comments",
+
+ 'riveraction:annotation:generic_comment' => '%s commented on %s',
'generic_comments:add' => "Add a comment",
'generic_comments:text' => "Comment",
diff --git a/views/default/friends/collectiontabs.php b/views/default/friends/collectiontabs.php
index 61970af4a..f9b74146c 100644
--- a/views/default/friends/collectiontabs.php
+++ b/views/default/friends/collectiontabs.php
@@ -9,9 +9,9 @@
<div id="friendsPickerNavigationTabs">
<ul>
-<li class="selected"><a href="#" class="collectionmembers<?php echo $friendspicker; ?>">Collection members</a></li>
+<li class="selected"><a href="#" class="collectionmembers<?php echo $friendspicker . "\">" . elgg_echo('friends:collections:members'); ?></a></li>
-<li><a href="#" class="editmembers<?php echo $friendspicker; ?>">Edit collection</a></li>
+<li><a href="#" class="editmembers<?php echo $friendspicker . "\">" . elgg_echo('friends:collections:edit'); ?></a></li>
</ul>
</div>
@@ -45,4 +45,4 @@ $(document).ready(function () {
});
-</script> \ No newline at end of file
+</script>