Skip to content

Commit

Permalink
Add updated translations/assets & release v2.17 [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
GravityView - CI committed Feb 13, 2023
1 parent 448a091 commit 59b0045
Show file tree
Hide file tree
Showing 571 changed files with 952 additions and 767 deletions.
Binary file modified assets/images/screenshots/gravatar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/screenshots/partial-entries.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/stars.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/team/Bennemann.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/team/Casey.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/team/Ehlers.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/team/Vlad.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/team/Zack.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions includes/class-gravityview-entry-approval-merge-tags.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,15 @@ public function _filter_gform_custom_merge_tags( $custom_merge_tags = array(), $

$entry_moderation_merge_tags = array(
array(
'label' => __( 'Moderation: Approve entry link', 'gravityview' ),
'label' => __( 'Moderation: Approve entry link', 'gk-gravityview' ),
'tag' => '{gv_approve_entry}',
),
array(
'label' => __( 'Moderation: Disapprove entry link', 'gravityview' ),
'label' => __( 'Moderation: Disapprove entry link', 'gk-gravityview' ),
'tag' => '{gv_disapprove_entry}',
),
array(
'label' => __( 'Moderation: Reset entry approval link', 'gravityview' ),
'label' => __( 'Moderation: Reset entry approval link', 'gk-gravityview' ),
'tag' => '{gv_unapprove_entry}',
),
);
Expand Down Expand Up @@ -378,7 +378,7 @@ public function maybe_update_approved() {

gravityview()->log->error( 'Decoding the entry approval token failed.', array( 'data' => $token ) );

wp_die( sprintf( __( 'Entry moderation failed: %s', 'gravityview' ), $token->get_error_message() ) );
wp_die( sprintf( __( 'Entry moderation failed: %s', 'gk-gravityview' ), $token->get_error_message() ) );
}

// Ensure the token is formatted properly.
Expand All @@ -388,7 +388,7 @@ public function maybe_update_approved() {

gravityview()->log->error( 'Validating the entry approval token failed.', array( 'data' => $is_valid_token ) );

wp_die( sprintf( __( 'Entry moderation failed: %s', 'gravityview' ), $is_valid_token->get_error_message() ) );
wp_die( sprintf( __( 'Entry moderation failed: %s', 'gk-gravityview' ), $is_valid_token->get_error_message() ) );
}

$is_request_valid = $this->is_request_valid( $token );
Expand All @@ -397,7 +397,7 @@ public function maybe_update_approved() {

gravityview()->log->error( 'Validating the entry approval token failed.', array( 'data' => $is_request_valid ) );

wp_die( sprintf( __( 'Entry moderation failed: %s', 'gravityview' ), $is_request_valid->get_error_message() ) );
wp_die( sprintf( __( 'Entry moderation failed: %s', 'gk-gravityview' ), $is_request_valid->get_error_message() ) );
}

$scopes = $token['scopes'];
Expand Down Expand Up @@ -464,7 +464,7 @@ public function maybe_update_approved() {
protected function is_request_valid( $token ) {

if ( 'private' === $token['scopes']['privacy'] && ! is_user_logged_in() ) {
return new WP_Error( 'user_not_logged_in', __( 'You are not allowed to perform this operation.', 'gravityview' ) );
return new WP_Error( 'user_not_logged_in', __( 'You are not allowed to perform this operation.', 'gk-gravityview' ) );
}

if ( $token['exp'] < time() ) {
Expand Down
Loading

0 comments on commit 59b0045

Please sign in to comment.