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