Localise the format for the calendar formfield

joomla · Sep 20, 2016 · 7671410 · 7671410
1 parent 6641a7a
commit 7671410
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 7 deletions.
diff --git a/administrator/components/com_content/models/forms/article.xml b/administrator/components/com_content/models/forms/article.xml
@@ -66,8 +66,11 @@
 			type="spacer" />
 
 		<field name="created" type="calendar" label="COM_CONTENT_FIELD_CREATED_LABEL"
-			description="COM_CONTENT_FIELD_CREATED_DESC" size="22"
-			format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
+			description="COM_CONTENT_FIELD_CREATED_DESC"
+			translateformat="true"
+			showtime="true"
+			size="22"
+			filter="user_utc" />
 
 		<field name="created_by" type="user"
 			label="COM_CONTENT_FIELD_CREATED_BY_LABEL" description="COM_CONTENT_FIELD_CREATED_BY_DESC" />
@@ -78,7 +81,11 @@
 
 		<field name="modified" type="calendar" class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
-			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
+			translateformat="true"
+			showtime="true"
+			size="22"
+			readonly="true"
+			filter="user_utc" />
 
 		<field name="modified_by" type="user"
 		label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
@@ -93,12 +100,16 @@
 
 		<field name="publish_up" type="calendar"
 			label="COM_CONTENT_FIELD_PUBLISH_UP_LABEL" description="COM_CONTENT_FIELD_PUBLISH_UP_DESC"
-			format="%Y-%m-%d %H:%M:%S" size="22"
+			translateformat="true"
+			showtime="true"
+			size="22"
 			filter="user_utc" />
 
 		<field name="publish_down" type="calendar"
 			label="COM_CONTENT_FIELD_PUBLISH_DOWN_LABEL" description="COM_CONTENT_FIELD_PUBLISH_DOWN_DESC"
-			format="%Y-%m-%d %H:%M:%S" size="22"
+			translateformat="true"
+			showtime="true"
+			size="22"
 			filter="user_utc" />
 
 		<field name="version" type="text" class="readonly"

diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
@@ -921,6 +921,8 @@ DATE_FORMAT_LC3="d F Y"
 DATE_FORMAT_LC4="Y-m-d"
 DATE_FORMAT_LC5="Y-m-d H:i"
 DATE_FORMAT_JS1="y-m-d"
+DATE_FORMAT_CALENDAR_DATE="%Y-%m-%d"
+DATE_FORMAT_CALENDAR_DATETIME="%Y-%m-%d %H:%M:%S"
 
 ; Months
 

diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini
@@ -300,6 +300,8 @@ DATE_FORMAT_LC3="d F Y"
 DATE_FORMAT_LC4="Y-m-d"
 DATE_FORMAT_LC5="Y-m-d H:i"
 DATE_FORMAT_JS1="y-m-d"
+DATE_FORMAT_CALENDAR_DATE="%Y-%m-%d"
+DATE_FORMAT_CALENDAR_DATETIME="%Y-%m-%d %H:%M:%S"
 
 ; Months
 

diff --git a/libraries/joomla/form/fields/calendar.php b/libraries/joomla/form/fields/calendar.php
@@ -140,7 +140,25 @@ protected function getInput()
 		$hint = $this->translateHint ? JText::_($this->hint) : $this->hint;
 
 		// Initialize some field attributes.
-		$format = $this->format;
+		$translateFormat = (string) $this->element['translateformat'];
+
+		if ($translateFormat && $translateFormat != 'false')
+		{
+			$showTime = (string) $this->element['showtime'];
+
+			if ($showTime && $showTime != 'false')
+			{
+				$format = JText::_('DATE_FORMAT_CALENDAR_DATETIME');
+			}
+			else
+			{
+				$format = JText::_('DATE_FORMAT_CALENDAR_DATE');
+			}
+		}
+		else
+		{
+			$format = $this->format;
+		}
 
 		// Build the attributes array.
 		$attributes = array();

diff --git a/plugins/user/profile/profiles/profile.xml b/plugins/user/profile/profiles/profile.xml
@@ -110,7 +110,8 @@
 				label="PLG_USER_PROFILE_FIELD_DOB_LABEL"
 				description="PLG_USER_PROFILE_FIELD_DOB_DESC"
 				info="PLG_USER_PROFILE_SPACER_DOB"
-				format="%Y-%m-%d"
+				translateformat="true"
+				showtime="false"
 				filter="server_utc"
 			/>