merged [6829] from 1.7 branch into trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6854 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php
index 0fb1140285569e12998725c7c4979941d1f41431..0f1055273692b2c1b8d90be40d3cdfe1bc799e76 100644 (file)
--- a/mod/thewire/languages/en.php
+++ b/mod/thewire/languages/en.php
@@ -19,7 +19,7 @@
                        'thewire:add' => "Post to the wire",
                    'thewire:text' => "A note on the wire",
                        'thewire:reply' => "Reply",
-                       'thewire:via' => "via",
+                       'thewire:via_method' => "via %s",
                        'thewire:wired' => "Posted to the wire",
                        'thewire:charleft' => "characters remaining",
                        'item:object:thewire' => "Wire posts",

diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index d87d8f8e34e4004815b31b5df36a1ae0f61f9484..3870211123ce3c1e017cd42a88c111bf84414a25 100644 (file)
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -60,7 +60,9 @@ if (isset($vars['entity'])) {
                                echo elgg_echo("thewire:wired") . " " . sprintf(elgg_echo("thewire:strapline"),
                                                                elgg_view_friendly_time($vars['entity']->time_created)
                                );
-                               echo " via " . elgg_echo($vars['entity']->method) . ".";
+                               echo ' ';
+                               echo sprintf(elgg_echo('thewire:via_method'), elgg_echo($vars['entity']->method));
+                               echo '.';
                        ?>
                        </p>            
                </div>