Changeset 11346

Timestamp:

11/29/2021 05:33:48 PM (3 years ago)

Author:

ocean90

Message:

Translate, Consistency: Group results by translation and project path.

Fixes #5967.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-consistency.php (modified) (2 diffs)

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

@@ -169 +169 @@
         }
 
-        // Group by translation. Done in PHP because it's faster as in MySQL.
+        // Group by translation and project path. Done in PHP because it's faster as in MySQL.
         usort( $results, [ $this, '_sort_callback' ] );
 
@@ -176 +176 @@
 
     public function _sort_callback( $a, $b ) {
-        return strnatcmp( $a->translation, $b->translation );
+        $sort = strnatcmp( $a->translation . $a->original_context, $b->translation . $b->original_context );
+        if ( 0 === $sort ) {
+            $sort = strnatcmp( $a->project_path, $b->project_path );
+        }
+
+        return $sort;
     }
 }