Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avatar rating text is not translated properly if a user has a custom language Set #89

Merged
merged 9 commits into from
Nov 23, 2021
Merged

Avatar rating text is not translated properly if a user has a custom language Set #89

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c013a00
Avatar rating text is not translated properly if a user has a custom …
ActuallyConnor Nov 17, 2021
de4e855
Outputting each rating individually here
ActuallyConnor Nov 18, 2021
743598b
Fixing indentation
ActuallyConnor Nov 18, 2021
aa063e9
Fixing indentation
ActuallyConnor Nov 18, 2021
40a46a9
Fixing indentation
ActuallyConnor Nov 18, 2021
25ef3a4
Fixing indentation
ActuallyConnor Nov 18, 2021
30a4799
Changes based on code review
ActuallyConnor Nov 19, 2021
53f42ab
Changing to updateAvatarRatings and moving call higher in the code
ActuallyConnor Nov 19, 2021
a1ee6a5
Fixing phpcs errors
ActuallyConnor Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions includes/class-simple-local-avatars.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,15 +401,17 @@ class="button item-delete submitdelete deletion"
<td colspan="2">
<fieldset id="simple-local-avatar-ratings" <?php disabled( empty( $profileuser->simple_local_avatar ) ); ?>>
<legend class="screen-reader-text"><span><?php esc_html_e( 'Rating' ); ?></span></legend>
<?php
if ( empty( $profileuser->simple_local_avatar_rating ) || ! array_key_exists( $profileuser->simple_local_avatar_rating, $this->avatar_ratings ) ) {
$profileuser->simple_local_avatar_rating = 'G';
}
<?php
$this->update_avatar_ratings();

foreach ( $this->avatar_ratings as $key => $rating ) :
echo "\n\t<label><input type='radio' name='simple_local_avatar_rating' value='" . esc_attr( $key ) . "' " . checked( $profileuser->simple_local_avatar_rating, $key, false ) . "/> $rating</label><br />";
endforeach;
?>
if ( empty( $profileuser->simple_local_avatar_rating ) || ! array_key_exists( $profileuser->simple_local_avatar_rating, $this->avatar_ratings ) ) {
$profileuser->simple_local_avatar_rating = 'G';
}

foreach ( $this->avatar_ratings as $key => $rating ) :
echo "\n\t<label><input type='radio' name='simple_local_avatar_rating' value='" . esc_attr( $key ) . "' " . checked( $profileuser->simple_local_avatar_rating, $key, false ) . "/>" . esc_html( $rating ) . "</label><br />";
endforeach;
?>
<p class="description"><?php esc_html_e( 'If the local avatar is inappropriate for this site, Gravatar will be attempted.', 'simple-local-avatars' ); ?></p>
</fieldset></td>
</tr>
Expand Down Expand Up @@ -678,4 +680,18 @@ public function get_avatar_rest( $user ) {
public function set_avatar_rest( $input, $user ) {
$this->assign_new_user_avatar( $input['media_id'], $user->ID );
}

/**
* Overwriting existing avatar_ratings so this can be called just before the rating strings would be used so that
* translations will work correctly.
* Default text-domain because the strings have already been translated
*/
private function update_avatar_ratings() {
$this->avatar_ratings = array(
'G' => __( 'G &#8212; Suitable for all audiences' ),
'PG' => __( 'PG &#8212; Possibly offensive, usually for audiences 13 and above' ),
'R' => __( 'R &#8212; Intended for adult audiences above 17' ),
'X' => __( 'X &#8212; Even more mature than above' ),
);
}
}