From 4043ede08052846fd02751519b1568d6b8987bfd Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 6 Apr 2011 23:03:54 -0700 Subject: [PATCH] more templates --- mod/dfrn_request.php | 4 +- mod/lostpass.php | 13 +++-- util/messages.po | 78 +++++++++++++++++++++++------- util/strings.php | 46 +++++++++++------- view/de/dfrn_req_confirm.tpl | 17 ------- view/de/lostpass.tpl | 18 ------- view/{en => }/dfrn_req_confirm.tpl | 6 +-- view/fr/dfrn_req_confirm.tpl | 17 ------- view/fr/lostpass.tpl | 18 ------- view/it/dfrn_req_confirm.tpl | 17 ------- view/it/lostpass.tpl | 18 ------- view/{en => }/lostpass.tpl | 8 +-- view/sv/dfrn_req_confirm.tpl | 16 ------ view/sv/lostpass.tpl | 17 ------- 14 files changed, 107 insertions(+), 186 deletions(-) delete mode 100644 view/de/dfrn_req_confirm.tpl delete mode 100644 view/de/lostpass.tpl rename view/{en => }/dfrn_req_confirm.tpl (80%) delete mode 100644 view/fr/dfrn_req_confirm.tpl delete mode 100644 view/fr/lostpass.tpl delete mode 100644 view/it/dfrn_req_confirm.tpl delete mode 100644 view/it/lostpass.tpl rename view/{en => }/lostpass.tpl (60%) delete mode 100644 view/sv/dfrn_req_confirm.tpl delete mode 100644 view/sv/lostpass.tpl diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 3cd8473cf3..11b7438a78 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -500,7 +500,9 @@ function dfrn_request_content(&$a) { '$dfrn_url' => $dfrn_url, '$aes_allow' => (($aes_allow) ? '' : "" ), '$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'] diff --git a/mod/lostpass.php b/mod/lostpass.php index 3dcf41be73..335a1f5127 100644 --- a/mod/lostpass.php +++ b/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; } diff --git a/util/messages.po b/util/messages.po index e88f79f531..88e1fcd01c 100644 --- a/util/messages.po +++ b/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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/util/strings.php b/util/strings.php index fcdd6974ba..a40f367012 100644 --- a/util/strings.php +++ b/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 this profile."] = "Incorrect identity currently logged in. Please login to this 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"; diff --git a/view/de/dfrn_req_confirm.tpl b/view/de/dfrn_req_confirm.tpl deleted file mode 100644 index 88d05b49a8..0000000000 --- a/view/de/dfrn_req_confirm.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -

-Willkommen zu Hause $username. -
-Bitte bestätige deine Vorstellung bei $dfrn_url. - -

-
- - - -$aes_allow - -
- -
-
diff --git a/view/de/lostpass.tpl b/view/de/lostpass.tpl deleted file mode 100644 index 1a75447c4c..0000000000 --- a/view/de/lostpass.tpl +++ /dev/null @@ -1,18 +0,0 @@ -

Passwort vergessen?

- -

-Trage deine EMail Adresse ein um ein neues Passwort anzufordern. Du wirst eine EMail mit weiteren Anweisungen erhalten. -

- -
-
- - -
-
-
- -
-
-
- diff --git a/view/en/dfrn_req_confirm.tpl b/view/dfrn_req_confirm.tpl similarity index 80% rename from view/en/dfrn_req_confirm.tpl rename to view/dfrn_req_confirm.tpl index f053f22af2..58e9233aa7 100644 --- a/view/en/dfrn_req_confirm.tpl +++ b/view/dfrn_req_confirm.tpl @@ -1,8 +1,8 @@

-Welcome home $username. +$welcome
-Please confirm your introduction to $dfrn_url. +$please

@@ -12,6 +12,6 @@ Please confirm your introduction to $dfrn_url. $aes_allow
- +
\ No newline at end of file diff --git a/view/fr/dfrn_req_confirm.tpl b/view/fr/dfrn_req_confirm.tpl deleted file mode 100644 index 82c31ca701..0000000000 --- a/view/fr/dfrn_req_confirm.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -

-Bienvenue chez vous, $username. -
-Merci de confirmer votre volonté d'être présenté à $dfrn_url. - -

-
- - - -$aes_allow - -
- -
-
diff --git a/view/fr/lostpass.tpl b/view/fr/lostpass.tpl deleted file mode 100644 index 245b024845..0000000000 --- a/view/fr/lostpass.tpl +++ /dev/null @@ -1,18 +0,0 @@ -

Mot de passe oublié?

- -

-Entrez votre adresse de courriel et demandez un nouveau mot de passe. Puis, vérifiez votre courriel pour de plus amples informations. -

- -
-
- - -
-
-
- -
-
-
- diff --git a/view/it/dfrn_req_confirm.tpl b/view/it/dfrn_req_confirm.tpl deleted file mode 100644 index 1496ecf59d..0000000000 --- a/view/it/dfrn_req_confirm.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -

-Bentornato a casa $username. -
-Perfavore conferma la tua presentazione a $dfrn_url. - -

-
- - - -$aes_allow - -
- -
-
diff --git a/view/it/lostpass.tpl b/view/it/lostpass.tpl deleted file mode 100644 index 5611d51b79..0000000000 --- a/view/it/lostpass.tpl +++ /dev/null @@ -1,18 +0,0 @@ -

Dimenticato la tua Password?

- -

-Inserisci il tuo indirizzo email per resettare la tua password. Poi controlla la tua email per ulteriori informazioni. -

- -
-
- - -
-
-
- -
-
-
- diff --git a/view/en/lostpass.tpl b/view/lostpass.tpl similarity index 60% rename from view/en/lostpass.tpl rename to view/lostpass.tpl index a7040c1493..cd3644157a 100644 --- a/view/en/lostpass.tpl +++ b/view/lostpass.tpl @@ -1,17 +1,17 @@ -

Forgot your Password?

+

$title

-Enter your email address and submit to have your password reset. Then check your email for further instructions. +$desc

- +
- +
diff --git a/view/sv/dfrn_req_confirm.tpl b/view/sv/dfrn_req_confirm.tpl deleted file mode 100644 index 7f8c977ce3..0000000000 --- a/view/sv/dfrn_req_confirm.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

-Välkommen hem, $username. -
-Här kan du bekräfta kontaktförfrågan till $dfrn_url. - -

-
- - - -$aes_allow - -
- -
-
\ No newline at end of file diff --git a/view/sv/lostpass.tpl b/view/sv/lostpass.tpl deleted file mode 100644 index 9294fb2613..0000000000 --- a/view/sv/lostpass.tpl +++ /dev/null @@ -1,17 +0,0 @@ -

Har du glömt lösenordet?

- -

-Skriv in och skicka din e-postadress för att återställa lösenordet. Kolla sedan din e-post för vidare instruktioner. -

- -
-
- - -
-
-
- -
-
-