Changeset 12205 for sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-translation-helpers.php

Timestamp:

11/04/2022 11:01:38 AM (4 years ago)

Author:

akirk

Message:

gp-translation-helpers: Update from Github

Changes:

• Show dropdown of glossary words extracted from the original ​https://github.com/GlotPress/gp-translation-helpers/pull/118
• Show the feedback form open by default ​https://github.com/GlotPress/gp-translation-helpers/pull/133
• Fix email sending bug ​https://github.com/GlotPress/gp-translation-helpers/pull/139
• Add the status of the translation in the discussion ​https://github.com/GlotPress/gp-translation-helpers/pull/104
• Hide new comment form ​https://github.com/GlotPress/gp-translation-helpers/pull/112
• Remove locale-projects template override ​https://github.com/GlotPress/gp-translation-helpers/pull/115

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers

Files:

• . (modified) (1 prop)
• includes/class-gp-translation-helpers.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers

@@ -10 +10 @@
 phpunit.xml.dist
 tests
+bin

@@ -10 +10 @@
 phpunit.xml.dist
 tests
+bin

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-gp-translation-helpers.php

@@ -81 +81 @@
                         'gp_tmpl_load_locations',
                         function( $locations, $template, $args, $template_path ) {
-                                if ( 'translation-row-editor-meta-status' === $template || 'locale-projects' === $template ) {
+                                if ( 'translation-row-editor-meta-status' === $template ) {
                                         array_unshift( $locations, dirname( dirname( __FILE__ ) ) . '/templates/gp-templates-overrides/' );
                                 } else {
@@ -413 +413 @@
                 $helper_discussion    = new Helper_Translation_Discussion();
                 $locale_slug          = $helper_discussion->sanitize_comment_locale( sanitize_text_field( $_POST['data']['locale_slug'] ) );
+                $translation_status   = $helper_discussion->sanitize_translation_status( sanitize_text_field( $_POST['data']['translation_status'] ) );
                 $translation_id_array = ! empty( $_POST['data']['translation_id'] ) ? array_map( array( $helper_discussion, 'sanitize_translation_id' ), $_POST['data']['translation_id'] ) : null;
                 $original_id_array    = ! empty( $_POST['data']['original_id'] ) ? array_map( array( $helper_discussion, 'sanitize_original_id' ), $_POST['data']['original_id'] ) : null;
@@ -443 +444 @@
 
                 // Post comment on discussion page for the first string
-                $first_comment_id = $this->insert_comment( $comment, $first_original_id, $comment_reason, $first_translation_id, $locale_slug, $_SERVER );
+                $first_comment_id = $this->insert_comment( $comment, $first_original_id, $comment_reason, $first_translation_id, $locale_slug, $_SERVER, $translation_status );
 
                 if ( ! empty( $original_id_array ) && ! empty( $translation_id_array ) ) {
@@ -449 +450 @@
                         $comment = get_comment_link( $first_comment_id );
                         foreach ( $original_id_array as $index => $single_original_id ) {
-                                $comment_id = $this->insert_comment( $comment, $single_original_id, $comment_reason, $translation_id_array[ $index ], $locale_slug, $_SERVER );
+                                $comment_id = $this->insert_comment( $comment, $single_original_id, $comment_reason, $translation_id_array[ $index ], $locale_slug, $_SERVER, $translation_status );
                                 $comment    = get_comment( $comment_id );
                                 GP_Notifications::add_related_comment( $comment );
@@ -507 +508 @@
          * @since 0.0.2
          */
-        private function insert_comment( $comment, $original_id, $reason, $translation_id, $locale_slug, $server ) {
+        private function insert_comment( $comment, $original_id, $reason, $translation_id, $locale_slug, $server, $translation_status ) {
                 $post_id = Helper_Translation_Discussion::get_or_create_shadow_post_id( $original_id );
                 $user    = wp_get_current_user();
@@ -521 +522 @@
                                 'user_id'              => $user->ID,
                                 'comment_meta'         => array(
-                                        'reject_reason'  => $reason,
-                                        'translation_id' => $translation_id,
-                                        'locale'         => $locale_slug,
+                                        'reject_reason'      => $reason,
+                                        'translation_id'     => $translation_id,
+                                        'locale'             => $locale_slug,
+                                        'translation_status' => $translation_status,
                                 ),
                         )

@@ -10 +10 @@
 phpunit.xml.dist
 tests
+bin