Changeset 44273
- Timestamp:
- 12/17/2018 07:05:30 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/5.0 merged: 43935,43949-43951
- Property svn:mergeinfo changed
-
trunk/package-lock.json
r44262 r44273 287 287 }, 288 288 "@wordpress/block-library": { 289 "version": "2.2. 6",290 "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-2.2. 6.tgz",291 "integrity": "sha512- HCRqGzGqeU36tUp26ml+2o8SXCB/gkvzJyeIKX4IGHKjONjxZim/0ht7KoyCEjup/cxNNP8NZ6BQaI3oi6P6JA==",289 "version": "2.2.8", 290 "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-2.2.8.tgz", 291 "integrity": "sha512-86DiBPFQwGDWf/s4OwmTp2q+VoeNhmW1OQXu/on+c5MHgJh7W2uFasO4bhmz31+U9KwAFHQr3pCcxaasdP17vQ==", 292 292 "requires": { 293 293 "@babel/runtime": "^7.0.0", … … 295 295 "@wordpress/blob": "^2.1.0", 296 296 "@wordpress/blocks": "^6.0.2", 297 "@wordpress/components": "^7.0. 1",297 "@wordpress/components": "^7.0.3", 298 298 "@wordpress/compose": "^3.0.0", 299 299 "@wordpress/core-data": "^2.0.14", 300 300 "@wordpress/data": "^4.0.1", 301 301 "@wordpress/deprecated": "^2.0.3", 302 "@wordpress/editor": "^9.0. 1",302 "@wordpress/editor": "^9.0.3", 303 303 "@wordpress/element": "^2.1.8", 304 304 "@wordpress/html-entities": "^2.0.3", … … 363 363 }, 364 364 "@wordpress/components": { 365 "version": "7.0. 1",366 "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-7.0. 1.tgz",367 "integrity": "sha512- 6Efciw+CwFa0b51bLZUNWv0C2p5j8VIVb6vAHB/ghwD0BkNHZ0N4JBafOIB+6toAtmLzC+SONfHNmFNJHibZ+Q==",365 "version": "7.0.3", 366 "resolved": "https://registry.npmjs.org/@wordpress/components/-/components-7.0.3.tgz", 367 "integrity": "sha512-7TgmhXz8+KRknFNYe+AYHpq3EreB40OZWEYzXF5tSJdjC6wElrDMKqRCGgWdTlpgZ/09g2cDo7a+GJ8iQTm9ig==", 368 368 "requires": { 369 369 "@babel/runtime": "^7.0.0", … … 484 484 }, 485 485 "@wordpress/edit-post": { 486 "version": "3.1. 1",487 "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-3.1. 1.tgz",488 "integrity": "sha512- sjGNSTBh6xKZUtpskkc1Hx0y+iqcfOyX+i09I+zrRyoelHvw/0nZ9iHvN34lTszAgPOx9vjy8nHc8obH0gr8AA==",486 "version": "3.1.3", 487 "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-3.1.3.tgz", 488 "integrity": "sha512-bA9OIkzInCLvf2YB4b6H0Ubghmv+AjOrCpZcp/5sdWLAg7hE6ZzZZ5Pz/2o5bBd+mTkalALJFMxgy7DKvH3WgQ==", 489 489 "requires": { 490 490 "@babel/runtime": "^7.0.0", 491 491 "@wordpress/a11y": "^2.0.2", 492 492 "@wordpress/api-fetch": "^2.2.5", 493 "@wordpress/block-library": "^2.2. 6",493 "@wordpress/block-library": "^2.2.8", 494 494 "@wordpress/blocks": "^6.0.2", 495 "@wordpress/components": "^7.0. 1",495 "@wordpress/components": "^7.0.3", 496 496 "@wordpress/compose": "^3.0.0", 497 497 "@wordpress/core-data": "^2.0.14", 498 498 "@wordpress/data": "^4.0.1", 499 "@wordpress/editor": "^9.0. 1",499 "@wordpress/editor": "^9.0.3", 500 500 "@wordpress/element": "^2.1.8", 501 "@wordpress/format-library": "^1.2. 4",501 "@wordpress/format-library": "^1.2.6", 502 502 "@wordpress/hooks": "^2.0.3", 503 503 "@wordpress/i18n": "^3.1.0", 504 504 "@wordpress/keycodes": "^2.0.5", 505 "@wordpress/nux": "^3.0. 2",505 "@wordpress/nux": "^3.0.4", 506 506 "@wordpress/plugins": "^2.0.9", 507 507 "@wordpress/url": "^2.3.1", … … 513 513 }, 514 514 "@wordpress/editor": { 515 "version": "9.0. 1",516 "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-9.0. 1.tgz",517 "integrity": "sha512- ZhihGx9huZkJfKRM5dlzesmjoC0Tcl7LwdMC4UXjQSey7blriRGrEMUdhLikbqdLuK1/tVNA2HHIlHUaRBAMMA==",515 "version": "9.0.3", 516 "resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-9.0.3.tgz", 517 "integrity": "sha512-Iz2B2JccsluiV0CdIkeH7sdl+3JcM7u9OqQSRC+0G2gfq8c09c98BE9myRUN16EVvL6zf025DzRU3hSx9r3AbQ==", 518 518 "requires": { 519 519 "@babel/runtime": "^7.0.0", … … 522 522 "@wordpress/blob": "^2.1.0", 523 523 "@wordpress/blocks": "^6.0.2", 524 "@wordpress/components": "^7.0. 1",524 "@wordpress/components": "^7.0.3", 525 525 "@wordpress/compose": "^3.0.0", 526 526 "@wordpress/core-data": "^2.0.14", … … 536 536 "@wordpress/keycodes": "^2.0.5", 537 537 "@wordpress/notices": "^1.1.0", 538 "@wordpress/nux": "^3.0. 2",538 "@wordpress/nux": "^3.0.4", 539 539 "@wordpress/token-list": "^1.1.0", 540 540 "@wordpress/url": "^2.3.1", … … 618 618 }, 619 619 "@wordpress/format-library": { 620 "version": "1.2. 4",621 "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-1.2. 4.tgz",622 "integrity": "sha512- zHkYSu01Qpzc0UNAYTe/X39tzCv3ANPeQpdEGKyPOjhNoUi7qYh26Yheas4gWrx2pOs4tG3DfGDbFMIvgPiwZw==",620 "version": "1.2.6", 621 "resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-1.2.6.tgz", 622 "integrity": "sha512-8GkrMRSZ287qotsYzJh0kzDRjDAYJLicwbSRSv4AR2+4dSW6ZX1CK2jt/ihxg5cbqxMitPPTqRA0PmUk+AtdDA==", 623 623 "requires": { 624 624 "@babel/runtime": "^7.0.0", 625 "@wordpress/components": "^7.0. 1",625 "@wordpress/components": "^7.0.3", 626 626 "@wordpress/dom": "^2.0.7", 627 "@wordpress/editor": "^9.0. 1",627 "@wordpress/editor": "^9.0.3", 628 628 "@wordpress/element": "^2.1.8", 629 629 "@wordpress/i18n": "^3.1.0", … … 699 699 }, 700 700 "@wordpress/list-reusable-blocks": { 701 "version": "1.1.1 4",702 "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-1.1.1 4.tgz",703 "integrity": "sha512- dRoxJHTClp6tQ5w4RjrLaJTdTkI0tU9do4gz3MNcTi6C/UAE/s/kc5pr6bEmm2hNHsLLhRQPExrNPwh98S7KaA==",701 "version": "1.1.16", 702 "resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-1.1.16.tgz", 703 "integrity": "sha512-kkamXKC6lp7ZddFt+VPOaiTftXfldU6qiRNab9JU9BXBD0XmyWl1Ee24RjQtO9ILA8UK9OpYsYCAMP/LSA1Cgg==", 704 704 "requires": { 705 705 "@babel/runtime": "^7.0.0", 706 706 "@wordpress/api-fetch": "^2.2.5", 707 "@wordpress/components": "^7.0. 1",707 "@wordpress/components": "^7.0.3", 708 708 "@wordpress/compose": "^3.0.0", 709 709 "@wordpress/element": "^2.1.8", … … 724 724 }, 725 725 "@wordpress/nux": { 726 "version": "3.0. 2",727 "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-3.0. 2.tgz",728 "integrity": "sha512- La82tFww/UzWjywaFODvZ8YODvDK4GeX8ckkaP1zFk0UelkS8gRZdaWDfkEsBzbKHyhZj3JJGT1WrM1/JJYKFw==",726 "version": "3.0.4", 727 "resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-3.0.4.tgz", 728 "integrity": "sha512-0GjMmEI8GM/lbRLAxPel6fMjf5rbEB9wGRzVr1dDD7Ak6CfgVfasK/B9UMgngcO0sbCCXkHopjd8QQhUobffPg==", 729 729 "requires": { 730 730 "@babel/runtime": "^7.0.0", 731 "@wordpress/components": "^7.0. 1",731 "@wordpress/components": "^7.0.3", 732 732 "@wordpress/compose": "^3.0.0", 733 733 "@wordpress/data": "^4.0.1", … … 11600 11600 "debug": "^2.2.0", 11601 11601 "mkdirp": "0.5.x" 11602 }, 11603 "dependencies": { 11604 "async": { 11605 "version": "1.5.2", 11606 "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz", 11607 "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", 11608 "dev": true 11609 } 11602 11610 } 11603 11611 }, … … 12993 13001 "regjsgen": { 12994 13002 "version": "0.2.0", 12995 "resolved": "http ://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",13003 "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", 12996 13004 "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" 12997 13005 }, -
trunk/package.json
r44262 r44273 61 61 "@wordpress/autop": "^2.0.2", 62 62 "@wordpress/blob": "^2.1.0", 63 "@wordpress/block-library": "^2.2. 6",63 "@wordpress/block-library": "^2.2.8", 64 64 "@wordpress/block-serialization-default-parser": "^2.0.0", 65 65 "@wordpress/blocks": "^6.0.2", 66 "@wordpress/components": "^7.0. 1",66 "@wordpress/components": "^7.0.3", 67 67 "@wordpress/compose": "^3.0.0", 68 68 "@wordpress/core-data": "^2.0.14", … … 72 72 "@wordpress/dom": "^2.0.7", 73 73 "@wordpress/dom-ready": "^2.0.2", 74 "@wordpress/edit-post": "^3.1. 1",75 "@wordpress/editor": "^9.0. 1",74 "@wordpress/edit-post": "^3.1.3", 75 "@wordpress/editor": "^9.0.3", 76 76 "@wordpress/element": "^2.1.8", 77 77 "@wordpress/escape-html": "^1.0.1", 78 "@wordpress/format-library": "^1.2. 4",78 "@wordpress/format-library": "^1.2.6", 79 79 "@wordpress/hooks": "^2.0.3", 80 80 "@wordpress/html-entities": "^2.0.3", … … 82 82 "@wordpress/is-shallow-equal": "^1.1.4", 83 83 "@wordpress/keycodes": "^2.0.5", 84 "@wordpress/list-reusable-blocks": "^1.1.1 4",84 "@wordpress/list-reusable-blocks": "^1.1.16", 85 85 "@wordpress/notices": "^1.1.0", 86 "@wordpress/nux": "^3.0. 2",86 "@wordpress/nux": "^3.0.4", 87 87 "@wordpress/plugins": "^2.0.9", 88 88 "@wordpress/redux-routine": "^3.0.3", -
trunk/src/wp-admin/edit-form-blocks.php
r44270 r44273 179 179 ); 180 180 181 /* 182 * Set a locale specific default font. 183 * Translators: Use this to specify the CSS font family for the default font 184 */ 181 /* Translators: Use this to specify the CSS font family for the default font */ 185 182 $locale_font_family = esc_html_x( 'Noto Serif', 'CSS Font Family for Editor Font' ); 186 183 $styles[] = array( -
trunk/src/wp-includes/blocks/archives.php
r44262 r44273 3 3 * Server-side rendering of the `core/archives` block. 4 4 * 5 * @package gutenberg5 * @package WordPress 6 6 */ 7 7 … … 33 33 34 34 $dropdown_id = esc_attr( uniqid( 'wp-block-archives-' ) ); 35 $title = __( 'Archives' , 'default');35 $title = __( 'Archives' ); 36 36 37 37 /** This filter is documented in wp-includes/widgets/class-wp-widget-archives.php */ … … 51 51 switch ( $dropdown_args['type'] ) { 52 52 case 'yearly': 53 $label = __( 'Select Year' , 'default');53 $label = __( 'Select Year' ); 54 54 break; 55 55 case 'monthly': 56 $label = __( 'Select Month' , 'default');56 $label = __( 'Select Month' ); 57 57 break; 58 58 case 'daily': 59 $label = __( 'Select Day' , 'default');59 $label = __( 'Select Day' ); 60 60 break; 61 61 case 'weekly': 62 $label = __( 'Select Week' , 'default');62 $label = __( 'Select Week' ); 63 63 break; 64 64 default: 65 $label = __( 'Select Post' , 'default');65 $label = __( 'Select Post' ); 66 66 break; 67 67 } … … 102 102 '<div class="%1$s">%2$s</div>', 103 103 $classnames, 104 __( 'No archives to show.' , 'default')104 __( 'No archives to show.' ) 105 105 ); 106 106 } else { -
trunk/src/wp-includes/blocks/block.php
r43752 r44273 3 3 * Server-side rendering of the `core/block` block. 4 4 * 5 * @package gutenberg5 * @package WordPress 6 6 */ 7 7 -
trunk/src/wp-includes/blocks/categories.php
r44262 r44273 3 3 * Server-side rendering of the `core/categories` block. 4 4 * 5 * @package gutenberg5 * @package WordPress 6 6 */ 7 7 … … 28 28 $id = 'wp-block-categories-' . $block_id; 29 29 $args['id'] = $id; 30 $args['show_option_none'] = __( 'Select Category' , 'default');30 $args['show_option_none'] = __( 'Select Category' ); 31 31 $wrapper_markup = '<div class="%1$s">%2$s</div>'; 32 32 $items_markup = wp_dropdown_categories( $args ); -
trunk/src/wp-includes/blocks/latest-comments.php
r44262 r44273 3 3 * Server-side rendering of the `core/latest-comments` block. 4 4 * 5 * @package gutenberg5 * @package WordPress 6 6 */ 7 7 8 if ( ! function_exists( ' gutenberg_draft_or_post_title' ) ) {8 if ( ! function_exists( 'wp_latest_comments_draft_or_post_title' ) ) { 9 9 /** 10 10 * Get the post title. … … 27 27 * @return string The post title if set; "(no title)" if no title is set. 28 28 */ 29 function gutenberg_draft_or_post_title( $post = 0 ) {29 function wp_latest_comments_draft_or_post_title( $post = 0 ) { 30 30 $title = get_the_title( $post ); 31 31 if ( empty( $title ) ) { 32 $title = __( '(no title)' , 'default');32 $title = __( '(no title)' ); 33 33 } 34 34 return esc_html( $title ); … … 43 43 * @return string Returns the post content with latest comments added. 44 44 */ 45 function gutenberg_render_block_core_latest_comments( $attributes = array() ) {45 function render_block_core_latest_comments( $attributes = array() ) { 46 46 // This filter is documented in wp-includes/widgets/class-wp-widget-recent-comments.php. 47 47 $comments = get_comments( … … 95 95 // `_draft_or_post_title` calls `esc_html()` so we don't need to wrap that call in 96 96 // `esc_html`. 97 $post_title = '<a class="wp-block-latest-comments__comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '">' . gutenberg_draft_or_post_title( $comment->comment_post_ID ) . '</a>';97 $post_title = '<a class="wp-block-latest-comments__comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '">' . wp_latest_comments_draft_or_post_title( $comment->comment_post_ID ) . '</a>'; 98 98 99 99 $list_items_markup .= sprintf( 100 100 /* translators: 1: author name (inside <a> or <span> tag, based on if they have a URL), 2: post title related to this comment */ 101 __( '%1$s on %2$s' , 'default'),101 __( '%1$s on %2$s' ), 102 102 $author_markup, 103 103 $post_title … … 144 144 '<div class="%1$s">%2$s</div>', 145 145 $classnames, 146 __( 'No comments to show.' , 'default')146 __( 'No comments to show.' ) 147 147 ); 148 148 … … 180 180 ), 181 181 ), 182 'render_callback' => ' gutenberg_render_block_core_latest_comments',182 'render_callback' => 'render_block_core_latest_comments', 183 183 ) 184 184 ); -
trunk/src/wp-includes/blocks/latest-posts.php
r44262 r44273 3 3 * Server-side rendering of the `core/latest-posts` block. 4 4 * 5 * @package gutenberg5 * @package WordPress 6 6 */ 7 7 … … 22 22 23 23 if ( isset( $attributes['categories'] ) ) { 24 $args['categor ies'] = $attributes['categories'];24 $args['category'] = $attributes['categories']; 25 25 } 26 26 … … 34 34 $title = get_the_title( $post_id ); 35 35 if ( ! $title ) { 36 $title = __( '(Untitled)' , 'default');36 $title = __( '(Untitled)' ); 37 37 } 38 38 $list_items_markup .= sprintf( -
trunk/src/wp-includes/blocks/shortcode.php
r43752 r44273 3 3 * Server-side rendering of the `core/shortcode` block. 4 4 * 5 * @package gutenberg5 * @package WordPress 6 6 */ 7 7 -
trunk/src/wp-includes/script-loader.php
r44271 r44273 211 211 'a11y' => '2.0.2', 212 212 'annotations' => '1.0.3', 213 'api-fetch' => '2.2.5',214 213 'autop' => '2.0.2', 215 214 'blob' => '2.1.0', 216 'block-library' => '2.2. 6',215 'block-library' => '2.2.8', 217 216 'block-serialization-default-parser' => '2.0.0', 218 217 'blocks' => '6.0.2', 219 'components' => '7.0. 1',218 'components' => '7.0.3', 220 219 'compose' => '3.0.0', 221 220 'core-data' => '2.0.14', … … 225 224 'dom' => '2.0.7', 226 225 'dom-ready' => '2.0.2', 227 'edit-post' => '3.1. 1',228 'editor' => '9.0. 1',226 'edit-post' => '3.1.3', 227 'editor' => '9.0.3', 229 228 'element' => '2.1.8', 230 229 'escape-html' => '1.0.1', 231 'format-library' => '1.2. 4',230 'format-library' => '1.2.6', 232 231 'hooks' => '2.0.3', 233 232 'html-entities' => '2.0.3', … … 235 234 'is-shallow-equal' => '1.1.4', 236 235 'keycodes' => '2.0.5', 237 'list-reusable-blocks' => '1.1.1 4',236 'list-reusable-blocks' => '1.1.16', 238 237 'notices' => '1.1.0', 239 'nux' => '3.0. 2',238 'nux' => '3.0.4', 240 239 'plugins' => '2.0.9', 241 240 'redux-routine' => '3.0.3', … … 278 277 'editor', 279 278 'lodash', 280 'moment',281 279 'wp-api-fetch', 282 280 'wp-autop',
Note: See TracChangeset
for help on using the changeset viewer.