more templates

mod/dfrn_request.php

@@ -500,7 +500,9 @@ function dfrn_request_content(&$a) {
 			'$dfrn_url' => $dfrn_url,
 			'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
 			'$confirm_key' => $confirm_key,
-			'$username' => $a->user['username'], 
+			'$welcome' => sprintf( t('Welcome home %s.'), $a->user['username']),
+			'$please' => sprintf( t('Please confirm your introduction/connection request to %s.'), $dfrn_url),
+			'$submit' => t('Confirm'),
 			'$uid' => $_SESSION['uid'],
 			'$nickname' => $a->user['nickname'],
 			'dfrn_rawurl' => $_GET['dfrn_url']

mod/lostpass.php

@@ -24,7 +24,7 @@ function lostpass_post(&$a) {
 		intval($uid)
 	);
 	if($r)
-		notice("Password reset request issued. Check your email.");
+		notice( t('Password reset request issued. Check your email.') . EOL);
 
 	$email_tpl = load_view_file("view/lostpass_eml.tpl");
 	$email_tpl = replace_macros($email_tpl, array(
@@ -35,7 +35,7 @@ function lostpass_post(&$a) {
 			'$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password
 	));
 
-	$res = mail($email, sprintf(t('Password reset requested at %s'),$a->config['sitename']),
+	$res = mail($email, sprintf( t('Password reset requested at %s'),$a->config['sitename']),
 			$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME]);
 
 	goaway($a->get_baseurl());
@@ -53,7 +53,7 @@ function lostpass_content(&$a) {
 			dbesc($hash)
 		);
 		if(! count($r)) {
-			notice("Request could not be verified. (You may have previously submitted it.) Password reset failed." . EOL);
+			notice( t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.") . EOL);
 			goaway($a->get_baseurl());
 			return;
 		}
@@ -96,7 +96,12 @@ function lostpass_content(&$a) {
 	else {
 		$tpl = load_view_file('view/lostpass.tpl');
 
-		$o .= $tpl;
+		$o .= replace_macros($tpl,array(
+			'$title' => t('Forgot your Password?'),
+			'$desc' => t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'),
+			'$name' => t('Nickname or Email: '),
+			'$submit' => t('Reset') 
+		));
 
 		return $o;
 	}

util/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.1.941\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-06 22:40-0700\n"
+"POT-Creation-Date: 2011-04-06 23:01-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgid "Post successful."
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:628 ../../addon/js_upload/js_upload.php:41
+#: ../../mod/dfrn_request.php:630 ../../addon/js_upload/js_upload.php:41
 msgid "Cancel"
 msgstr ""
 
@@ -476,15 +476,29 @@ msgid ""
 "strong> profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:536 ../../include/items.php:1411
+#: ../../mod/dfrn_request.php:503
+#, php-format
+msgid "Welcome home %s."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:504
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:505
+msgid "Confirm"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:538 ../../include/items.php:1411
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:543
+#: ../../mod/dfrn_request.php:545
 msgid "Introduction received at "
 msgstr ""
 
-#: ../../mod/dfrn_request.php:545 ../../mod/lostpass.php:39
+#: ../../mod/dfrn_request.php:547 ../../mod/lostpass.php:39
 #: ../../mod/register.php:329 ../../mod/register.php:366
 #: ../../mod/regmod.php:93 ../../mod/item.php:475 ../../mod/item.php:498
 #: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:392
@@ -493,57 +507,57 @@ msgstr ""
 msgid "Administrator"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:615
+#: ../../mod/dfrn_request.php:617
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:616
+#: ../../mod/dfrn_request.php:618
 msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:617
+#: ../../mod/dfrn_request.php:619
 msgid "Does $name know you?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:618 ../../mod/register.php:436
+#: ../../mod/dfrn_request.php:620 ../../mod/register.php:436
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:619 ../../mod/register.php:437
+#: ../../mod/dfrn_request.php:621 ../../mod/register.php:437
 msgid "No"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:620
+#: ../../mod/dfrn_request.php:622
 msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:621
+#: ../../mod/dfrn_request.php:623
 msgid ""
 "Please enter your profile address from one of the following supported social "
 "networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:622
+#: ../../mod/dfrn_request.php:624
 msgid "Friendika"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:623
+#: ../../mod/dfrn_request.php:625
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:624
+#: ../../mod/dfrn_request.php:626
 msgid "Private (secure) network"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:625
+#: ../../mod/dfrn_request.php:627
 msgid "Public (insecure) network"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:626
+#: ../../mod/dfrn_request.php:628
 msgid "Your profile address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:627
+#: ../../mod/dfrn_request.php:629
 msgid "Submit Request"
 msgstr ""
 
@@ -953,11 +967,39 @@ msgstr ""
 msgid "Edit contact"
 msgstr ""
 
+#: ../../mod/lostpass.php:27
+msgid "Password reset request issued. Check your email."
+msgstr ""
+
 #: ../../mod/lostpass.php:38
 #, php-format
 msgid "Password reset requested at %s"
 msgstr ""
 
+#: ../../mod/lostpass.php:56
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
+
+#: ../../mod/lostpass.php:100
+msgid "Forgot your Password?"
+msgstr ""
+
+#: ../../mod/lostpass.php:101
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr ""
+
+#: ../../mod/lostpass.php:102
+msgid "Nickname or Email: "
+msgstr ""
+
+#: ../../mod/lostpass.php:103
+msgid "Reset"
+msgstr ""
+
 #: ../../mod/settings.php:38
 msgid "Passwords do not match. Password unchanged."
 msgstr ""

util/strings.php

@@ -71,6 +71,24 @@ $a->strings['%d Contact'] = array(
 	0 => '%d Contact',
 	1 => '%d Contacts',
 );
+$a->strings['Profile not found.'] = 'Profile not found.';
+$a->strings['Contact not found.'] = 'Contact not found.';
+$a->strings['Response from remote site was not understood.'] = 'Response from remote site was not understood.';
+$a->strings['Unexpected response from remote site: '] = 'Unexpected response from remote site: ';
+$a->strings["Confirmation completed successfully."] = "Confirmation completed successfully.";
+$a->strings['Remote site reported: '] = 'Remote site reported: ';
+$a->strings["Temporary failure. Please wait and try again."] = "Temporary failure. Please wait and try again.";
+$a->strings["Introduction failed or was revoked."] = "Introduction failed or was revoked.";
+$a->strings['Unable to set contact photo.'] = 'Unable to set contact photo.';
+$a->strings['is now friends with'] = 'is now friends with';
+$a->strings['Our site encryption key is apparently messed up.'] = 'Our site encryption key is apparently messed up.';
+$a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Empty site URL was provided or URL could not be decrypted by us.';
+$a->strings['Contact record was not found for you on our site.'] = 'Contact record was not found for you on our site.';
+$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'The ID provided by your system is a duplicate on our system. It should work if you try again.';
+$a->strings['Unable to set your contact credentials on our system.'] = 'Unable to set your contact credentials on our system.';
+$a->strings['Unable to update your contact profile details on our system'] = 'Unable to update your contact profile details on our system';
+$a->strings["Connection accepted at %s"] = "Connection accepted at %s";
+$a->strings['Administrator'] = 'Administrator';
 $a->strings['Applications'] = 'Applications';
 $a->strings["Invite Friends"] = "Invite Friends";
 $a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests';
@@ -90,7 +108,6 @@ $a->strings['Contact has been ignored'] = 'Contact has been ignored';
 $a->strings['Contact has been unignored'] = 'Contact has been unignored';
 $a->strings['stopped following'] = 'stopped following';
 $a->strings['Contact has been removed.'] = 'Contact has been removed.';
-$a->strings['Contact not found.'] = 'Contact not found.';
 $a->strings['Mutual Friendship'] = 'Mutual Friendship';
 $a->strings['is a fan of yours'] = 'is a fan of yours';
 $a->strings['you are a fan of'] = 'you are a fan of';
@@ -120,23 +137,6 @@ $a->strings['Finding: '] = 'Finding: ';
 $a->strings['Find'] = 'Find';
 $a->strings['Visit $username\'s profile'] = 'Visit $username\'s profile';
 $a->strings['Edit contact'] = 'Edit contact';
-$a->strings['Profile not found.'] = 'Profile not found.';
-$a->strings['Response from remote site was not understood.'] = 'Response from remote site was not understood.';
-$a->strings['Unexpected response from remote site: '] = 'Unexpected response from remote site: ';
-$a->strings["Confirmation completed successfully."] = "Confirmation completed successfully.";
-$a->strings['Remote site reported: '] = 'Remote site reported: ';
-$a->strings["Temporary failure. Please wait and try again."] = "Temporary failure. Please wait and try again.";
-$a->strings["Introduction failed or was revoked."] = "Introduction failed or was revoked.";
-$a->strings['Unable to set contact photo.'] = 'Unable to set contact photo.';
-$a->strings['is now friends with'] = 'is now friends with';
-$a->strings['Our site encryption key is apparently messed up.'] = 'Our site encryption key is apparently messed up.';
-$a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Empty site URL was provided or URL could not be decrypted by us.';
-$a->strings['Contact record was not found for you on our site.'] = 'Contact record was not found for you on our site.';
-$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'The ID provided by your system is a duplicate on our system. It should work if you try again.';
-$a->strings['Unable to set your contact credentials on our system.'] = 'Unable to set your contact credentials on our system.';
-$a->strings['Unable to update your contact profile details on our system'] = 'Unable to update your contact profile details on our system';
-$a->strings["Connection accepted at %s"] = "Connection accepted at %s";
-$a->strings['Administrator'] = 'Administrator';
 $a->strings['noreply'] = 'noreply';
 $a->strings["%s commented on an item at %s"] = "%s commented on an item at %s";
 $a->strings["This introduction has already been accepted."] = "This introduction has already been accepted.";
@@ -158,6 +158,9 @@ $a->strings['Disallowed profile URL.'] = 'Disallowed profile URL.';
 $a->strings['Your introduction has been sent.'] = 'Your introduction has been sent.';
 $a->strings["Please login to confirm introduction."] = "Please login to confirm introduction.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Incorrect identity currently logged in. Please login to <strong>this</strong> profile.";
+$a->strings['Welcome home %s.'] = 'Welcome home %s.';
+$a->strings['Please confirm your introduction/connection request to %s.'] = 'Please confirm your introduction/connection request to %s.';
+$a->strings['Confirm'] = 'Confirm';
 $a->strings['[Name Withheld]'] = '[Name Withheld]';
 $a->strings["Introduction received at "] = "Introduction received at ";
 $a->strings['Friend/Connection Request'] = 'Friend/Connection Request';
@@ -290,6 +293,13 @@ $a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s likes %2$s\'s %3$s';
 $a->strings['%1$s doesn\'t like %2$s\'s %3$s'] = '%1$s doesn\'t like %2$s\'s %3$s';
 $a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.';
 $a->strings['Visible to:'] = 'Visible to:';
+$a->strings['Password reset request issued. Check your email.'] = 'Password reset request issued. Check your email.';
+$a->strings['Password reset requested at %s'] = 'Password reset requested at %s';
+$a->strings["Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed."] = "Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.";
+$a->strings['Forgot your Password?'] = 'Forgot your Password?';
+$a->strings['Enter your email address and submit to have your password reset. Then check your email for further instructions.'] = 'Enter your email address and submit to have your password reset. Then check your email for further instructions.';
+$a->strings['Nickname or Email: '] = 'Nickname or Email: ';
+$a->strings['Reset'] = 'Reset';
 $a->strings["Welcome back %s"] = "Welcome back %s";
 $a->strings['Manage Identities and/or Pages'] = 'Manage Identities and/or Pages';
 $a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "\x28Toggle between different identities or community/group pages which share your account details.\x29";

view/de/dfrn_req_confirm.tpl

@@ -1,17 +0,0 @@
-
-<p id="dfrn-request-homecoming" >
-Willkommen zu Hause $username. 
-<br />
-Bitte bestätige deine Vorstellung bei $dfrn_url.
-
-</p>
-<form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> 
-<input type="hidden" name="dfrn_url" value="$dfrn_url" />
-<input type="hidden" name="confirm_key" value="$confirm_key" />
-<input type="hidden" name="localconfirm" value="1" />
-$aes_allow
-
-<div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="Confirm" />
-</div>
-</form>

view/de/lostpass.tpl

@@ -1,18 +0,0 @@
-<h3>Passwort vergessen?</h3>
-
-<p id="lostpass-desc">
-Trage deine EMail Adresse ein um ein neues Passwort anzufordern. Du wirst eine EMail mit weiteren Anweisungen erhalten.
-</p>
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">Spitzname oder EMail: </label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="Reset" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-

view/dfrn_req_confirm.tpl

@@ -1,8 +1,8 @@
 
 <p id="dfrn-request-homecoming" >
-Welcome home $username. 
+$welcome
 <br />
-Please confirm your introduction to $dfrn_url.
+$please
 
 </p>
 <form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> 
@@ -12,6 +12,6 @@ Please confirm your introduction to $dfrn_url.
 $aes_allow
 
 <div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="Confirm" />
+<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="$submit" />
 </div>
 </form>

view/fr/dfrn_req_confirm.tpl

@@ -1,17 +0,0 @@
-
-<p id="dfrn-request-homecoming" >
-Bienvenue chez vous, $username. 
-<br />
-Merci de confirmer votre volonté d'être présenté à $dfrn_url.
-
-</p>
-<form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> 
-<input type="hidden" name="dfrn_url" value="$dfrn_url" />
-<input type="hidden" name="confirm_key" value="$confirm_key" />
-<input type="hidden" name="localconfirm" value="1" />
-$aes_allow
-
-<div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="Je confirme" />
-</div>
-</form>

view/fr/lostpass.tpl

@@ -1,18 +0,0 @@
-<h3>Mot de passe oublié?</h3>
-
-<p id="lostpass-desc">
-Entrez votre adresse de courriel et demandez un nouveau mot de passe. Puis, vérifiez votre courriel pour de plus amples informations.
-</p>
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">Pseudo ou Courriel: </label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="Nouveau mot de passe" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-

view/it/dfrn_req_confirm.tpl

@@ -1,17 +0,0 @@
-
-<p id="dfrn-request-homecoming" >
-Bentornato a casa $username. 
-<br />
-Perfavore conferma la tua presentazione a $dfrn_url.
-
-</p>
-<form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> 
-<input type="hidden" name="dfrn_url" value="$dfrn_url" />
-<input type="hidden" name="confirm_key" value="$confirm_key" />
-<input type="hidden" name="localconfirm" value="1" />
-$aes_allow
-
-<div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="Conferma" />
-</div>
-</form>

view/it/lostpass.tpl

@@ -1,18 +0,0 @@
-<h3>Dimenticato la tua Password?</h3>
-
-<p id="lostpass-desc">
-Inserisci il tuo indirizzo email per resettare la tua password. Poi controlla la tua email per ulteriori informazioni.
-</p>
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">Soprannome o Email: </label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="Resetta" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-

view/lostpass.tpl

@@ -1,17 +1,17 @@
-<h3>Forgot your Password?</h3>
+<h3>$title</h3>
 
 <p id="lostpass-desc">
-Enter your email address and submit to have your password reset. Then check your email for further instructions.
+$desc
 </p>
 
 <form action="lostpass" method="post" >
 <div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">Nickname or Email: </label>
+        <label for="login-name" id="label-login-name">$name</label>
         <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
 </div>
 <div id="login-extra-end"></div>
 <div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="Reset" />
+        <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" />
 </div>
 <div id="login-submit-end"></div>
 </form>

view/sv/dfrn_req_confirm.tpl

@@ -1,16 +0,0 @@
-<p id="dfrn-request-homecoming" >
-V&auml;lkommen hem, $username. 
-<br />
-H&auml;r kan du bekr&auml;fta kontaktf&ouml;rfr&aring;gan till $dfrn_url.
-
-</p>
-<form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> 
-<input type="hidden" name="dfrn_url" value="$dfrn_url" />
-<input type="hidden" name="confirm_key" value="$confirm_key" />
-<input type="hidden" name="localconfirm" value="1" />
-$aes_allow
-
-<div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="Bekr&auml;fta" />
-</div>
-</form>

view/sv/lostpass.tpl

@@ -1,17 +0,0 @@
-<h3>Har du gl&ouml;mt l&ouml;senordet?</h3>
-
-<p id="lostpass-desc">
-Skriv in och skicka din e-postadress f&ouml;r att &aring;terst&auml;lla l&ouml;senordet. Kolla sedan din e-post f&ouml;r vidare instruktioner.
-</p>
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">Anv&auml;ndarnamn eller e-postadress: </label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="Skicka" />
-</div>
-<div id="login-submit-end"></div>
-</form>