aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-06-17 17:13:35 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-06-17 17:13:35 +0000
commit547fcaebf6e509bbd73989d5d97135355aef01ea (patch)
treeb2e0911b1993e0ae6d658c4918d7efd645c673f4
parentfcc0303d1329c65c4c3fe4faf3a8a2921c2a15e3 (diff)
downloadelgg-547fcaebf6e509bbd73989d5d97135355aef01ea.tar.gz
elgg-547fcaebf6e509bbd73989d5d97135355aef01ea.tar.bz2
* Translation 'reply' fixed.
* Now possible to reply to wire posts from within the river. git-svn-id: https://code.elgg.org/elgg/trunk@3344 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/thewire/views/default/object/thewire.php2
-rw-r--r--mod/thewire/views/default/river/object/thewire/create.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index ead69daf4..906ec2fbe 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">reply</a>
+ <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>
<?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 3e19b811a..df381d7f7 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -6,7 +6,8 @@
$string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";
$string .= $object->description;
-
+
+ $string .= " (<a href=\"{$vars['url']}mod/thewire/add.php?wire_username={$object->getOwnerEntity()->username}\" class=\"reply\">" . elgg_echo('thewire:reply') . "</a>)";
?>
<?php