Switch to View::Email::Template for emails

Complete password reset by admin, and localise in user's preferredLanguage
Localise all /user content
Require re-entry of current password on password change
Clean up debugging

3 files changed, 346 insertions, 119 deletions

diff --git a/lib/CatDap/I18N/af.po b/lib/CatDap/I18N/af.po
index 7181fbe..f1c4fcf 100644
--- a/lib/CatDap/I18N/af.po
+++ b/lib/CatDap/I18N/af.po
@@ -1,36 +1,77 @@
-#: lib/CatDap/Controller/register.pm:51
+#: lib/CatDap/Controller/register.pm:119
+msgid "Activation"
+msgstr "Aktivering"
+
+#: root/user/index.tt:28 root/user/index.tt:8
+msgid "Add"
+msgstr "Voeg by"
+
+#: lib/CatDap/Controller/register.pm:49
 msgid "Addresses do not match"
 msgstr "Die addresse verskil"
 
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:75
 msgid "An account already exists with this email address"
 msgstr "'n Rekening met hierde epos adres bestaan reeds"
 
-#: lib/CatDap/Controller/register.pm:76
+#: lib/CatDap/Controller/register.pm:80
 msgid "An account already exists with this username"
 msgstr "'n Rekening met hierdie gebruikersnaam bestaan reeds"
 
 #. ($errors)
-#: lib/CatDap/Controller/register.pm:120
+#: lib/CatDap/Controller/admin.pm:529
 msgid ""
 "An error occured sending the email, but your account was created. Please try "
 "the password recovery process f you entered the correct email address: %1"
 msgstr ""
 "Daar was 'n fout met die stuur van die aktiverings epos, maar jou rekening "
 "is geskep. Probeer die wagwoord herwinnings proses as die epos adres korrek "
-"was"
+"was: %1"
+
+#. ($errors)
+#: lib/CatDap/Controller/register.pm:131
+msgid ""
+"An error occured sending the email, but your account was created. Please try "
+"the password recovery process if you entered the correct email address. "
+"Errors %1"
+msgstr ""
+"Daar was 'n fout met die stuur van die aktiverings epos, maar jou rekening "
+"is geskep. Probeer die wagwoord herwinnings proses as die epos adres korrek "
+"was. Foute: %1"
+
+#: root/user/firstlogin.tt:14 root/user/password.tt:18
+msgid "Change"
+msgstr "Verander"
 
-#: root/register/complete.tt:16
-msgid "Check your mail for activation instructions"
-msgstr "Kyk jou epos vir aktiverings instruksies"
+#: root/user/fake.tt:2
+msgid "Change password"
+msgstr "Verander wagwoord"
+
+#: root/register/complete.tt:5
+msgid "Check your mail for activation instructions."
+msgstr "Kyk jou epos vir aktiverings instruksies."
 
 #: root/register/index.tt:34
 msgid "Confirm Email address"
 msgstr "Bevestig epos adres"
 
-#: lib/CatDap/Controller/register.pm:106
-msgid "Dear"
-msgstr "Liewe"
+#: root/user/password.tt:5
+msgid "Current password"
+msgstr "Huidige wagwoord"
+
+#. (cn)
+#. (entry.cn)
+#: root/email/activation.tt:1 root/email/admin/password.tt:1
+msgid "Dear %1,"
+msgstr "Liewe %1,"
+
+#: root/user/index.tt:9
+msgid "Delete"
+msgstr "Vee uit"
+
+#: root/user/fake.tt:1
+msgid "Edit"
+msgstr "Wysig"
 
 #: root/register/index.tt:30
 msgid "Email address"
@@ -40,51 +81,71 @@ msgstr "Epos adres"
 msgid "First name"
 msgstr "Voornaam"
 
-#: lib/CatDap/Controller/register.pm:54
+#: lib/CatDap/Controller/register.pm:52
 msgid "Incorrect validation text, please try again"
 msgstr "Inkorrekte teks van die prentjie, probeer weer"
 
-#: lib/CatDap/Controller/register.pm:48
+#: lib/CatDap/Controller/register.pm:46
 msgid "Invalid email address"
 msgstr "Ongeldige epos adres"
 
-#: lib/CatDap/Controller/register.pm:44
+#: lib/CatDap/Controller/register.pm:42
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: root/index.tt:28 root/index.tt:6
+#: root/template/header:12 root/user/fake.tt:3
+msgid "Log out"
+msgstr "Teken uit"
+
+#: root/index.tt:1 root/index.tt:17
 msgid "Login"
 msgstr "Teken in"
 
-#: lib/CatDap/Controller/register.pm:113
-msgid "Mageia Identity Activation"
-msgstr "Mageia Identiteit Aktivering"
+#: root/user/firstlogin.tt:5 root/user/password.tt:9
+msgid "New Password"
+msgstr "Nuwe Wagwoord"
+
+#: lib/CatDap/Controller/user.pm:273
+msgid "New passwords dont match"
+msgstr "Nuwe wagwoorde verskil"
 
-#: root/index.tt:22
+#: root/index.tt:11
 msgid "Password"
 msgstr "Wagwoord"
 
-#: root/index.tt:29 root/register/index.tt:43 root/register/index.tt:6
+#: lib/CatDap/Controller/user.pm:267
+msgid "Password incorrect"
+msgstr "Wagwoord inkorrek"
+
+#: lib/CatDap/Controller/admin.pm:532
+msgid "Password reset and email sent"
+msgstr "Wagwoord is herstel en epos gestuur"
+
+#: root/email/admin/password.tt:5
+msgid "Please click below to change your password"
+msgstr "Volg die skakel onder en verander jou wagwoord"
+
+#: root/index.tt:18 root/register/index.tt:43 root/register/index.tt:6
 msgid "Register"
 msgstr "Registreer"
 
-#: root/register/complete.tt:6
+#: root/register/complete.tt:1
 msgid "Registration completed"
 msgstr "Registrasie voltooi"
 
-#: root/register/complete.tt:15
+#: root/register/complete.tt:4
 msgid "Registration was successful."
-msgstr "Registrasie was suksesvol"
+msgstr "Registrasie was suksesvol."
+
+#: root/user/firstlogin.tt:9 root/user/password.tt:13
+msgid "Repeat New Password"
+msgstr "Herhaal Nuwe Wagwoord"
 
 #: root/register/index.tt:26
 msgid "Surname"
 msgstr "Van"
 
-#: lib/CatDap/Controller/register.pm:60
-msgid "The"
-msgstr "Die"
-
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:56
 msgid "The first name supplied contains illegal characters"
 msgstr "Die verskafte noemnaam sluit ongeldige karakters in"
 
@@ -92,28 +153,51 @@ msgstr "Die verskafte noemnaam sluit ongeldige karakters in"
 msgid "The surname supplied contains illegal characters"
 msgstr "Die verskafte van sluit ondeldige karakters in"
 
-#: lib/CatDap/Controller/register.pm:107
-msgid "To activate your account, please follow the link below.\n"
-msgstr "Om U rekening te aktiveer, volg asseblief die volgende skakel.\n"
+#: root/email/activation.tt:3
+msgid "To activate your account, please follow the link below."
+msgstr "Om U rekening te aktiveer, volg asseblief die volgende skakel."
+
+#: root/user/index.tt:13
+msgid "Update"
+msgstr "Opdateer"
 
-#: root/index.tt:18 root/register/index.tt:18
+#: root/index.tt:7 root/register/index.tt:18
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: lib/CatDap/Controller/register.pm:106
-msgid ""
-"Your Mageia indentity has been successfully created, but requires "
-"activation.\n"
-msgstr ""
+#. (c.config.organisation)
+#: root/email/activation.tt:2
+msgid "Your %1 account has been successfully created, but requires activation."
+msgstr "Jou %1 rekening is suksesvol geskep, maar aktivering is benodig"
 
-#: root/index.tt:28
+#. (c.user.username)
+#: root/email/admin/password.tt:3
+msgid "Your password was reset by %1"
+msgstr "Jou wagwoord is herstel deur %1"
+
+#: lib/CatDap/Controller/user.pm:61
+msgid "Your session has expired"
+msgstr "Jou sessie het verstrek"
+
+#: root/index.tt:17
 msgid "or"
 msgstr "of"
 
-#: lib/CatDap/Controller/register.pm:60
-msgid "supplied contains unprintable characters"
-msgstr "verskaf sluit in ongeldige karakters"
+#: lib/CatDap/Controller/admin.pm:516
+msgid "password reset"
+msgstr "Wagwoord herstelling"
 
-#: lib/CatDap/Controller/register.pm:60
-msgid "surname"
-msgstr "Van"
+#~ msgid "Repeat"
+#~ msgstr "Herhaal"
+
+#~ msgid "Mageia Identity Activation"
+#~ msgstr "Mageia Identiteit Aktivering"
+
+#~ msgid "The"
+#~ msgstr "Die"
+
+#~ msgid "supplied contains unprintable characters"
+#~ msgstr "verskaf sluit in ongeldige karakters"
+
+#~ msgid "surname"
+#~ msgstr "Van"
diff --git a/lib/CatDap/I18N/fr.po b/lib/CatDap/I18N/fr.po
index eff12d1..3f13b16 100644
--- a/lib/CatDap/I18N/fr.po
+++ b/lib/CatDap/I18N/fr.po
@@ -14,35 +14,77 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/CatDap/Controller/register.pm:51
+#: lib/CatDap/Controller/register.pm:119
+msgid "Activation"
+msgstr ""
+
+#: root/user/index.tt:28 root/user/index.tt:8
+msgid "Add"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:49
 msgid "Addresses do not match"
 msgstr "Les adresses ne correspondent pas"
 
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:75
 msgid "An account already exists with this email address"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:76
+#: lib/CatDap/Controller/register.pm:80
 msgid "An account already exists with this username"
 msgstr "Un compte existe déjà pour ce nom d'utilisateur"
 
 #. ($errors)
-#: lib/CatDap/Controller/register.pm:120
-msgid "An error occured sending the email, but your account was created. Please try the password recovery process f you entered the correct email address: %1"
+#: lib/CatDap/Controller/admin.pm:529
+msgid ""
+"An error occured sending the email, but your account was created. Please try "
+"the password recovery process f you entered the correct email address: %1"
 msgstr ""
 
-#: root/register/complete.tt:16
-msgid "Check your mail for activation instructions"
+#. ($errors)
+#: lib/CatDap/Controller/register.pm:131
+msgid ""
+"An error occured sending the email, but your account was created. Please try "
+"the password recovery process if you entered the correct email address. "
+"Errors %1"
+msgstr ""
+
+#: root/user/firstlogin.tt:14 root/user/password.tt:18
+msgid "Change"
+msgstr ""
+
+#: root/user/fake.tt:2
+#, fuzzy
+msgid "Change password"
+msgstr "Mot de passe"
+
+#: root/register/complete.tt:5
+msgid "Check your mail for activation instructions."
 msgstr ""
 
 #: root/register/index.tt:34
 msgid "Confirm Email address"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:106
-msgid "Dear"
+#: root/user/password.tt:5
+msgid "Current password"
+msgstr ""
+
+#. (cn)
+#. (entry.cn)
+#: root/email/activation.tt:1 root/email/admin/password.tt:1
+#, fuzzy
+msgid "Dear %1,"
 msgstr "Cher(e)"
 
+#: root/user/index.tt:9
+msgid "Delete"
+msgstr ""
+
+#: root/user/fake.tt:1
+msgid "Edit"
+msgstr ""
+
 #: root/register/index.tt:30
 msgid "Email address"
 msgstr "Adresse de messagerie"
@@ -51,54 +93,74 @@ msgstr "Adresse de messagerie"
 msgid "First name"
 msgstr "Prénom"
 
-#: lib/CatDap/Controller/register.pm:54
+#: lib/CatDap/Controller/register.pm:52
 msgid "Incorrect validation text, please try again"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:48
+#: lib/CatDap/Controller/register.pm:46
 msgid "Invalid email address"
 msgstr "Adresse mail invalide"
 
-#: lib/CatDap/Controller/register.pm:44
+#: lib/CatDap/Controller/register.pm:42
 msgid "Invalid username"
 msgstr "Nom d'utilisateur invalide"
 
-#: root/index.tt:33
-#: root/index.tt:6
+#: root/template/header:12 root/user/fake.tt:3
+msgid "Log out"
+msgstr ""
+
+#: root/index.tt:1 root/index.tt:17
 msgid "Login"
 msgstr "Login"
 
-#: lib/CatDap/Controller/register.pm:113
-msgid "Mageia Identity Activation"
-msgstr "Activation de l'identité Mageia"
+#: root/user/firstlogin.tt:5 root/user/password.tt:9
+#, fuzzy
+msgid "New Password"
+msgstr "Mot de passe"
+
+#: lib/CatDap/Controller/user.pm:273
+#, fuzzy
+msgid "New passwords dont match"
+msgstr "Les adresses ne correspondent pas"
 
-#: root/index.tt:27
+#: root/index.tt:11
 msgid "Password"
 msgstr "Mot de passe"
 
-#: root/index.tt:34
-#: root/register/index.tt:43
-#: root/register/index.tt:6
+#: lib/CatDap/Controller/user.pm:267
+#, fuzzy
+msgid "Password incorrect"
+msgstr "Mot de passe"
+
+#: lib/CatDap/Controller/admin.pm:532
+msgid "Password reset and email sent"
+msgstr ""
+
+#: root/email/admin/password.tt:5
+msgid "Please click below to change your password"
+msgstr ""
+
+#: root/index.tt:18 root/register/index.tt:43 root/register/index.tt:6
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: root/register/complete.tt:6
+#: root/register/complete.tt:1
 msgid "Registration completed"
 msgstr ""
 
-#: root/register/complete.tt:15
+#: root/register/complete.tt:4
 msgid "Registration was successful."
 msgstr ""
 
+#: root/user/firstlogin.tt:9 root/user/password.tt:13
+msgid "Repeat New Password"
+msgstr ""
+
 #: root/register/index.tt:26
 msgid "Surname"
 msgstr "Surnom"
 
-#: lib/CatDap/Controller/register.pm:60
-msgid "The"
-msgstr ""
-
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:56
 msgid "The first name supplied contains illegal characters"
 msgstr ""
 
@@ -106,28 +168,44 @@ msgstr ""
 msgid "The surname supplied contains illegal characters"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:107
-msgid "To activate your account, please follow the link below.\n"
+#: root/email/activation.tt:3
+#, fuzzy
+msgid "To activate your account, please follow the link below."
 msgstr "Pour activer votre compte, merci de suivre le lien ci dessous."
 
-#: root/index.tt:23
-#: root/register/index.tt:18
+#: root/user/index.tt:13
+msgid "Update"
+msgstr ""
+
+#: root/index.tt:7 root/register/index.tt:18
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: lib/CatDap/Controller/register.pm:106
-msgid "Your Mageia indentity has been successfully created, but requires activation.\n"
+#. (c.config.organisation)
+#: root/email/activation.tt:2
+msgid "Your %1 account has been successfully created, but requires activation."
+msgstr ""
+
+#. (c.user.username)
+#: root/email/admin/password.tt:3
+msgid "Your password was reset by %1"
+msgstr ""
+
+#: lib/CatDap/Controller/user.pm:61
+msgid "Your session has expired"
 msgstr ""
 
-#: root/index.tt:33
+#: root/index.tt:17
 msgid "or"
 msgstr "ou"
 
-#: lib/CatDap/Controller/register.pm:60
-msgid "supplied contains unprintable characters"
-msgstr ""
+#: lib/CatDap/Controller/admin.pm:516
+#, fuzzy
+msgid "password reset"
+msgstr "Mot de passe"
 
-#: lib/CatDap/Controller/register.pm:60
-msgid "surname"
-msgstr "surnom"
+#~ msgid "Mageia Identity Activation"
+#~ msgstr "Activation de l'identité Mageia"
 
+#~ msgid "surname"
+#~ msgstr "surnom"
diff --git a/lib/CatDap/I18N/messages.pot b/lib/CatDap/I18N/messages.pot
index d4bddea..c463fc2 100644
--- a/lib/CatDap/I18N/messages.pot
+++ b/lib/CatDap/I18N/messages.pot
@@ -15,33 +15,68 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/CatDap/Controller/register.pm:51
+#: lib/CatDap/Controller/register.pm:119
+msgid "Activation"
+msgstr ""
+
+#: root/user/index.tt:28 root/user/index.tt:8
+msgid "Add"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:49
 msgid "Addresses do not match"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:75
 msgid "An account already exists with this email address"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:76
+#: lib/CatDap/Controller/register.pm:80
 msgid "An account already exists with this username"
 msgstr ""
 
 #. ($errors)
-#: lib/CatDap/Controller/register.pm:120
+#: lib/CatDap/Controller/admin.pm:529
 msgid "An error occured sending the email, but your account was created. Please try the password recovery process f you entered the correct email address: %1"
 msgstr ""
 
-#: root/register/complete.tt:16
-msgid "Check your mail for activation instructions"
+#. ($errors)
+#: lib/CatDap/Controller/register.pm:131
+msgid "An error occured sending the email, but your account was created. Please try the password recovery process if you entered the correct email address. Errors %1"
+msgstr ""
+
+#: root/user/firstlogin.tt:14 root/user/password.tt:18
+msgid "Change"
+msgstr ""
+
+#: root/user/fake.tt:2
+msgid "Change password"
+msgstr ""
+
+#: root/register/complete.tt:5
+msgid "Check your mail for activation instructions."
 msgstr ""
 
 #: root/register/index.tt:34
 msgid "Confirm Email address"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:106
-msgid "Dear"
+#: root/user/password.tt:5
+msgid "Current password"
+msgstr ""
+
+#. (cn)
+#. (entry.cn)
+#: root/email/activation.tt:1 root/email/admin/password.tt:1
+msgid "Dear %1,"
+msgstr ""
+
+#: root/user/index.tt:9
+msgid "Delete"
+msgstr ""
+
+#: root/user/fake.tt:1
+msgid "Edit"
 msgstr ""
 
 #: root/register/index.tt:30
@@ -52,51 +87,71 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:54
+#: lib/CatDap/Controller/register.pm:52
 msgid "Incorrect validation text, please try again"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:48
+#: lib/CatDap/Controller/register.pm:46
 msgid "Invalid email address"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:44
+#: lib/CatDap/Controller/register.pm:42
 msgid "Invalid username"
 msgstr ""
 
-#: root/index.tt:28 root/index.tt:6
+#: root/template/header:12 root/user/fake.tt:3
+msgid "Log out"
+msgstr ""
+
+#: root/index.tt:1 root/index.tt:17
 msgid "Login"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:113
-msgid "Mageia Identity Activation"
+#: root/user/firstlogin.tt:5 root/user/password.tt:9
+msgid "New Password"
 msgstr ""
 
-#: root/index.tt:22
+#: lib/CatDap/Controller/user.pm:273
+msgid "New passwords dont match"
+msgstr ""
+
+#: root/index.tt:11
 msgid "Password"
 msgstr ""
 
-#: root/index.tt:29 root/register/index.tt:43 root/register/index.tt:6
+#: lib/CatDap/Controller/user.pm:267
+msgid "Password incorrect"
+msgstr ""
+
+#: lib/CatDap/Controller/admin.pm:532
+msgid "Password reset and email sent"
+msgstr ""
+
+#: root/email/admin/password.tt:5
+msgid "Please click below to change your password"
+msgstr ""
+
+#: root/index.tt:18 root/register/index.tt:43 root/register/index.tt:6
 msgid "Register"
 msgstr ""
 
-#: root/register/complete.tt:6
+#: root/register/complete.tt:1
 msgid "Registration completed"
 msgstr ""
 
-#: root/register/complete.tt:15
+#: root/register/complete.tt:4
 msgid "Registration was successful."
 msgstr ""
 
-#: root/register/index.tt:26
-msgid "Surname"
+#: root/user/firstlogin.tt:9 root/user/password.tt:13
+msgid "Repeat New Password"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:60
-msgid "The"
+#: root/register/index.tt:26
+msgid "Surname"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:56
 msgid "The first name supplied contains illegal characters"
 msgstr ""
 
@@ -104,26 +159,36 @@ msgstr ""
 msgid "The surname supplied contains illegal characters"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:107
-msgid "To activate your account, please follow the link below.\n"
+#: root/email/activation.tt:3
+msgid "To activate your account, please follow the link below."
+msgstr ""
+
+#: root/user/index.tt:13
+msgid "Update"
 msgstr ""
 
-#: root/index.tt:18 root/register/index.tt:18
+#: root/index.tt:7 root/register/index.tt:18
 msgid "Username"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:106
-msgid "Your Mageia indentity has been successfully created, but requires activation.\n"
+#. (c.config.organisation)
+#: root/email/activation.tt:2
+msgid "Your %1 account has been successfully created, but requires activation."
 msgstr ""
 
-#: root/index.tt:28
-msgid "or"
+#. (c.user.username)
+#: root/email/admin/password.tt:3
+msgid "Your password was reset by %1"
+msgstr ""
+
+#: lib/CatDap/Controller/user.pm:61
+msgid "Your session has expired"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:60
-msgid "supplied contains unprintable characters"
+#: root/index.tt:17
+msgid "or"
 msgstr ""
 
-#: lib/CatDap/Controller/register.pm:60
-msgid "surname"
+#: lib/CatDap/Controller/admin.pm:516
+msgid "password reset"
 msgstr ""