Changeset 11966
- Timestamp:
- 07/15/2022 12:25:33 AM (3 years ago)
- Location:
- sites/trunk/wordpress.org/public_html/wp-content
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/capabilities.php
r11269 r11966 27 27 $capability_types = array( 28 28 array( 'lesson_plan', 'lesson_plans' ), 29 array( ' workshop', 'workshops' ),29 array( 'tutorial', 'tutorials' ), 30 30 ); 31 31 … … 195 195 $wr_role = add_role( 196 196 'workshop_reviewer', 197 __( ' WorkshopReviewer', 'wporg-learn' ),197 __( 'Tutorial Reviewer', 'wporg-learn' ), 198 198 $role_caps 199 199 ); -
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/events.php
r11338 r11966 70 70 SELECT * 71 71 FROM wporg_events 72 WHERE meetup_url = 'https://www.meetup.com/ wordpress-social-learning/'72 WHERE meetup_url = 'https://www.meetup.com/learn-wordpress-online-workshops/' 73 73 AND status = 'scheduled' 74 74 AND date_utc BETWEEN %s AND %s -
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/post-type.php
r11269 r11966 84 84 85 85 /** 86 * Register a Workshoppost type.86 * Register a Tutorial post type. 87 87 */ 88 88 function register_workshop() { 89 89 $labels = array( 90 'name' => _x( ' Workshops', 'Post Type General Name', 'wporg_learn' ),91 'singular_name' => _x( ' Workshop', 'Post Type Singular Name', 'wporg_learn' ),92 'menu_name' => __( ' Workshops', 'wporg_learn' ),93 'name_admin_bar' => __( ' Workshop', 'wporg_learn' ),94 'archives' => __( ' WorkshopArchives', 'wporg_learn' ),95 'attributes' => __( ' WorkshopAttributes', 'wporg_learn' ),96 'parent_item_colon' => __( 'Parent Workshop:', 'wporg_learn' ),97 'all_items' => __( 'All Workshops', 'wporg_learn' ),98 'add_new_item' => __( 'Add New Workshop', 'wporg_learn' ),90 'name' => _x( 'Tutorials', 'Post Type General Name', 'wporg_learn' ), 91 'singular_name' => _x( 'Tutorial', 'Post Type Singular Name', 'wporg_learn' ), 92 'menu_name' => __( 'Tutorials', 'wporg_learn' ), 93 'name_admin_bar' => __( 'Tutorial', 'wporg_learn' ), 94 'archives' => __( 'Tutorial Archives', 'wporg_learn' ), 95 'attributes' => __( 'Tutorial Attributes', 'wporg_learn' ), 96 'parent_item_colon' => __( 'Parent Tutorial:', 'wporg_learn' ), 97 'all_items' => __( 'All Tutorials', 'wporg_learn' ), 98 'add_new_item' => __( 'Add New Tutorial', 'wporg_learn' ), 99 99 'add_new' => __( 'Add New', 'wporg_learn' ), 100 'new_item' => __( 'New Workshop', 'wporg_learn' ),101 'edit_item' => __( 'Edit Workshop', 'wporg_learn' ),102 'update_item' => __( 'Update Workshop', 'wporg_learn' ),103 'view_item' => __( 'View Workshop', 'wporg_learn' ),104 'view_items' => __( 'View Workshops', 'wporg_learn' ),105 'search_items' => __( 'Search Workshops', 'wporg_learn' ),106 'not_found' => __( 'No workshops found.', 'wporg_learn' ),107 'not_found_in_trash' => __( 'No workshops found in Trash.', 'wporg_learn' ),100 'new_item' => __( 'New Tutorial', 'wporg_learn' ), 101 'edit_item' => __( 'Edit Tutorial', 'wporg_learn' ), 102 'update_item' => __( 'Update Tutorial', 'wporg_learn' ), 103 'view_item' => __( 'View Tutorial', 'wporg_learn' ), 104 'view_items' => __( 'View Tutorials', 'wporg_learn' ), 105 'search_items' => __( 'Search Tutorials', 'wporg_learn' ), 106 'not_found' => __( 'No tutorials found.', 'wporg_learn' ), 107 'not_found_in_trash' => __( 'No tutorials found in Trash.', 'wporg_learn' ), 108 108 'featured_image' => __( 'Featured image', 'wporg_learn' ), 109 109 'set_featured_image' => __( 'Set featured image', 'wporg_learn' ), 110 110 'remove_featured_image' => __( 'Remove featured image', 'wporg_learn' ), 111 111 'use_featured_image' => __( 'Use as featured image', 'wporg_learn' ), 112 'insert_into_item' => __( 'Insert into workshop', 'wporg_learn' ),113 'uploaded_to_this_item' => __( 'Uploaded to this workshop', 'wporg_learn' ),114 'items_list' => __( ' Workshops list', 'wporg_learn' ),115 'items_list_navigation' => __( ' Workshops list navigation', 'wporg_learn' ),116 'filter_items_list' => __( 'Filter workshops list', 'wporg_learn' ),112 'insert_into_item' => __( 'Insert into tutorial', 'wporg_learn' ), 113 'uploaded_to_this_item' => __( 'Uploaded to this tutorial', 'wporg_learn' ), 114 'items_list' => __( 'Tutorials list', 'wporg_learn' ), 115 'items_list_navigation' => __( 'Tutorials list navigation', 'wporg_learn' ), 116 'filter_items_list' => __( 'Filter tutorials list', 'wporg_learn' ), 117 117 ); 118 118 … … 129 129 130 130 $args = array( 131 'label' => __( ' Workshop', 'wporg_learn' ),132 'description' => __( 'WordPress.org Training Workshop', 'wporg_learn' ),131 'label' => __( 'Tutorial', 'wporg_learn' ), 132 'description' => __( 'WordPress.org Training Tutorial', 'wporg_learn' ), 133 133 'labels' => $labels, 134 134 'supports' => $supports, … … 138 138 'show_ui' => true, 139 139 'show_in_menu' => true, 140 'has_archive' => ' workshops',140 'has_archive' => 'tutorials', 141 141 'menu_position' => 6, 142 142 'menu_icon' => 'dashicons-desktop', … … 146 146 'exclude_from_search' => false, 147 147 'publicly_queryable' => true, 148 'capability_type' => array( ' workshop', 'workshops' ),148 'capability_type' => array( 'tutorial', 'tutorials' ), 149 149 'map_meta_cap' => true, 150 150 'show_in_rest' => true, 151 'rewrite' => array( 'slug' => ' workshop' ),151 'rewrite' => array( 'slug' => 'tutorial' ), 152 152 'template' => generate_workshop_template_structure(), 153 153 ); … … 170 170 'core/paragraph', 171 171 array( 172 'placeholder' => __( 'Describe what the workshopis about.', 'wporg-learn' ),172 'placeholder' => __( 'Describe what the tutorial is about.', 'wporg-learn' ), 173 173 ), 174 174 ), -
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/inc/taxonomy.php
r11413 r11966 345 345 function register_workshop_series() { 346 346 $labels = array( 347 'name' => _x( ' WorkshopSeries', 'taxonomy general name', 'wporg-learn' ),348 'singular_name' => _x( ' WorkshopSeries', 'taxonomy singular name', 'wporg-learn' ),347 'name' => _x( 'Tutorial Series', 'taxonomy general name', 'wporg-learn' ), 348 'singular_name' => _x( 'Tutorial Series', 'taxonomy singular name', 'wporg-learn' ), 349 349 'menu_name' => __( 'Series', 'wporg-learn' ), 350 350 'all_items' => __( 'All Series', 'wporg-learn' ), … … 371 371 'public' => true, 372 372 'rewrite' => array( 373 'slug' => ' workshops',373 'slug' => 'tutorials', 374 374 ), 375 375 'show_ui' => true, … … 391 391 function register_workshop_topic() { 392 392 $labels = array( 393 'name' => _x( 'Topics', 'Topic Plans associated to workshop.', 'wporg-learn' ),393 'name' => _x( 'Topics', 'Topic Plans associated to tutorial.', 'wporg-learn' ), 394 394 'singular_name' => _x( 'Topic', 'Taxonomy Singular Name', 'wporg-learn' ), 395 395 'menu_name' => __( 'Topics', 'wporg-learn' ), -
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/views/block-workshop-details.php
r11546 r11966 28 28 $url = ''; 29 29 if ( ! empty( $field['param'] ) ) { 30 $url = trailingslashit( site_url() ) . ' workshops/?' . $key . '=' . $field['param'][ $field_key ];30 $url = trailingslashit( site_url() ) . 'tutorials/?' . $key . '=' . $field['param'][ $field_key ]; 31 31 } 32 32 … … 78 78 <a 79 79 class="wp-block-button__link" 80 href="https://learn.wordpress.org/ social-learning/"80 href="https://learn.wordpress.org/online-workshops/" 81 81 style="border-radius:5px" 82 82 > 83 <?php esc_html_e( 'Join a Social Learning Space', 'wporg-learn' ); ?>83 <?php esc_html_e( 'Join a live Online Workshop', 'wporg-learn' ); ?> 84 84 </a> 85 85 </div> -
sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-learn/views/form-workshop-application.php
r10926 r11966 91 91 <fieldset class="section"> 92 92 <legend> 93 <?php esc_html_e( ' WorkshopDetails', 'wporg-learn' ); ?>93 <?php esc_html_e( 'Tutorial Details', 'wporg-learn' ); ?> 94 94 </legend> 95 95 <?php -
sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/front-page.php
r11697 r11966 12 12 <section class="quick-intro"> 13 13 <div class="shapes"> 14 <a class="parallelogram workshops" href="/ workshops/">14 <a class="parallelogram workshops" href="/tutorials/"> 15 15 <p class="dashicons-before dashicons-desktop"> 16 <strong><?php esc_html_e( ' Workshops', 'wporg-learn' ); ?></strong>16 <strong><?php esc_html_e( 'Tutorials', 'wporg-learn' ); ?></strong> 17 17 <?php 18 esc_html_e( ' Workshops are a great way to get hands-on with WordPress. Here are some workshops for you to level up your WordPress skills.', 'wporg-learn' );18 esc_html_e( 'Tutorials are a great way to get hands-on with WordPress. Here are some tutorials for you to level up your WordPress skills.', 'wporg-learn' ); 19 19 ?> 20 <u><?php esc_html_e( 'Browse Workshops', 'wporg-learn' ); ?></u>20 <u><?php esc_html_e( 'Browse Tutorials', 'wporg-learn' ); ?></u> 21 21 </p> 22 22 </a> … … 63 63 <section> 64 64 <div class="row align-middle between section-heading"> 65 <h2 class="h4 section-heading_title"><?php esc_html_e( 'Recent Workshops', 'wporg-learn' ); ?></h2>66 <a class="section-heading_link" href="/ workshops/"><span aria-hidden="true"><?php esc_html_e( 'View All Workshops', 'wporg-learn' ); ?></span><span class="screen-reader-text"><?php esc_html_e( 'View All Workshops', 'wporg-learn' ); ?></span></a>65 <h2 class="h4 section-heading_title"><?php esc_html_e( 'Recent Tutorials', 'wporg-learn' ); ?></h2> 66 <a class="section-heading_link" href="/tutorials/"><span aria-hidden="true"><?php esc_html_e( 'View All Tutorials', 'wporg-learn' ); ?></span><span class="screen-reader-text"><?php esc_html_e( 'View All Tutorials', 'wporg-learn' ); ?></span></a> 67 67 </div> 68 68 … … 87 87 <div class="row align-middle between section-heading"> 88 88 <h2 class="h4 section-heading_title"> 89 <?php esc_html_e( 'Upcoming Social Learning Spaces', 'wporg-learn' ); ?>89 <?php esc_html_e( 'Upcoming Online Workshops', 'wporg-learn' ); ?> 90 90 </h2> 91 <a class="section-heading_link" href="/ social-learning/">92 <?php esc_html_e( 'View All Social Learning Spaces', 'wporg-learn' ); ?>91 <a class="section-heading_link" href="/online-workshops/"> 92 <?php esc_html_e( 'View All Online Workshops', 'wporg-learn' ); ?> 93 93 </a> 94 94 </div> … … 101 101 <?php 102 102 printf( 103 wp_kses_post( __( 'Want to facilitate a social learning space? <a href="%s">Apply to become a facilitator</a>.', 'wporg-learn' ) ),104 'https://learn.wordpress.org/ social-learning/'103 wp_kses_post( __( 'Want to facilitate an online workshop? <a href="%s">Apply to become a facilitator</a>.', 'wporg-learn' ) ), 104 'https://learn.wordpress.org/online-workshops/' 105 105 ); 106 106 ?> -
sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/functions.php
r11961 r11966 1142 1142 1143 1143 /** 1144 * Redirect old pages to their new homes. 1145 * 1146 * @return void 1147 */ 1148 function wporg_learn_redirect_old_urls() { 1149 if ( ! is_404() ) { 1150 return; 1151 } 1152 1153 $redirects = array( 1154 // Source => Destination, any characters after the source will be appended to the destination. 1155 '/workshop/' => '/tutorial/', 1156 '/workshops' => '/tutorials', 1157 '/social-learning' => '/online-workshops', 1158 '/workshop-presenter-application' => '/tutorial-presenter-application', 1159 ); 1160 1161 // Use `REQUEST_URI` rather than `$wp->request`, to get the entire source URI including url parameters. 1162 $request = $_SERVER['REQUEST_URI'] ?? ''; 1163 1164 foreach ( $redirects as $source => $destination ) { 1165 if ( str_starts_with( $request, $source ) ) { 1166 $redirect = $destination; 1167 1168 // Append any extra request parameters. 1169 if ( strlen( $request ) > strlen( $source ) ) { 1170 $redirect .= substr( $request, strlen( $source ) ); 1171 } 1172 1173 wp_safe_redirect( $redirect ); 1174 die(); 1175 } 1176 } 1177 } 1178 add_action( 'template_redirect', 'wporg_learn_redirect_old_urls' ); 1179 1180 /** 1144 1181 * Add file MIME types for upload. 1145 1182 * -
sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/header.php
r11517 r11966 27 27 28 28 $menu_items = array( 29 '/workshops/' => __( 'Workshops', 'wporg-learn' ), 29 '/tutorials/' => __( 'Tutorials', 'wporg-learn' ), 30 '/online-workshops/' => __( 'Online Workshops', 'wporg-learn' ), 30 31 '/courses/' => __( 'Courses', 'wporg-learn' ), 31 32 '/lesson-plans/' => __( 'Lesson Plans', 'wporg-learn' ), 32 '/social-learning/' => __( 'Social Learning', 'wporg-learn' ),33 33 '/contribute/' => __( 'Contribute', 'wporg-learn' ), 34 34 ); -
sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-discussion-event-short-item.php
r11961 r11966 23 23 <div class="wp-block-button is-style-primary"> 24 24 <a class="wp-block-button__link" href="<?php echo esc_attr( $args['url'] ); ?>" style="border-radius:5px"> 25 <?php esc_html_e( 'Join this space', 'wporg-learn' ); ?><span class="screen-reader-text"><?php echo sprintf( ': %s', esc_html( $args['title'] ) ); ?></span>25 <?php esc_html_e( 'Join this workshop', 'wporg-learn' ); ?><span class="screen-reader-text"><?php echo sprintf( ': %s', esc_html( $args['title'] ) ); ?></span> 26 26 </a> 27 27 </div> -
sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-learn-2020/template-parts/component-submit-idea-cta.php
r11309 r11966 16 16 <div aria-hidden="true" class="content-icon"><span class="dashicons dashicons-<?php echo esc_attr( $args['icon'] ); ?>"></span></div> 17 17 <?php endif; ?> 18 <h2><?php esc_html_e( 'Have an Idea for a Workshop? Let us know!', 'wporg-learn' ); ?></h2>19 <a class="button button-primary button-large" href="https://learn.wordpress.org/ workshop-presenter-application/"><span aria-hidden="true"><?php esc_html_e( 'Submit an Idea', 'wporg-learn' ); ?></span><span class="screen-reader-text"><?php esc_html_e( 'Submit WorkshopIdea', 'wporg-learn' ); ?></span></a>18 <h2><?php esc_html_e( 'Have an Idea for a Tutorial? Let us know!', 'wporg-learn' ); ?></h2> 19 <a class="button button-primary button-large" href="https://learn.wordpress.org/tutorial-presenter-application/"><span aria-hidden="true"><?php esc_html_e( 'Submit an Idea', 'wporg-learn' ); ?></span><span class="screen-reader-text"><?php esc_html_e( 'Submit Tutorial Idea', 'wporg-learn' ); ?></span></a> 20 20 </section>
Note: See TracChangeset
for help on using the changeset viewer.