Merge branch 'master' of https://github.com/yivi/CMB2 into yivy-master

aijazsiddique · Apr 15, 2015 · 5249429 · 5249429
2 parents cafdea4 + 5ca991f
commit 5249429
Show file tree

Hide file tree

Showing 3 changed files with 209 additions and 156 deletions.
diff --git a/includes/CMB2_hookup.php b/includes/CMB2_hookup.php
@@ -163,7 +163,7 @@ public static function register_scripts() {
 				'date_picker'  => array(
 					'changeMonth'     => true,
 					'changeYear'      => true,
-					'dateFormat'      => __( 'mm/dd/yy', 'cmb2' ),
+					'dateFormat'      => _x( 'mm/dd/yy', 'Valid formatDate string for jquery-ui datepicker','cmb2' ),
 					'dayNames'        => explode( ',', __( 'Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday', 'cmb2' ) ),
 					'dayNamesMin'     => explode( ',', __( 'Su, Mo, Tu, We, Th, Fr, Sa', 'cmb2' ) ),
 					'dayNamesShort'   => explode( ',', __( 'Sun, Mon, Tue, Wed, Thu, Fri, Sat', 'cmb2' ) ),
@@ -183,7 +183,7 @@ public static function register_scripts() {
 					'secondText'    => __( 'Second', 'cmb2' ),
 					'currentText'   => __( 'Now', 'cmb2' ),
 					'closeText'     => __( 'Done', 'cmb2' ),
-					'timeFormat'    => __( 'hh:mm TT', 'cmb2' ),
+					'timeFormat'    => _x( 'hh:mm TT', 'Valid formatting string, as per http://trentrichardson.com/examples/timepicker/', 'cmb2' ),
 					'controlType'   => 'select',
 					'stepMinute'    => 5,
 				),

diff --git a/languages/cmb2-es_ES.mo b/languages/cmb2-es_ES.mo