10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-11 18:56:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

- fixed date time internalization;

Browse Source
This commit is contained in:
nikitozzzzzzz
2018-11-07 00:17:04 +02:00
parent 151e6464f1
commit a9a50e619c
4 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-date-time.php
+20 -20
View File
@@ -36,10 +36,10 @@ if ( ! class_exists( 'um\core\Date_Time' ) ) {
/**
* Show a cool time difference between 2 timestamps
*
* @param $from
* @param string $to
* @param int $from
* @param int $to
*
* @return mixed|void
* @return string
*/
function time_diff( $from, $to = '' ) {
$since = '';
@@ -51,52 +51,52 @@ if ( ! class_exists( 'um\core\Date_Time' ) ) {
$diff = (int) abs( $to - $from );
if ( $diff < 60 ) {
$since = __('just now','ultimate-member');
$since = __( 'just now', 'ultimate-member' );
} elseif ( $diff < HOUR_IN_SECONDS ) {
$mins = round( $diff / MINUTE_IN_SECONDS );
if ( $mins <= 1 )
if ( $mins <= 1 ) {
$mins = 1;
if ( $mins == 1 ) {
$since = sprintf( __('%s min','ultimate-member'), $mins );
} else {
$since = sprintf( __('%s mins','ultimate-member'), $mins );
}
$since = _n( '%s min', '%s mins', $mins, 'ultimate-member' );
} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
$hours = round( $diff / HOUR_IN_SECONDS );
if ( $hours <= 1 )
if ( $hours <= 1 ) {
$hours = 1;
if ( $hours == 1 ) {
$since = sprintf( __('%s hr','ultimate-member'), $hours );
} else {
$since = sprintf( __('%s hrs','ultimate-member'), $hours );
}
$since = _n( '%s hr', '%s hrs', $hours, 'ultimate-member' );
} elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
$days = round( $diff / DAY_IN_SECONDS );
if ( $days <= 1 )
if ( $days <= 1 ) {
$days = 1;
}
if ( $days == 1 ) {
$since = sprintf( __('Yesterday at %s','ultimate-member'), date('g:ia', $from ) );
$since = sprintf( __( 'Yesterday at %s', 'ultimate-member' ), date_i18n( 'g:ia', $from ) );
} else {
$since = sprintf(__('%s at %s','ultimate-member'), date('F d', $from ), date('g:ia', $from ) );
$since = sprintf( __( '%s at %s', 'ultimate-member' ), date_i18n( 'F d', $from ), date_i18n( 'g:ia', $from ) );
}
} elseif ( $diff < 30 * DAY_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
$since = sprintf(__('%s at %s','ultimate-member'), date('F d', $from ), date('g:ia', $from ) );
$since = sprintf( __( '%s at %s', 'ultimate-member' ), date_i18n( 'F d', $from ), date_i18n( 'g:ia', $from ) );
} elseif ( $diff < YEAR_IN_SECONDS && $diff >= 30 * DAY_IN_SECONDS ) {
$since = sprintf(__('%s at %s','ultimate-member'), date('F d', $from ), date('g:ia', $from ) );
$since = sprintf( __( '%s at %s','ultimate-member'), date_i18n( 'F d', $from ), date_i18n( 'g:ia', $from ) );
} elseif ( $diff >= YEAR_IN_SECONDS ) {
$since = sprintf(__('%s at %s','ultimate-member'), date( 'F d, Y', $from ), date('g:ia', $from ) );
$since = sprintf( __( '%s at %s', 'ultimate-member' ), date_i18n( 'F d, Y', $from ), date_i18n( 'g:ia', $from ) );
}
includes/core/um-filters-fields.php
+2 -1
View File
@@ -130,7 +130,8 @@ add_filter( 'um_profile_field_filter_hook__user_registered', 'um_profile_field_f
* @return string
*/
function um_profile_field_filter_hook__last_login( $value, $data ) {
$value = sprintf( __('Last login: %s','ultimate-member'), um_user_last_login( um_user('ID') ) );
//$value = sprintf( __('Last login: %s','ultimate-member'), um_user_last_login( um_user('ID') ) );
$value = um_user_last_login( um_user( 'ID' ) );
return $value;
}
add_filter( 'um_profile_field_filter_hook__last_login', 'um_profile_field_filter_hook__last_login', 99, 2 );
includes/um-deprecated-functions.php
+18
View File
@@ -399,4 +399,22 @@ function um_requesting_password_change() {
}
return false;
}
/**
* Get core page url
*
* @deprecated 2.0.30
*
* @param $time1
* @param $time2
*
* @return string
*/
function um_time_diff( $time1, $time2 ) {
//um_deprecated_function( 'um_time_diff', '2.0.30', 'UM()->datetime()->time_diff' );
return UM()->datetime()->time_diff( $time1, $time2 );
}
includes/um-short-functions.php
+3 -22
View File
@@ -835,19 +835,6 @@ function um_is_temp_file( $filename ) {
}
/**
* Get core page url
*
* @param $time1
* @param $time2
*
* @return mixed|void
*/
function um_time_diff( $time1, $time2 ) {
return UM()->datetime()->time_diff( $time1, $time2 );
}
/**
* Get user's last login timestamp
*
@@ -867,19 +854,13 @@ function um_user_last_login_timestamp( $user_id ) {
/**
* Get user's last login (time diff)
*
* @param $user_id
* @param int $user_id
*
* @return mixed|string|void
* @return string
*/
function um_user_last_login( $user_id ) {
$value = get_user_meta( $user_id, '_um_last_login', true );
if ( $value ) {
$value = um_time_diff( $value, current_time( 'timestamp' ) );
} else {
$value = '';
}
return $value;
return ! empty( $value ) ? UM()->datetime()->time_diff( $value, current_time( 'timestamp' ) ) : '';
}