aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--languages/en.php24
-rw-r--r--mod/thewire/views/default/object/thewire.php2
-rw-r--r--mod/thewire/views/default/river/object/thewire/create.php2
3 files changed, 14 insertions, 14 deletions
diff --git a/languages/en.php b/languages/en.php
index e70aa35da..281942a2b 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -166,8 +166,8 @@
'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',
- 'deprecatedfunction' => 'Warning: This code uses the deprecated function \'%s\' and is not compatible with this version of Elgg',
-
+ 'deprecatedfunction' => 'Warning: This code uses the deprecated function \'%s\' and is not compatible with this version of Elgg',
+
'pageownerunavailable' => 'Warning: The page owner %d is not accessible!',
/**
* API
@@ -275,7 +275,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
'profile:mobile' => "Mobile phone",
'profile:website' => "Website",
- 'profile:banned' => 'This user account has been suspended.',
+ 'profile:banned' => 'This user account has been suspended.',
'profile:deleteduser' => 'Deleted user',
'profile:river:update' => "%s updated their profile",
@@ -414,7 +414,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
'search' => "Search",
'searchtitle' => "Search: %s",
- 'users:searchtitle' => "Searching for users: %s",
+ 'users:searchtitle' => "Searching for users: %s",
'groups:searchtitle' => "Searching for groups: %s",
'advancedsearchtitle' => "%s with results matching %s",
'notfound' => "No results found.",
@@ -429,10 +429,10 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
'user:search:startblurb' => "Users matching '%s':",
'user:search:finishblurb' => "To view more, click here.",
-
- 'group:search:startblurb' => "Groups matching '%s':",
- 'group:search:finishblurb' => "To view more, click here.",
- 'search:go' => 'Go',
+
+ 'group:search:startblurb' => "Groups matching '%s':",
+ 'group:search:finishblurb' => "To view more, click here.",
+ 'search:go' => 'Go',
/**
* Account
@@ -800,9 +800,9 @@ Alternatively, you can enter your database settings below and we will try and do
'installation:allow_user_default_access:label' => "Allow user default access",
'installation:simplecache:description' => "The simple cache increases performance by caching static content including some CSS and JavaScript files. Normally you will want this on.",
- 'installation:simplecache:label' => "Use simple cache (recommended)",
-
- 'installation:viewpathcache:description' => "The view filepath cache increases the loading times of plugins by caching the location of their views.",
+ 'installation:simplecache:label' => "Use simple cache (recommended)",
+
+ 'installation:viewpathcache:description' => "The view filepath cache decreases the loading times of plugins by caching the location of their views.",
'installation:viewpathcache:label' => "Use view filepath cache (recommended)",
'upgrading' => 'Upgrading',
@@ -813,7 +813,7 @@ Alternatively, you can enter your database settings below and we will try and do
* Welcome
*/
- 'welcome' => "Welcome",
+ 'welcome' => "Welcome",
'welcome:user' => 'Welcome %s',
'welcome_message' => "Welcome to this Elgg installation.",
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 906ec2fbe..ef1c8f55c 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -38,7 +38,7 @@
<div class="thewire_options">
- <a href="<?php echo $vars['url']; ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="reply"><?php elgg_echo('thewire:reply'); ?></a>
+ <a href="<?php echo $vars['url']; ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="reply"><?php echo elgg_echo('thewire:reply'); ?></a>
<?php
/* //only have a reply option for main notes, not other replies
if($vars['entity']->parent == 0){
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index 2c1bb159d..0c2f67463 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -9,7 +9,7 @@
$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
$string .= parse_urls($desc);
- $string .= " (<a href=\"{$vars['url']}mod/thewire/add.php?wire_username={$object->getOwnerEntity()->username}\" class=\"reply\">" . elgg_echo('thewire:reply') . "</a>)";
+ $string .= " <span class=\"river_item_time\"><a href=\"{$vars['url']}mod/thewire/add.php?wire_username={$object->getOwnerEntity()->username}\" class=\"reply\">" . elgg_echo('thewire:reply') . "</a></span>";
?>
<?php