clean uo

joomla · Nov 19, 2016 · 58d5c55 · 58d5c55
1 parent de79fa2
commit 58d5c55
Show file tree

Hide file tree

Showing 7 changed files with 226 additions and 395 deletions.
diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini
@@ -420,6 +420,7 @@ JLIB_HTML_BATCH_USER_LABEL_DESC="Not making a selection will keep the original u
 JLIB_HTML_BATCH_USER_NOCHANGE="- Keep original User -"
 JLIB_HTML_BATCH_USER_NOUSER="No User."
 JLIB_HTML_BEHAVIOR_ABOUT_THE_CALENDAR="About the Calendar"
+JLIB_HTML_BEHAVIOR_CALENDAR_TYPE="gregorian"
 JLIB_HTML_BEHAVIOR_CLOSE="Close"
 JLIB_HTML_BEHAVIOR_DATE_SELECTION="Date selection:\n"
 JLIB_HTML_BEHAVIOR_DISPLAY_S_FIRST="Display %s first"

diff --git a/administrator/templates/isis/html/layouts/joomla/form/field/calendar.php b/administrator/templates/isis/html/layouts/joomla/form/field/calendar.php
@@ -199,6 +199,7 @@
 			data-time="<?php echo JText::_('JLIB_HTML_BEHAVIOR_TIME'); ?>"
 			data-time_am="<?php echo JText::_('JLIB_HTML_BEHAVIOR_TIME_AM'); ?>"
 			data-time_pm="<?php echo JText::_('JLIB_HTML_BEHAVIOR_TIME_PM'); ?>"
+			data-cal-type="<?php echo JText::_('JLIB_HTML_BEHAVIOR_CALENDAR_TYPE'); ?>"
 		><span class="icon-calendar"></span></button>
 	</div>
 </div>

diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini
@@ -420,6 +420,7 @@ JLIB_HTML_BATCH_USER_LABEL_DESC="Not making a selection will keep the original u
 JLIB_HTML_BATCH_USER_NOCHANGE="- Keep original User -"
 JLIB_HTML_BATCH_USER_NOUSER="No User."
 JLIB_HTML_BEHAVIOR_ABOUT_THE_CALENDAR="About the Calendar"
+JLIB_HTML_BEHAVIOR_CALENDAR_TYPE="gregorian"
 JLIB_HTML_BEHAVIOR_CLOSE="Close"
 JLIB_HTML_BEHAVIOR_DATE_SELECTION="Date selection:\n"
 JLIB_HTML_BEHAVIOR_DISPLAY_S_FIRST="Display %s first"

diff --git a/layouts/joomla/form/field/calendar.php b/layouts/joomla/form/field/calendar.php
@@ -200,6 +200,7 @@
 				data-time="<?php echo JText::_('JLIB_HTML_BEHAVIOR_TIME'); ?>"
 				data-time_am="<?php echo JText::_('JLIB_HTML_BEHAVIOR_TIME_AM'); ?>"
 				data-time_pm="<?php echo JText::_('JLIB_HTML_BEHAVIOR_TIME_PM'); ?>"
+				data-cal-type="<?php echo JText::_('JLIB_HTML_BEHAVIOR_CALENDAR_TYPE'); ?>"
 			><span class="icon-calendar"></span></button>
 		</div>
 	</div>