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

1 files changed, 99 insertions, 34 deletions

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 ""