Changeset 12276

Timestamp:

11/23/2022 09:41:46 PM (3 years ago)

Author:

adamwood

Message:

Learn: Sync with git WordPress/learn@032e753

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/wporg-learn/inc/admin.php (modified) (7 diffs)
• plugins/wporg-learn/inc/blocks.php (modified) (1 diff)
• plugins/wporg-learn/inc/form.php (modified) (1 diff)
• plugins/wporg-learn/inc/post-meta.php (modified) (2 diffs)
• plugins/wporg-learn/views/metabox-workshop-details.php (modified) (1 diff)
• themes/pub/wporg-learn-2020/functions.php (modified) (4 diffs)
• themes/pub/wporg-learn-2020/template-parts/component-workshop-filters.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/admin.php

@@ -91 +91 @@
 function add_workshop_list_table_columns( $columns ) {
     $columns = array_slice( $columns, 0, -2, true )
-                + array( 'video_language' => __( 'Video Language', 'wporg-learn' ) )
+                + array( 'language' => __( 'Language', 'wporg-learn' ) )
                 + array( 'video_caption_language' => __( 'Subtitles', 'wporg-learn' ) )
-                + array( 'language' => __( 'Language', 'wporg-learn' ) )
                 + array_slice( $columns, -2, 2, true );
 
@@ -149 +148 @@
                 esc_html( get_locale_name_from_code( $language, 'english' ) ),
                 esc_html( $language )
-            );
-            break;
-        case 'video_language':
-            printf(
-                '%s [%s]',
-                esc_html( get_locale_name_from_code( $post->video_language, 'english' ) ),
-                esc_html( $post->video_language )
             );
             break;
@@ -226 +218 @@
  */
 function add_workshop_list_table_sortable_columns( $sortable_columns ) {
-    $sortable_columns['video_language'] = 'video_language';
+    $sortable_columns['language'] = 'language';
 
     return $sortable_columns;
@@ -244 +236 @@
     }
 
-    $available_locales = get_available_workshop_locales( 'video_language', 'english', false );
+    $available_locales = get_available_workshop_locales( 'language', 'english', false );
     $language          = filter_input( INPUT_GET, 'language', FILTER_SANITIZE_STRING );
 
@@ -252 +244 @@
     </label>
     <select id="filter-by-language" name="language">
-        <option value=""<?php selected( ! $language ); ?>><?php esc_html_e( 'Any video language', 'wporg-learn' ); ?></option>
+        <option value=""<?php selected( ! $language ); ?>><?php esc_html_e( 'Any language', 'wporg-learn' ); ?></option>
         <?php foreach ( $available_locales as $code => $name ) : ?>
             <option value="<?php echo esc_attr( $code ); ?>"<?php selected( $code, $language ); ?>>
@@ -300 +292 @@
 
             $meta_query[] = array(
-                'key'   => 'video_language',
+                'key'   => 'language',
                 'value' => $language,
             );
@@ -307 +299 @@
         }
 
-        if ( 'video_language' === $query->get( 'orderby' ) ) {
-            $query->set( 'meta_key', 'video_language' );
+        if ( 'language' === $query->get( 'orderby' ) ) {
+            $query->set( 'meta_key', 'language' );
             $query->set( 'orderby', 'meta_value' );
         }

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/blocks.php

@@ -227 +227 @@
         'language' => array(
             'label' => __( 'Language', 'wporg-learn' ),
-            'param' => array( $post->video_language ),
-            'value' => array( esc_html( get_locale_name_from_code( $post->video_language, 'native' ) ) ),
+            'param' => array( $post->language ),
+            'value' => array( esc_html( get_locale_name_from_code( $post->language, 'native' ) ) ),
         ),
         'captions' => array(

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/form.php

@@ -265 +265 @@
         'post_content' => $content,
         'meta_input'   => array(
-            'video_language'       => $validated['language'],
+            'language'             => $validated['language'],
             'original_application' => $validated,
         ),

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-meta.php

@@ -114 +114 @@
             'single'            => false,
             'sanitize_callback' => 'sanitize_user',
-            'show_in_rest'      => true,
-        )
-    );
-
-    register_post_meta(
-        $post_type,
-        'video_language',
-        array(
-            'description'       => __( 'The language that the workshop is presented in.', 'wporg_learn' ),
-            'type'              => 'string',
-            'single'            => true,
-            'default'           => 'en_US',
-            'sanitize_callback' => __NAMESPACE__ . '\sanitize_locale',
             'show_in_rest'      => true,
         )
@@ -480 +467 @@
     }
 
-    $video_language = filter_input( INPUT_POST, 'video-language' );
-    update_post_meta( $post_id, 'video_language', $video_language );
-
     $captions = filter_input( INPUT_POST, 'video-caption-language', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
     delete_post_meta( $post_id, 'video_caption_language' );

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/views/metabox-workshop-details.php

@@ -67 +67 @@
 
 <p>
-    <label for="workshop-video-language"><?php esc_html_e( 'Video Language', 'wporg_learn' ); ?></label>
-    <select id="workshop-video-language" name="video-language" style="width: 100%;">
-        <?php foreach ( $locales as $code => $label ) : ?>
-            <option value="<?php echo esc_attr( $code ); ?>" <?php selected( $code, $post->video_language ); ?>>
-                <?php echo esc_html( $label ); ?>
-            </option>
-        <?php endforeach; ?>
-    </select>
-</p>
-
-<p>
     <label for="workshop-video-caption-language"><?php esc_html_e( 'Subtitles', 'wporg_learn' ); ?></label>
     <select id="workshop-video-caption-language" name="video-caption-language[]" style="width: 100%;" multiple>

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php

@@ -461 +461 @@
  * After:
  * SELECT SQL_CALC_FOUND_ROWS wp_posts.*,
- *   MAX( IF( pmeta.meta_key = 'video_language' AND pmeta.meta_value LIKE 'art_%', 1, 0 ) ) AS has_language,
+ *   MAX( IF( pmeta.meta_key = 'language' AND pmeta.meta_value LIKE 'art_%', 1, 0 ) ) AS has_language,
  *   MAX( IF( pmeta.meta_key = 'video_caption_language' AND pmeta.meta_value LIKE 'art_%', 1, 0 ) ) AS has_caption
  * FROM wp_posts
@@ -495 +495 @@
          */
         $clauses['fields'] .= ",
-            MAX( IF( pmeta.meta_key = 'video_language' AND pmeta.meta_value LIKE '{$locale_root}%', 1, 0 ) ) AS has_language
+            MAX( IF( pmeta.meta_key = 'language' AND pmeta.meta_value LIKE '{$locale_root}%', 1, 0 ) ) AS has_language
         ";
         $clauses['fields'] .= ",
@@ -555 +555 @@
     $entity_map = array(
         'captions'   => 'video_caption_language',
-        'language'   => 'video_language',
+        'language'   => 'language',
         'audience'   => 'audience',
         'duration'   => 'duration',
@@ -726 +726 @@
                     'icon'  => 'admin-site-alt3',
                     'label' => __( 'Language:', 'wporg-learn' ),
-                    'value' => \WordPressdotorg\Locales\get_locale_name_from_code( $post->video_language, 'native' ),
+                    'value' => \WordPressdotorg\Locales\get_locale_name_from_code( $post->language, 'native' ),
                 ),
             );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-workshop-filters.php

@@ -24 +24 @@
         'label' => __( 'Language', 'wporg-learn' ),
         'name'  => 'language',
-        'items' => \WPOrg_Learn\Post_Meta\get_available_workshop_locales( 'video_language', 'native' ),
+        'items' => \WPOrg_Learn\Post_Meta\get_available_workshop_locales( 'language', 'native' ),
     ),
     array(