<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12570] sites/trunk/wordpress.org/public_html/wp-content: Learn: Sync with git WordPress/learn@83713e4</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/12570">12570</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12570","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>adamwood</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-05-03 23:33:44 +0000 (Wed, 03 May 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Learn: Sync with git WordPress/learn@83713e4</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincadminphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/admin.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincpostmetaphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-meta.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020functionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscomponentlessonfiltersphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-lesson-filters.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscomponentworkshopfiltersphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-workshop-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/admin.php 2023-05-02 03:56:04 UTC (rev 12569)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/admin.php 2023-05-03 23:33:44 UTC (rev 12570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> use WP_Query;
</span><span class="cx" style="display: block; padding: 0 10px"> use function WordPressdotorg\Locales\get_locales_with_english_names;
</span><span class="cx" style="display: block; padding: 0 10px"> use function WordPressdotorg\Locales\get_locale_name_from_code;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use function WPOrg_Learn\Post_Meta\get_available_workshop_locales;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use function WPOrg_Learn\Post_Meta\get_available_post_type_locales;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) || die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,8 +24,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'manage_' . $pt . '_posts_custom_column', __NAMESPACE__ . '\render_list_table_language_column', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'manage_edit-wporg_workshop_sortable_columns', __NAMESPACE__ . '\add_workshop_list_table_sortable_columns' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'restrict_manage_posts', __NAMESPACE__ . '\add_workshop_list_table_filters', 10, 2 );
-add_action( 'pre_get_posts', __NAMESPACE__ . '\handle_workshop_list_table_filters' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'restrict_manage_posts', __NAMESPACE__ . '\add_admin_list_table_filters', 10, 2 );
+add_action( 'pre_get_posts', __NAMESPACE__ . '\handle_admin_list_table_filters' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'display_post_states', __NAMESPACE__ . '\add_post_states', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'lesson-plan', 'wporg_workshop', 'course', 'lesson' ) as $pt ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'views_edit-' . $pt, __NAMESPACE__ . '\list_table_views' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Add filtering controls for the workshops list table.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add filtering controls for the tutorial and lesson plan list tables.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $post_type
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $which
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,12 +230,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function add_workshop_list_table_filters( $post_type, $which ) {
- if ( 'wporg_workshop' !== $post_type || 'top' !== $which ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function add_admin_list_table_filters( $post_type, $which ) {
+ if ( ( 'wporg_workshop' !== $post_type && 'lesson-plan' !== $post_type ) || 'top' !== $which ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $available_locales = get_available_workshop_locales( 'language', 'english', false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_status = filter_input( INPUT_GET, 'post_status', FILTER_SANITIZE_STRING );
+ $available_locales = get_available_post_type_locales( 'language', $post_type, $post_status );
</ins><span class="cx" style="display: block; padding: 0 10px"> $language = filter_input( INPUT_GET, 'language', FILTER_SANITIZE_STRING );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,13 +261,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Alter the query to include workshop list table filters.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Alter the query to include tutorial and lesson plan list table filters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Query $query
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function handle_workshop_list_table_filters( WP_Query $query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function handle_admin_list_table_filters( WP_Query $query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_admin() || ! function_exists( 'get_current_screen' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,7 +278,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'edit-wporg_workshop' === $current_screen->id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'edit-wporg_workshop' === $current_screen->id || 'edit-lesson-plan' === $current_screen->id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $language = filter_input( INPUT_GET, 'language', FILTER_SANITIZE_STRING );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $language ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporglearnincpostmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-meta.php 2023-05-02 03:56:04 UTC (rev 12569)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-meta.php 2023-05-03 23:33:44 UTC (rev 12570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,32 +257,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Get a list of locales that are associated with at least one workshop.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get a list of locales that are associated with at least one post of the specified type.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Optionally only published workshops.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param string $meta_key
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $post_type
+ * @param string $post_status
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $label_language
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $published_only
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_available_workshop_locales( $meta_key, $label_language = 'english', $published_only = true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_available_post_type_locales( $meta_key, $post_type, $post_status, $label_language = 'english' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $and_post_status = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $published_only ) {
- $and_post_status = "AND posts.post_status = 'publish'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $post_status, get_post_stati(), true ) ) {
+ $and_post_status = "AND posts.post_status = '$post_status'";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $wpdb->get_col( $wpdb->prepare(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- $and_post_status contains no user input.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- $and_post_status only includes $post_status if it matches an allowed string.
</ins><span class="cx" style="display: block; padding: 0 10px"> "
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- SELECT DISTINCT postmeta.meta_value
- FROM {$wpdb->postmeta} postmeta
- JOIN {$wpdb->posts} posts ON posts.ID = postmeta.post_id $and_post_status
- WHERE postmeta.meta_key = %s
- ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ SELECT DISTINCT postmeta.meta_value
+ FROM {$wpdb->postmeta} postmeta
+ JOIN {$wpdb->posts} posts ON posts.ID = postmeta.post_id AND posts.post_type = %s $and_post_status
+ WHERE postmeta.meta_key = %s
+ ",
+ $post_type,
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_key
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,6 +345,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $download_url = filter_input( INPUT_POST, 'slides-download-url', FILTER_VALIDATE_URL ) ?: '';
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, 'slides_download_url', $download_url );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // This language meta field is rendered in the editor sidebar using a PluginDocumentSettingPanel block,
+ // which won't save the field on publish if it has the default value.
+ // Our filtering by locale depends on it being set, so we force it to be updated after saving:
+ $language = get_post_meta( $post_id, 'language', true );
+ $language_default = 'en_US';
+ if ( ! isset( $language ) || $language_default === $language ) {
+ update_post_meta( $post_id, 'language', $language_default );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020functionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php 2023-05-02 03:56:04 UTC (rev 12569)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php 2023-05-03 23:33:44 UTC (rev 12570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -707,7 +707,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'lesson-plan':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['meta'] = wporg_learn_get_lesson_plan_taxonomy_data( $post_id, 'archive' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['meta'] = array_merge(
+ wporg_learn_get_lesson_plan_taxonomy_data( $post_id, 'archive' ),
+ array(
+ array(
+ 'icon' => 'admin-site-alt3',
+ 'label' => __( 'Language:', 'wporg-learn' ),
+ 'value' => \WordPressdotorg\Locales\get_locale_name_from_code( $post->language, 'native' ),
+ ),
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'wporg_workshop':
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscomponentlessonfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-lesson-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-lesson-filters.php 2023-05-02 03:56:04 UTC (rev 12569)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-lesson-filters.php 2023-05-03 23:33:44 UTC (rev 12570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +31,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => filter_input( INPUT_GET, 'wp_version', FILTER_VALIDATE_INT, FILTER_REQUIRE_ARRAY ) ?: array(),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+$locales = \WPOrg_Learn\Post_Meta\get_available_post_type_locales( 'language', 'lesson-plan', 'publish', 'native' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form class="sidebar-filters col-3" method="get" action="<?php echo esc_url( get_post_type_archive_link( 'lesson-plan' ) ); ?>">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,11 +42,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="submit" class="button button-large button-secondary">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php esc_html_e( 'Apply Filters', 'wporg-learn' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </button>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php echo esc_url( get_post_type_archive_link( 'lesson-plan' ) ); ?>" class="clear-filters">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php echo esc_url( get_post_type_archive_link( 'lesson-plan' ) . '?_view=all' ); ?>" class="clear-filters">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php esc_html_e( 'Clear All Filters', 'wporg-learn' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h4 class="h5" id="lp-filters-language-heading"><?php esc_html_e( 'Language', 'wporg-learn' ); ?></h4>
+ <div class="filter-group">
+ <select
+ id="<?php echo esc_attr( 'language' ); ?>"
+ class="filter-group-select"
+ name="<?php echo esc_attr( 'language' ); ?>"
+ data-placeholder="<?php esc_attr_e( 'Select', 'wporg-learn' ); ?>"
+ aria-labelledby="lp-filters-language-heading"
+ >
+ <option value=""><?php esc_html_e( 'Select', 'wporg-learn' ); ?></option>
+ <?php foreach ( $locales as $locale_value => $locale_label ) : ?>
+ <option
+ value="<?php echo esc_attr( $locale_value ); ?>"
+ <?php selected( $locale_value, filter_input( INPUT_GET, 'language' ) ); ?>
+ >
+ <?php printf( '%s [%s]', esc_html( $locale_label ), esc_html( $locale_value ) ); ?>
+ </option>
+ <?php endforeach; ?>
+ </select>
+ </div>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $taxonomies as $txnmy ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h4 class="h5"><?php echo esc_html( $txnmy['label'] ); ?></h4>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporglearn2020templatepartscomponentworkshopfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-workshop-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-workshop-filters.php 2023-05-02 03:56:04 UTC (rev 12569)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-workshop-filters.php 2023-05-03 23:33:44 UTC (rev 12570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,12 +23,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Language', 'wporg-learn' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'language',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'items' => \WPOrg_Learn\Post_Meta\get_available_workshop_locales( 'language', 'native' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'items' => \WPOrg_Learn\Post_Meta\get_available_post_type_locales( 'language', 'wporg_workshop', 'publish', 'native' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Subtitles', 'wporg-learn' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => 'captions',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'items' => \WPOrg_Learn\Post_Meta\get_available_workshop_locales( 'video_caption_language', 'native' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'items' => \WPOrg_Learn\Post_Meta\get_available_post_type_locales( 'video_caption_language', 'wporg_workshop', 'publish', 'native' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'WordPress Version', 'wporg-learn' ),
</span></span></pre>
</div>
</div>
</body>
</html>