Changeset 12176

Timestamp:

11/01/2022 06:41:55 AM (2 years ago)

Author:

dd32

Message:

Translate: Ensure that /api/projects/wp-plugins/{$plugin}/dev/ returns translation sets with appropriate wp_locale fields.

Currently GlotPress doesn't support locale variants, resulting in API endpoints returning multiple sets with the same wp_locale value. This fixes that.

This will result in the plugin directory correctly listing hreflang tags, as it'll no longer list variants as their base locale.

Fixes #4367.

Location:

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

Files:

• plugin-directory/class-plugin-i18n.php (modified) (1 diff)
• wporg-gp-customizations/inc/class-plugin.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-i18n.php

@@ -461 +461 @@
         $translation_sets = $this->cache_get( $post->post_name, $branch, $cache_suffix );
         if ( false === $translation_sets ) {
-            $api_url  = esc_url_raw( 'https://translate.wordpress.org/api/projects/wp-plugins/' . $post->post_name . '/' . $branch, [ 'https' ] );
+            $api_url  = esc_url_raw( 'https://translate.wordpress.org/api/projects/wp-plugins/' . $post->post_name . '/' . $branch . '/', [ 'https' ] );
             $response = wp_remote_get( $api_url );
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/inc/class-plugin.php

@@ -77 +77 @@
         //Locales\Serbian_Latin::init();
 
+        // Correct `WP_Locale` for variant locales in project lists.
+        add_filter( 'gp_translation_sets_sort', [ $this, 'filter_gp_translation_sets_sort' ] );
+
         if ( defined( 'WP_CLI' ) && WP_CLI ) {
             $this->register_cli_commands();
@@ -571 +574 @@
         return $content;
     }
+
+    /**
+     * Filter the project translation set list to have correct WP_Locale fields for variants.
+     *
+     * This also affects the API output, so as not to have duplicate `wp_locale` fields with variants.
+     *
+     * @see https://meta.trac.wordpress.org/ticket/4367
+     *
+     * @param array $translation_sets The translation sets.
+     * @return array Filtered translation sets.
+     */
+    function filter_gp_translation_sets_sort( $translation_sets ) {
+        foreach ( $translation_sets as $set ) {
+            if ( 'default' !== $set->slug && ! str_contains( $set->wp_locale, $set->slug ) ) {
+                $set->wp_locale .= '_' . $set->slug;
+            }
+        }
+
+        return $translation_sets;
+    }
 }