From 701da8b822a5c0226944d8e3064d2f9d8693076a Mon Sep 17 00:00:00 2001
From: Roland Lehmann <rlehmann@pixeltricks.de>
Date: Wed, 15 Aug 2012 20:30:30 +0200
Subject: [PATCH] Updated translations; i18n for fieldLabels

---
 lang/en.yml         | 2 ++
 security/Member.php | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lang/en.yml b/lang/en.yml
index ed2ff5d17..50fa74471 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -330,6 +330,7 @@ en:
     BUTTONLOSTPASSWORD: 'I''ve lost my password'
     CONFIRMNEWPASSWORD: 'Confirm New Password'
     CONFIRMPASSWORD: 'Confirm Password'
+    DATEFORMAT: 'Date format'
     DefaultAdminFirstname: 'Default Admin'
     DefaultDateTime: default
     EMAIL: Email
@@ -352,6 +353,7 @@ en:
     SUBJECTPASSWORDCHANGED: 'Your password has been changed'
     SUBJECTPASSWORDRESET: 'Your password reset link'
     SURNAME: Surname
+    TIMEFORMAT: 'Time format'
     VALIDATIONMEMBEREXISTS: 'A member already exists with the same %s'
     ValidationIdentifierFailed: 'Can''t overwrite existing member #{id} with identical identifier ({name} = {value}))'
     WELCOMEBACK: 'Welcome Back, {firstname}'
diff --git a/security/Member.php b/security/Member.php
index 4b6e624e7..363c0b3f3 100644
--- a/security/Member.php
+++ b/security/Member.php
@@ -1238,6 +1238,8 @@ class Member extends DataObject implements TemplateGlobalProvider {
 		$labels['PasswordExpiry'] = _t('Member.db_PasswordExpiry', 'Password Expiry Date', 'Password expiry date');
 		$labels['LockedOutUntil'] = _t('Member.db_LockedOutUntil', 'Locked out until', 'Security related date');
 		$labels['Locale'] = _t('Member.db_Locale', 'Interface Locale');
+		$labels['DateFormat'] = _t('Member.DATEFORMAT', 'Date format');
+		$labels['TimeFormat'] = _t('Member.TIMEFORMAT', 'Time format');
 		if($includerelations){
 			$labels['Groups'] = _t('Member.belongs_many_many_Groups', 'Groups', 'Security Groups this member belongs to');
 		}