Merge pull request #1249 from ultimatemember/fix/translators

Translators
This commit is contained in:
Mykyta Synelnikov
2023-07-13 14:01:38 +03:00
committed by GitHub
28 changed files with 287 additions and 109 deletions
+14 -5
View File
@@ -60,6 +60,7 @@ if ( ! class_exists( 'um\core\Date_Time' ) ) {
$mins = 1;
}
// translators: %s: min time.
$since = sprintf( _n( '%s min', '%s mins', $mins, 'ultimate-member' ), $mins );
} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
@@ -69,6 +70,7 @@ if ( ! class_exists( 'um\core\Date_Time' ) ) {
$hours = 1;
}
// translators: %s: hours.
$since = sprintf( _n( '%s hr', '%s hrs', $hours, 'ultimate-member' ), $hours );
} elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
@@ -79,22 +81,27 @@ if ( ! class_exists( 'um\core\Date_Time' ) ) {
}
if ( $days == 1 ) {
// translators: %s: time.
$since = sprintf( __( 'Yesterday at %s', 'ultimate-member' ), date_i18n( get_option( 'time_format' ), $from ) );
} else {
$since = sprintf( __( '%s at %s', 'ultimate-member' ), date_i18n( 'F d', $from ), date_i18n( get_option( 'time_format' ), $from ) );
// translators: %1$s is a date; %2$s is a time.
$since = sprintf( __( '%1$s at %2$s', 'ultimate-member' ), date_i18n( 'F d', $from ), date_i18n( get_option( 'time_format' ), $from ) );
}
} elseif ( $diff < 30 * DAY_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
$since = sprintf( __( '%s at %s', 'ultimate-member' ), date_i18n( 'F d', $from ), date_i18n( get_option( 'time_format' ), $from ) );
// translators: %1$s is a date; %2$s is a time.
$since = sprintf( __( '%1$s at %2$s', 'ultimate-member' ), date_i18n( 'F d', $from ), date_i18n( get_option( 'time_format' ), $from ) );
} elseif ( $diff < YEAR_IN_SECONDS && $diff >= 30 * DAY_IN_SECONDS ) {
$since = sprintf( __( '%s at %s','ultimate-member'), date_i18n( 'F d', $from ), date_i18n( get_option( 'time_format' ), $from ) );
// translators: %1$s is a date; %2$s is a time.
$since = sprintf( __( '%1$s at %2$s', 'ultimate-member' ), date_i18n( 'F d', $from ), date_i18n( get_option( 'time_format' ), $from ) );
} elseif ( $diff >= YEAR_IN_SECONDS ) {
$since = sprintf( __( '%s at %s', 'ultimate-member' ), date_i18n( get_option( 'date_format' ), $from ), date_i18n( get_option( 'time_format' ), $from ) );
// translators: %1$s is a date; %2$s is a time.
$since = sprintf( __( '%1$s at %2$s', 'ultimate-member' ), date_i18n( get_option( 'date_format' ), $from ), date_i18n( get_option( 'time_format' ), $from ) );
}
@@ -143,9 +150,11 @@ if ( ! class_exists( 'um\core\Date_Time' ) ) {
$age--;
}
if ( $age == 1 ) {
// translators: %s: age.
return sprintf( __( '%s year old', 'ultimate-member' ), $age );
}
if ( $age > 1 ) {
// translators: %s: age.
return sprintf( __( '%s years old', 'ultimate-member' ), $age );
}
if ( $age == 0 ) {
@@ -189,4 +198,4 @@ if ( ! class_exists( 'um\core\Date_Time' ) ) {
}
}
}
}
+4 -3
View File
@@ -2530,7 +2530,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$output .= $this->field_label( $label_confirm_pass, $key, $data );
} elseif ( isset( $data['label'] ) ) {
$data['label'] = __( $data['label'], 'ultimate-member' );
/* translators: 1: label, 2: key, 3: data. */
// translators: %s: label.
$output .= $this->field_label( sprintf( __( 'Confirm %s', 'ultimate-member' ), $data['label'] ), $key, $data );
}
@@ -2548,10 +2548,10 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
if ( ! empty( $data['label_confirm_pass'] ) ) {
$placeholder = __( $data['label_confirm_pass'], 'ultimate-member' );
} elseif ( ! empty( $placeholder ) && ! isset( $data['label'] ) ) {
/* translators: 1: placeholder. */
// translators: %s: placeholder.
$placeholder = sprintf( __( 'Confirm %s', 'ultimate-member' ), $placeholder );
} elseif ( isset( $data['label'] ) ) {
/* translators: 1: label. */
// translators: %s: label.
$placeholder = sprintf( __( 'Confirm %s', 'ultimate-member' ), $data['label'] );
}
@@ -4489,6 +4489,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
} else {
$edit_url = um_edit_profile_url();
}
// translators: %s: edit user link.
$output .= '<p class="um-profile-note">' . $emo . '<span>' . sprintf( __( 'Your profile is looking a little empty. Why not <a href="%s">add</a> some information!', 'ultimate-member' ), esc_url( $edit_url ) ) . '</span></p>';
} else {
$output .= '<p class="um-profile-note">' . $emo . '<span>' . __( 'This user has not added any information to their profile yet.', 'ultimate-member' ) . '</span></p>';
+3
View File
@@ -343,6 +343,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
}
if ( isset( $data['type'] ) && in_array( $data['type'], $this->sorting_supported_fields ) ) {
// translators: %s: title.
if ( isset( $data['title'] ) && array_search( sprintf( __( '%s DESC', 'ultimate-member' ), $data['title'] ), $this->sort_fields ) !== false ) {
$data['title'] = $data['title'] . ' (' . $key . ')';
}
@@ -352,7 +353,9 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
continue;
}
// translators: %s: title.
$this->sort_fields[ $key . '_desc' ] = sprintf( __( '%s DESC', 'ultimate-member' ), $title );
// translators: %s: title.
$this->sort_fields[ $key . '_asc' ] = sprintf( __( '%s ASC', 'ultimate-member' ), $title );
}
}
+2
View File
@@ -517,10 +517,12 @@ if ( ! class_exists( 'um\core\Password' ) ) {
$user_email = um_user( 'user_email' );
if ( mb_strlen( wp_unslash( $args['user_password'] ) ) < $min_length ) {
// translators: %s: min length.
UM()->form()->add_error( 'user_password', sprintf( __( 'Your password must contain at least %d characters', 'ultimate-member' ), $min_length ) );
}
if ( mb_strlen( wp_unslash( $args['user_password'] ) ) > $max_length ) {
// translators: %s: max length.
UM()->form()->add_error( 'user_password', sprintf( __( 'Your password must contain less than %d characters', 'ultimate-member' ), $max_length ) );
}
+2
View File
@@ -791,8 +791,10 @@ if ( ! class_exists( 'um\core\Uploader' ) ) {
} elseif ( isset( $data['max_file_size'] ) && ( $image_info['size'] > $data['max_file_size'] ) ) {
$error = $data['max_file_size_error'];
} elseif ( isset( $data['min_width'] ) && ( $image_info['width'] < $data['min_width'] ) ) {
// translators: %s: min widdth.
$error = sprintf( __( 'Your photo is too small. It must be at least %spx wide.', 'ultimate-member' ), $data['min_width'] );
} elseif ( isset( $data['min_height'] ) && ( $image_info['height'] < $data['min_height'] ) ) {
// translators: %s: min height.
$error = sprintf( __( 'Your photo is too small. It must be at least %spx high.', 'ultimate-member' ), $data['min_height'] );
}
+29 -2
View File
@@ -503,7 +503,9 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
}
}
} catch ( Exception $e ) {
// translators: %s: title.
UM()->form()->add_error( $key, sprintf( __( '%s - wrong conditions.', 'ultimate-member' ), $array['title'] ) );
// translators: %s: title.
$notice = '<div class="um-field-error">' . sprintf( __( '%s - wrong conditions.', 'ultimate-member' ), $array['title'] ) . '</div><!-- ' . $e->getMessage() . ' -->';
add_action( 'um_after_profile_fields', function() use ( $notice ) {
echo $notice;
@@ -512,14 +514,17 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
}
if ( isset( $array['type'] ) && $array['type'] == 'checkbox' && isset( $array['required'] ) && $array['required'] == 1 && ! isset( $submitted_data[ $key ] ) ) {
// translators: %s: title.
UM()->form()->add_error( $key, sprintf( __( '%s is required.', 'ultimate-member' ), $array['title'] ) );
}
if ( isset( $array['type'] ) && $array['type'] == 'radio' && isset( $array['required'] ) && $array['required'] == 1 && ! isset( $submitted_data[ $key ] ) && ! in_array( $key, array( 'role_radio', 'role_select' ) ) ) {
// translators: %s: title.
UM()->form()->add_error( $key, sprintf( __( '%s is required.', 'ultimate-member'), $array['title'] ) );
}
if ( isset( $array['type'] ) && $array['type'] == 'multiselect' && isset( $array['required'] ) && $array['required'] == 1 && ! isset( $submitted_data[ $key ] ) && ! in_array( $key, array( 'role_radio', 'role_select' ) ) ) {
// translators: %s: title.
UM()->form()->add_error( $key, sprintf( __( '%s is required.', 'ultimate-member' ), $array['title'] ) );
}
@@ -557,6 +562,7 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
if ( empty( $array['label'] ) ) {
UM()->form()->add_error( $key, __( 'This field is required', 'ultimate-member' ) );
} else {
// translators: %s: title.
UM()->form()->add_error( $key, sprintf( __( '%s is required', 'ultimate-member' ), $array['label'] ) );
}
}
@@ -568,6 +574,7 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
if ( isset( $array['max_words'] ) && $array['max_words'] > 0 ) {
if ( str_word_count( $submitted_data[ $key ], 0, "éèàôù" ) > $array['max_words'] ) {
// translators: %s: max words.
UM()->form()->add_error( $key, sprintf( __( 'You are only allowed to enter a maximum of %s words', 'ultimate-member' ), $array['max_words'] ) );
}
}
@@ -575,9 +582,11 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
if ( isset( $array['min_chars'] ) && $array['min_chars'] > 0 ) {
if ( $submitted_data[ $key ] && mb_strlen( $submitted_data[ $key ] ) < $array['min_chars'] ) {
if ( empty( $array['label'] ) ) {
// translators: %s: min chars.
UM()->form()->add_error( $key, sprintf( __( 'This field must contain at least %s characters', 'ultimate-member' ), $array['min_chars'] ) );
} else {
UM()->form()->add_error( $key, sprintf( __( 'Your %s must contain at least %s characters', 'ultimate-member' ), $array['label'], $array['min_chars'] ) );
// translators: %1$s is a label; %2$s is a min chars.
UM()->form()->add_error( $key, sprintf( __( 'Your %1$s must contain at least %2$s characters', 'ultimate-member' ), $array['label'], $array['min_chars'] ) );
}
}
}
@@ -585,9 +594,11 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
if ( isset( $array['max_chars'] ) && $array['max_chars'] > 0 ) {
if ( $submitted_data[ $key ] && mb_strlen( $submitted_data[ $key ] ) > $array['max_chars'] ) {
if ( empty( $array['label'] ) ) {
// translators: %s: max chars.
UM()->form()->add_error( $key, sprintf( __( 'This field must contain less than %s characters', 'ultimate-member' ), $array['max_chars'] ) );
} else {
UM()->form()->add_error( $key, sprintf( __( 'Your %s must contain less than %s characters', 'ultimate-member' ), $array['label'], $array['max_chars'] ) );
// translators: %1$s is a label; %2$s is a max chars.
UM()->form()->add_error( $key, sprintf( __( 'Your %1$s must contain less than %2$s characters', 'ultimate-member' ), $array['label'], $array['max_chars'] ) );
}
}
}
@@ -629,24 +640,28 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
if ( isset( $array['min_selections'] ) && $array['min_selections'] > 0 ) {
if ( ( ! isset( $submitted_data[ $key ] ) ) || ( isset( $submitted_data[ $key ] ) && is_array( $submitted_data[ $key ] ) && count( $submitted_data[ $key ] ) < $array['min_selections'] ) ) {
// translators: %s: min selections.
UM()->form()->add_error( $key, sprintf( __( 'Please select at least %s choices', 'ultimate-member' ), $array['min_selections'] ) );
}
}
if ( isset( $array['max_selections'] ) && $array['max_selections'] > 0 ) {
if ( isset( $submitted_data[ $key ] ) && is_array( $submitted_data[ $key ] ) && count( $submitted_data[ $key ] ) > $array['max_selections'] ) {
// translators: %s: max selections.
UM()->form()->add_error( $key, sprintf( __( 'You can only select up to %s choices', 'ultimate-member' ), $array['max_selections'] ) );
}
}
if ( isset( $array['min'] ) && is_numeric( $submitted_data[ $key ] ) ) {
if ( isset( $submitted_data[ $key ] ) && $submitted_data[ $key ] < $array['min'] ) {
// translators: %s: min limit.
UM()->form()->add_error( $key, sprintf( __( 'Minimum number limit is %s', 'ultimate-member' ), $array['min'] ) );
}
}
if ( isset( $array['max'] ) && is_numeric( $submitted_data[ $key ] ) ) {
if ( isset( $submitted_data[ $key ] ) && $submitted_data[ $key ] > $array['max'] ) {
// translators: %s: max limit.
UM()->form()->add_error( $key, sprintf( __( 'Maximum number limit is %s', 'ultimate-member' ), $array['max'] ) );
}
}
@@ -697,36 +712,42 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
case 'youtube_url':
if ( ! UM()->validation()->is_url( $submitted_data[ $key ], 'youtube.com' ) && ! UM()->validation()->is_url( $submitted_data[ $key ], 'youtu.be' ) ) {
// translators: %s: label.
UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL', 'ultimate-member' ), $array['label'] ) );
}
break;
case 'spotify_url':
if ( ! UM()->validation()->is_url( $submitted_data[ $key ], 'open.spotify.com' ) ) {
// translators: %s: label.
UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s URL', 'ultimate-member' ), $array['label'] ) );
}
break;
case 'telegram_url':
if ( ! UM()->validation()->is_url( $submitted_data[ $key ], 't.me' ) ) {
// translators: %s: label.
UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL', 'ultimate-member' ), $array['label'] ) );
}
break;
case 'soundcloud_url':
if ( ! UM()->validation()->is_url( $submitted_data[ $key ], 'soundcloud.com' ) ) {
// translators: %s: label.
UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL','ultimate-member'), $array['label'] ) );
}
break;
case 'facebook_url':
if ( ! UM()->validation()->is_url( $submitted_data[ $key ], 'facebook.com' ) ) {
// translators: %s: label.
UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL', 'ultimate-member' ), $array['label'] ) );
}
break;
case 'twitter_url':
if ( ! UM()->validation()->is_url( $submitted_data[ $key ], 'twitter.com' ) ) {
// translators: %s: label.
UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL', 'ultimate-member' ), $array['label'] ) );
}
break;
@@ -734,12 +755,14 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
case 'instagram_url':
if ( ! UM()->validation()->is_url( $submitted_data[ $key ], 'instagram.com' ) ) {
// translators: %s: label.
UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s profile URL', 'ultimate-member' ), $array['label'] ) );
}
break;
case 'linkedin_url':
if ( ! UM()->validation()->is_url( $submitted_data[ $key ], 'linkedin.com' ) ) {
// translators: %s: label.
UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s username or profile URL', 'ultimate-member' ), $array['label'] ) );
}
break;
@@ -753,6 +776,7 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
case 'tiktok_url':
if ( ! UM()->validation()->is_url( $submitted_data[ $key ], 'tiktok.com' ) ) {
// translators: %s: label.
UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s profile URL', 'ultimate-member' ), $array['label'] ) );
}
break;
@@ -760,6 +784,7 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
case 'twitch_url':
if ( ! UM()->validation()->is_url( $submitted_data[ $key ], 'twitch.tv' ) ) {
// translators: %s: label.
UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s profile URL', 'ultimate-member' ), $array['label'] ) );
}
break;
@@ -767,6 +792,7 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
case 'reddit_url':
if ( ! UM()->validation()->is_url( $submitted_data[ $key ], 'reddit.com' ) ) {
// translators: %s: label.
UM()->form()->add_error( $key, sprintf( __( 'Please enter a valid %s profile URL', 'ultimate-member' ), $array['label'] ) );
}
break;
@@ -911,6 +937,7 @@ function um_submit_form_errors_hook_( $submitted_data, $form_data ) {
if ( $profile_show_bio ) {
if ( mb_strlen( str_replace( array( "\r\n", "\n", "\r\t", "\t" ), ' ', $submitted_data['description'] ) ) > $max_chars && $max_chars ) {
// translators: %s: max chars.
UM()->form()->add_error( 'description', sprintf( __( 'Your user description must contain less than %s characters', 'ultimate-member' ), $max_chars ) );
}
}
+7 -1
View File
@@ -340,6 +340,7 @@ function um_user_edit_profile( $args, $form_data ) {
} else {
if ( 'password' === $array['type'] ) {
$to_update[ $key ] = wp_hash_password( $args['submitted'][ $key ] );
// translators: %s: title.
$args['submitted'][ $key ] = sprintf( __( 'Your choosed %s', 'ultimate-member' ), $array['title'] );
} else {
if ( isset( $userinfo[ $key ] ) && $args['submitted'][ $key ] != $userinfo[ $key ] ) {
@@ -1233,7 +1234,12 @@ function um_profile_header( $args ) {
<?php } ?>
<div class="um-profile-status <?php echo esc_attr( um_user( 'account_status' ) ); ?>">
<span><?php printf( __( 'This user account status is %s', 'ultimate-member' ), um_user( 'account_status_name' ) ); ?></span>
<span>
<?php
// translators: %s: profile status.
printf( __( 'This user account status is %s', 'ultimate-member' ), um_user( 'account_status_name' ) );
?>
</span>
</div>
<?php
+2
View File
@@ -209,6 +209,7 @@ function um_profile_field_filter_hook__user_registered( $value, $data ) {
return '';
}
$value = strtotime( $value );
// translators: %s: date.
$value = sprintf( __( 'Joined %s', 'ultimate-member' ), date_i18n( get_option( 'date_format' ), $value ) );
return $value;
}
@@ -478,6 +479,7 @@ function um_profile_field_filter_hook__( $value, $data, $type = '' ) {
if ( UM()->options()->get( 'allow_url_redirect_confirm' ) && $value !== wp_validate_redirect( $value ) ) {
$onclick_alert = sprintf(
' onclick="' . esc_attr( 'return confirm( "%s" );' ) . '"',
// translators: %s: link.
esc_js( sprintf( __( 'This link leads to a 3rd-party website. Make sure the link is safe and you really want to go to this website: \'%s\'', 'ultimate-member' ), $value ) )
);
}