diff --git a/mod/notifications.php b/mod/notifications.php index fa2c78cf6..f3e7c564a 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -205,18 +205,18 @@ function notifications_content(&$a) { '$photo' => ((x($rr,'photo')) ? proxy_url($rr['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"), '$fullname' => $rr['name'], '$location' => bbcode($rr['glocation'], false, false), - '$location_label' => t('Location:'), + '$lbl_location' => t('Location:'), '$about' => bbcode($rr['gabout'], false, false), - '$about_label' => t('About:'), + '$lbl_about' => t('About:'), '$keywords' => $rr['gkeywords'], - '$keywords_label' => t('Tags:'), + '$lbl_keywords' => t('Tags:'), '$gender' => $rr['ggender'], - '$gender_label' => t('Gender:'), + '$lbl_gender' => t('Gender:'), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), '$url' => $rr['url'], '$zrl' => zrl($rr['url']), - '$url_label' => t('Profile URL'), + '$lbl_url' => t('Profile URL'), '$addr' => $rr['addr'], '$lbl_knowyou' => $lbl_knowyou, '$lbl_network' => t('Network:'), diff --git a/view/templates/intros.tpl b/view/templates/intros.tpl index fa823ca71..e3933e381 100644 --- a/view/templates/intros.tpl +++ b/view/templates/intros.tpl @@ -4,11 +4,11 @@

{{$str_notifytype}} {{$notify_type}}

{{$fullname|escape:'html'}} -
{{$url_label}}
{{$url}}
-{{if $location}}
{{$location_label}}
{{$location}}
{{/if}} -{{if $gender}}
{{$gender_label}}
{{$gender}}
{{/if}} -{{if $keywords}}
{{$keywords_label}}
{{$keywords}}
{{/if}} -{{if $about}}
{{$about_label}}
{{$about}}
{{/if}} +
{{$lbl_url}}
{{$url}}
+{{if $location}}
{{$lbl_location}}
{{$location}}
{{/if}} +{{if $gender}}
{{$lbl_gender}}
{{$gender}}
{{/if}} +{{if $keywords}}
{{$lbl_keywords}}
{{$keywords}}
{{/if}} +{{if $about}}
{{$lbl_about}}
{{$about}}
{{/if}}
{{$lbl_knowyou}} {{$knowyou}}
{{$note}}
diff --git a/view/theme/frio/templates/intros.tpl b/view/theme/frio/templates/intros.tpl index 0b09c2dcc..86c7fc342 100644 --- a/view/theme/frio/templates/intros.tpl +++ b/view/theme/frio/templates/intros.tpl @@ -20,12 +20,12 @@
{{$str_notifytype}}{{$notify_type}}
{{* Additional information of the contact *}} -
{{$url_label}}: {{$url}}
+
{{$lbl_url}}: {{$url}}
{{if $network}}
{{$lbl_network}} {{$network}}
{{/if}} - {{if $location}}
{{$location_label}} {{$location}}
{{/if}} - {{if $gender}}
{{$gender_label}} {{$gender}}
{{/if}} - {{if $keywords}}
{{$keywords_label}} {{$keywords}}
{{/if}} - {{if $about}}
{{$about_label}} {{$about}}
{{/if}} + {{if $location}}
{{$lbl_location}} {{$location}}
{{/if}} + {{if $gender}}
{{$lbl_gender}} {{$gender}}
{{/if}} + {{if $keywords}}
{{$lbl_keywords}} {{$keywords}}
{{/if}} + {{if $about}}
{{$lbl_about}} {{$about}}
{{/if}}
{{$lbl_knowyou}}{{$knowyou}}
{{$note}}