aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/conversation.php14
1 files changed, 9 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 3c86bef3c..07d43e660 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -205,10 +205,12 @@ function localize_item(&$item){
$Bname = $obj['title'];
- $A = '[zrl=' . chanlink_url($Alink) . ']' . $Aname . '[/zrl]';
- $B = '[zrl=' . chanlink_url($Blink) . ']' . $Bname . '[/zrl]';
+ $A = '[zrl=' . chanlink_url($Alink) . '][bdi]' . $Aname . '[/bdi][/zrl]';
+ $B = '[zrl=' . chanlink_url($Blink) . '][bdi]' . $Bname . '[/bdi][/zrl]';
if ($Bphoto!="") $Bphoto = '[zrl=' . chanlink_url($Blink) . '][zmg=80x80]' . $Bphoto . '[/zmg][/zrl]';
+ $item['shortlocalize'] = sprintf( t('%1$s is now connected with %2$s'), '[bdi]' . $Aname . '[/bdi]', '[bdi]' . $Bname . '[/bdi]');
+
$item['body'] = $item['localize'] = sprintf( t('%1$s is now connected with %2$s'), $A, $B);
$item['body'] .= "\n\n\n" . $Bphoto;
}
@@ -237,8 +239,8 @@ function localize_item(&$item){
}
$Bname = $obj['title'];
- $A = '[zrl=' . chanlink_url($Alink) . ']' . $Aname . '[/zrl]';
- $B = '[zrl=' . chanlink_url($Blink) . ']' . $Bname . '[/zrl]';
+ $A = '[zrl=' . chanlink_url($Alink) . '][bdi]' . $Aname . '[/bdi][/zrl]';
+ $B = '[zrl=' . chanlink_url($Blink) . '][bdi]' . $Bname . '[/bdi][/zrl]';
if ($Bphoto!="") $Bphoto = '[zrl=' . chanlink_url($Blink) . '][zmg=80x80]' . $Bphoto . '[/zmg][/zrl]';
// we can't have a translation string with three positions but no distinguishable text
@@ -252,6 +254,8 @@ function localize_item(&$item){
// then do the sprintf on the translation string
+ $item['shortlocalize'] = sprintf($txt, '[bdi]' . $Aname . '[/bdi]', '[bdi]' . $Bname . '[/bdi]');
+
$item['body'] = $item['localize'] = sprintf($txt, $A, $B);
$item['body'] .= "\n\n\n" . $Bphoto;
}
@@ -263,7 +267,7 @@ function localize_item(&$item){
$Aname = $item['author']['xchan_name'];
$Alink = $item['author']['xchan_url'];
- $A = '[zrl=' . chanlink_url($Alink) . ']' . $Aname . '[/zrl]';
+ $A = '[zrl=' . chanlink_url($Alink) . '][bdi]' . $Aname . '[/bdi][/zrl]';
$txt = t('%1$s is %2$s','mood');