aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-23 20:15:53 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-23 20:15:53 +0000
commitacb5a3597db4c5453b5e4cbe3778c211e1f88603 (patch)
tree3b70586bf1631807a00be8863f5d0ffdf25a0297
parentd6e3334ff863338a062b8175cfb99ea823bb1128 (diff)
downloadelgg-acb5a3597db4c5453b5e4cbe3778c211e1f88603.tar.gz
elgg-acb5a3597db4c5453b5e4cbe3778c211e1f88603.tar.bz2
merged [6829] from 1.7 branch into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6854 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/thewire/languages/en.php2
-rw-r--r--mod/thewire/views/default/object/thewire.php4
2 files changed, 4 insertions, 2 deletions
diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php
index 0fb114028..0f1055273 100644
--- 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 d87d8f8e3..387021112 100644
--- 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>