Fix usage of gutenberg_get_jed_locale_data() for WP 5.0

Fixes #1618
ampproject · Nov 16, 2018 · c5b505a · c5b505a
1 parent 34301c1
commit c5b505a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/includes/admin/class-amp-editor-blocks.php b/includes/admin/class-amp-editor-blocks.php
@@ -155,9 +155,10 @@ public function enqueue_block_editor_assets() {
 			) ) )
 		);
 
+		$locale_data = function_exists( 'wp_get_jed_locale_data' ) ? wp_get_jed_locale_data( 'amp' ) : gutenberg_get_jed_locale_data( 'amp' );
 		wp_add_inline_script(
 			'wp-i18n',
-			'wp.i18n.setLocaleData( ' . wp_json_encode( gutenberg_get_jed_locale_data( 'amp' ) ) . ', "amp" );',
+			'wp.i18n.setLocaleData( ' . wp_json_encode( $locale_data ) . ', "amp" );',
 			'after'
 		);
 	}

diff --git a/includes/admin/class-amp-post-meta-box.php b/includes/admin/class-amp-post-meta-box.php
@@ -176,7 +176,6 @@ public function enqueue_admin_assets() {
 
 	/**
 	 * Enqueues block assets.
-	 * The name of gutenberg_get_jed_locale_data() may change, as the Gutenberg Core merge approaches.
 	 *
 	 * @since 1.0
 	 */
@@ -203,9 +202,7 @@ public function enqueue_block_assets() {
 			'errorMessages' => $error_messages,
 		);
 
-		if ( function_exists( 'gutenberg_get_jed_locale_data' ) ) {
-			$script_data['i18n'] = gutenberg_get_jed_locale_data( 'amp' );
-		}
+		$script_data['i18n'] = function_exists( 'wp_get_jed_locale_data' ) ? wp_get_jed_locale_data( 'amp' ) : gutenberg_get_jed_locale_data( 'amp' );
 
 		wp_add_inline_script(
 			self::BLOCK_ASSET_HANDLE,

diff --git a/includes/validation/class-amp-validation-manager.php b/includes/validation/class-amp-validation-manager.php
@@ -1916,7 +1916,7 @@ public static function enqueue_block_validation() {
 		);
 
 		$data = wp_json_encode( array(
-			'i18n'                 => gutenberg_get_jed_locale_data( 'amp' ),
+			'i18n'                 => function_exists( 'wp_get_jed_locale_data' ) ? wp_get_jed_locale_data( 'amp' ) : gutenberg_get_jed_locale_data( 'amp' ),
 			'ampValidityRestField' => self::VALIDITY_REST_FIELD_NAME,
 			'isCanonical'          => amp_is_canonical(),
 		) );

diff --git a/tests/test-class-amp-meta-box.php b/tests/test-class-amp-meta-box.php
@@ -77,7 +77,7 @@ public function test_enqueue_admin_assets() {
 	 * @see AMP_Post_Meta_Box::enqueue_block_assets()
 	 */
 	public function test_enqueue_block_assets() {
-		if ( ! function_exists( 'gutenberg_get_jed_locale_data' ) ) {
+		if ( ! function_exists( 'wp_get_jed_locale_data' ) && ! function_exists( 'gutenberg_get_jed_locale_data' ) ) {
 			$this->markTestSkipped( 'Gutenberg is not available' );
 		}