* 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

diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index ead69daf4bfdbc1d602cefe562ee62451f041e9e..906ec2fbeae711c121cb14685aa103c0d1bec3d1 100644 (file)
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -38,7 +38,7 @@
 \r
                        <div class="thewire_options">\r
                        \r
-                       <a href="<?php echo $vars['url']; ?>mod/thewire/add.php?wire_username=<?php echo $vars['entity']->getOwnerEntity()->username; ?>" class="reply">reply</a>\r
+                       <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>\r
                <?php\r
 /*                 //only have a reply option for main notes, not other replies\r
                    if($vars['entity']->parent == 0){\r

diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index 3e19b811a54f04b1311dc6008b3ee9210fcbd0f6..df381d7f720c098de97411ef4e45582023236b52 100644 (file)
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -6,7 +6,8 @@
 \r
        $string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";\r
        $string .= $object->description;\r
-\r
+
+       $string .= " (<a href=\"{$vars['url']}mod/thewire/add.php?wire_username={$object->getOwnerEntity()->username}\" class=\"reply\">" . elgg_echo('thewire:reply') . "</a>)";\r
 ?>\r
 \r
 <?php \r