diff --git a/security/Member.php b/security/Member.php
index 1d12e3de5..1bd8fd6b3 100755
--- a/security/Member.php
+++ b/security/Member.php
@@ -1887,23 +1887,24 @@ class Member_DatetimeOptionsetField extends OptionsetField {
* @todo Put this text into a template?
*/
function getFormattingHelpText() {
- return '
-- YYYY = four-digit year
-- YY = two-digit year
-- MMMM = full name of month (e.g. June)
-- MMM = shortened name of month (e.g. Jun)
-- MM = two-digit month (01=January, etc.)
-- M = day of month without leading zero
-- dd = two-digit day of month (01 through 31)
-- d = day of month without leading zero
-- hh = two digits of hour (00 through 23)
-- h = hour without leading zero
-- mm = two digits of minute (00 through 59)
-- m = minute without leading zero
-- ss = two digits of second (00 through 59)
-- s = one or more digits representing a decimal fraction of a second
-- a = AM or PM
-
';
+ $output = '';
+ $output .= '- YYYY = ' . _t('MemberDatetimeOptionsetField.FOURDIGITYEAR', 'Four-digit year', 40, 'Help text describing what "YYYY" means in ISO date formatting') . '
';
+ $output .= '- YY = ' . _t('MemberDatetimeOptionsetField.TWODIGITYEAR', 'Two-digit year', 40, 'Help text describing what "YY" means in ISO date formatting') . '
';
+ $output .= '- MMMM = ' . _t('MemberDatetimeOptionsetField.FULLNAMEMONTH', 'Full name of month (e.g. June)', 40, 'Help text describing what "MMMM" means in ISO date formatting') . '
';
+ $output .= '- MMM = ' . _t('MemberDatetimeOptionsetField.SHORTMONTH', 'Short name of month (e.g. Jun)', 40, 'Help text letting describing what "MMM" means in ISO date formatting') . '
';
+ $output .= '- MM = ' . _t('MemberDatetimeOptionsetField.TWODIGITMONTH', 'Two-digit month (01=January, etc.)', 40, 'Help text describing what "MM" means in ISO date formatting') . '
';
+ $output .= '- M = ' . _t('MemberDatetimeOptionsetField.MONTHNOLEADING', 'Month digit without leading zero', 40, 'Help text describing what "M" means in ISO date formatting') . '
';
+ $output .= '- dd = ' . _t('MemberDatetimeOptionsetField.TWODIGITDAY', 'Two-digit day of month', 40, 'Help text describing what "dd" means in ISO date formatting') . '
';
+ $output .= '- d = ' . _t('MemberDatetimeOptionsetField.DAYNOLEADING', 'Day of month without leading zero', 40, 'Help text describing what "d" means in ISO date formatting') . '
';
+ $output .= '- hh = ' . _t('MemberDatetimeOptionsetField.TWODIGITHOUR', 'Two digits of hour (00 through 23)', 40, 'Help text describing what "hh" means in ISO date formatting') . '
';
+ $output .= '- h = ' . _t('MemberDatetimeOptionsetField.HOURNOLEADING', 'Hour without leading zero', 40, 'Help text describing what "h" means in ISO date formatting') . '
';
+ $output .= '- mm = ' . _t('MemberDatetimeOptionsetField.TWODIGITMINUTE', 'Two digits of minute (00 through 59)', 40, 'Help text describing what "mm" means in ISO date formatting') . '
';
+ $output .= '- m = ' . _t('MemberDatetimeOptionsetField.MINUTENOLEADING', 'Minute without leading zero', 40, 'Help text describing what "m" means in ISO date formatting') . '
';
+ $output .= '- ss = ' . _t('MemberDatetimeOptionsetField.TWODIGITSECOND', 'Two digits of second (00 through 59)', 40, 'Help text describing what "ss" means in ISO date formatting') . '
';
+ $output .= '- s = ' . _t('MemberDatetimeOptionsetField.DIGITSDECFRACTIONSECOND', 'One or more digits representing a decimal fraction of a second', 40, 'Help text describing what "s" means in ISO date formatting') . '
';
+ $output .= '- a = ' . _t('MemberDatetimeOptionsetField.AMORPM', 'AM (Ante meridiem) or PM (Post meridiem)', 40, 'Help text describing what "a" means in ISO date formatting') . '
';
+ $output .= '
';
+ return $output;
}
function setValue($value) {
@@ -1928,7 +1929,7 @@ class Member_DatetimeOptionsetField extends OptionsetField {
return true;
} else {
if($validator) {
- $validator->validationError($this->name, _t('Member.DATEFORMATBAD',"Date format is invalid"), "validation", false);
+ $validator->validationError($this->name, _t('MemberDatetimeOptionsetField.DATEFORMATBAD',"Date format is invalid"), "validation", false);
}
return false;
}