email check failed, translate wall_item template

diff --git a/boot.php b/boot.php
index 6fe5ee99d6b65b4a74300f6500c949efbbf06168..cbbe55edc5e52ae76470d1d3ee2d9ce6fd114875 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -1497,7 +1497,7 @@ function validate_email($addr) {
                return false;
        $h = substr($addr,strpos($addr,'@') + 1);
 
-       if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR + DNS_MX))) {
+       if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX))) {
                return true;
        }
        return false;

diff --git a/mod/display.php b/mod/display.php
index fd845e608ef6188148d0cd3fabcb59a5da0276c6..30b55deceada0e7b07bc29f9631f29db3fbbfd54 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -243,6 +243,7 @@ function display_content(&$a) {
 
                        $tmp_item = replace_macros($template,array(
                                '$id' => $item['item_id'],
+                               '$title' => t('View $name's profile'),
                                '$profile_url' => $profile_link,
                                '$name' => $profile_name,
                                '$sparkle' => $sparkle,

diff --git a/mod/network.php b/mod/network.php
index ad6db2d1e1bec74481376b7dea2b1a539ab2395a..e1bec8dfa68c638a210ef1e5bf4b7798afbd9d1a 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -286,6 +286,7 @@ function network_content(&$a, $update = 0) {
 
                        $tmp_item = replace_macros($template,array(
                                '$id' => $item['item_id'],
+                               '$title' => t('View $name's profile'),
                                '$profile_url' => $profile_link,
                                '$name' => $profile_name,
                                '$thumb' => $profile_avatar,

diff --git a/mod/profile.php b/mod/profile.php
index cc0debd992324ec59bc55cbb7b4c24c1e6c9ee1e..7a57bd5a42a4ad16b85deedffd171db51ac30297 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -344,6 +344,7 @@ function profile_content(&$a, $update = 0) {
 
                        $tmp_item = replace_macros($template,array(
                                '$id' => $item['item_id'],
+                               '$title' => t('View $name's profile'),
                                '$profile_url' => $profile_link,
                                '$name' => $profile_name,
                                '$thumb' => $profile_avatar,

diff --git a/util/strings.php b/util/strings.php
index cf7299cde9b6d85e2abb13fd7306c0a87a740599..fa0e157173a97b383b0165248a9afc646885f806 100644 (file)
--- a/util/strings.php
+++ b/util/strings.php
@@ -139,6 +139,7 @@ $a->strings['Global Directory'] = 'Global Directory';
 $a->strings['Item not found.'] = 'Item not found.';
 $a->strings['Private Message'] = 'Private Message';
 $a->strings['This is you'] = 'This is you';
+$a->strings['View $name's profile'] = 'View $name's profile';
 $a->strings['Item has been removed.'] = 'Item has been removed.';
 $a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.';
 $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.';
@@ -195,7 +196,6 @@ $a->strings['Unable to locate original post.'] = 'Unable to locate original post
 $a->strings['Empty post discarded.'] = 'Empty post discarded.';
 $a->strings[" commented on your item at "] = " commented on your item at ";
 $a->strings[" posted on your profile wall at "] = " posted on your profile wall at ";
-$a->strings['Facebook status update failed.'] = 'Facebook status update failed.';
 $a->strings['photo'] = 'photo';
 $a->strings['status'] = 'status';
 $a->strings['likes'] = 'likes';
@@ -341,10 +341,10 @@ $a->strings['Select a tag to remove: '] = 'Select a tag to remove: ';
 $a->strings['Remove'] = 'Remove';
 $a->strings['No contacts.'] = 'No contacts.';
 $a->strings['Wall Photos'] = 'Wall Photos';
+$a->strings['Logged out.'] = 'Logged out.';
 $a->strings['Visible To:'] = 'Visible To:';
 $a->strings['Groups'] = 'Groups';
 $a->strings['Except For:'] = 'Except For:';
-$a->strings['Logged out.'] = 'Logged out.';
 $a->strings['Unknown | Not categorised'] = 'Unknown | Not categorised';
 $a->strings['Block immediately'] = 'Block immediately';
 $a->strings['Shady, spammer, self-marketer'] = 'Shady, spammer, self-marketer';

diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 4d2404ce0b10f5919c777cb5e5aec0a9d3ea5072..67fce415262c060bfde3f4d9ee64dcaaee7dbaec 100644 (file)
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,13 +1,13 @@
 <div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
        <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
                <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
-                       <a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+                       <a href="$profile_url" title="$title" class="wall-item-photo-link" id="wall-item-photo-link-$id">
                        <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
                </div>
 
                <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
                        $lock
-                       <a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
+                       <a href="$profile_url" title="$title" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
                        <div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
                        <div class="wall-item-location" id="wall-item-location-$id">$location</div>
                        $vote