pull strings from connection request templates

4 files changed, 56 insertions, 42 deletions

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 65a2c771e..9c8064db5 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -535,6 +535,20 @@ function dfrn_request_content(&$a) {
 		else
 			$tpl = load_view_file('view/auto_request.tpl');
 		$o .= replace_macros($tpl,array(
+			'$header' => t('Friend/Connection Request'),
+			'$pls_answer' => t('Please answer the following:'),
+			'$does_know' => t('Does $name know you?'),
+			'$yes' => t('Yes'),
+			'$no' => t('No'),
+			'$add_note' => t('Add a personal note:'),
+			'$page_desc' => t('Please enter your profile address from one of the following supported social networks:'),
+			'$friendika' => t('Friendika'),
+			'$statusnet' => t('StatusNet/Federated Social Web'),
+			'$private_net' => t("Private \x28secure\x29 network"),
+			'$public_net' => t("Public \x28insecure\x29 network"),
+			'$your_address' => t('Your profile address:'),
+			'$submit' => t('Submit Request'),
+			'$cancel' => t('Cancel'),
 			'$nickname' => $a->argv[1],
 			'$name' => $a->profile['name'],
 			'$myaddr' => $myaddr
diff --git a/view/auto_request.tpl b/view/auto_request.tpl
new file mode 100644
index 000000000..b8d2d1a72
--- /dev/null
+++ b/view/auto_request.tpl
@@ -0,0 +1,29 @@
+
+<h1>$header</h1>
+
+<p id="dfrn-request-intro">
+$page_desc<br />
+<ul id="dfrn-request-networks">
+<li><a href="http://friendika.com" title="$private_net">$friendika</a> <img src="images/lock_icon.gif" alt="$private_net" title="$private_net" /></li>
+<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a> <img src="images/unlock_icon.gif" alt="$public_net" title="$public_net"/></li>
+</ul>
+</p>
+
+<form action="dfrn_request/$nickname" method="post" />
+
+<div id="dfrn-request-url-wrapper" >
+	<label id="dfrn-url-label" for="dfrn-url" >$your_address</label>
+	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" />
+	<div id="dfrn-request-url-end"></div>
+</div>
+
+
+<div id="dfrn-request-info-wrapper" >
+
+</div>
+
+	<div id="dfrn-request-submit-wrapper">
+		<input type="submit" name="submit" id="dfrn-request-submit-button" value="$submit" />
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="$cancel" />
+	</div>
+</form>
diff --git a/view/en/dfrn_request.tpl b/view/dfrn_request.tpl
index 4dd8c0489..9cb1e8749 100644
--- a/view/en/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -1,41 +1,41 @@
 
-<h1>Friend/Connection Request</h1>
+<h1>$header</h1>
 
 <p id="dfrn-request-intro">
-You may request a connection with this member if you have a valid profile address<br />
-on one of the following social networks:<br />
+$page_desc<br />
 <ul id="dfrn-request-networks">
-<li><a href="http://friendika.com" title="Private (secure) network">Friendika</a> <img src="images/lock_icon.gif" alt="Private (secure) network" title="Private (secure) network" /></li>
-<li><a href="http://ostatus.org" title="Public (insecure) network" >StatusNet/Federated Social Web</a> <img src="images/unlock_icon.gif" alt="Public (insecure) network" title="Public (insecure) network"/></li>
+<li><a href="http://friendika.com" title="$private_net">$friendika</a> <img src="images/lock_icon.gif" alt="$private_net" title="$private_net" /></li>
+<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a> <img src="images/unlock_icon.gif" alt="$public_net" title="$public_net"/></li>
 </ul>
 </p>
 
 <form action="dfrn_request/$nickname" method="post" />
 
 <div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >Your profile address:</label>
+	<label id="dfrn-url-label" for="dfrn-url" >$your_address</label>
 	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" />
 	<div id="dfrn-request-url-end"></div>
 </div>
 
 <p id="dfrn-request-options">
-Please answer the following:
+$pls_answer
 </p>
 
 <div id="dfrn-request-info-wrapper" >
 
+
 <p id="doiknowyou">
-Does $name know you?
+$does_know
 </p>
 
 		<div id="dfrn-request-know-yes-wrapper">
-		<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">Yes</label>
+		<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">$yes</label>
 		<input type="radio" name="knowyou" id="knowyouyes" value="1" />
 
 		<div id="dfrn-request-knowyou-break" ></div>	
 		</div>
 		<div id="dfrn-request-know-no-wrapper">
-		<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">No</label>
+		<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">$no</label>
 		<input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
 
 		<div id="dfrn-request-knowyou-end"></div>
@@ -43,7 +43,7 @@ Does $name know you?
 
 
 <p id="dfrn-request-message-desc">
-Add a personal note:
+$add_note
 </p>
 	<div id="dfrn-request-message-wrapper">
 	<textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
@@ -53,7 +53,7 @@ Add a personal note:
 </div>
 
 	<div id="dfrn-request-submit-wrapper">
-		<input type="submit" name="submit" id="dfrn-request-submit-button" value="Submit Request" />
-		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="Cancel" />
+		<input type="submit" name="submit" id="dfrn-request-submit-button" value="$submit" />
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="$cancel" />
 	</div>
 </form>
diff --git a/view/en/auto_request.tpl b/view/en/auto_request.tpl
deleted file mode 100644
index 97e750083..000000000
--- a/view/en/auto_request.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-
-<h1>Friend/Connection Request</h1>
-
-<p id="dfrn-request-intro">
-Please enter your profile address from one of the following supported social networks:<br />
-<ul id="dfrn-request-networks">
-<li><a href="http://friendika.com" title="Private (secure) network">Friendika</a> <img src="images/lock_icon.gif" alt="Private (secure) network" title="Private (secure) network" /></li>
-<li><a href="http://ostatus.org" title="Public (insecure) network" >StatusNet/Federated Social Web</a> <img src="images/unlock_icon.gif" alt="Public (insecure) network" title="Public (insecure) network"/></li>
-</ul>
-</p>
-
-<form action="dfrn_request/$nickname" method="post" />
-
-<div id="dfrn-request-url-wrapper" >
-	<label id="dfrn-url-label" for="dfrn-url" >Your profile address:</label>
-	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="$myaddr" />
-	<div id="dfrn-request-url-end"></div>
-</div>
-
-
-<div id="dfrn-request-info-wrapper" >
-
-</div>
-
-	<div id="dfrn-request-submit-wrapper">
-		<input type="submit" name="submit" id="dfrn-request-submit-button" value="Submit Request" />
-		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="Cancel" />
-	</div>
-</form>