Changeset 2048

Timestamp:

11/06/2015 07:45:48 PM (11 years ago)

Author:

obenland

Message:

Translate: Waiting strings should be waiting and fuzzy strings.

Continues to use untranslated strings to determine sort order of languages.

See #1365.

File:

• sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-projects-wp-plugins-overview.php (modified) (3 diffs)

sites/trunk/translate.wordpress.org/includes/gp-plugins/wporg-projects-wp-plugins-overview.php

@@ -16 +16 @@
                                 path, locale, locale_slug,
                                 (100 * stats.current/stats.all) as percent_complete,
-                                stats.untranslated as waiting_strings
+                                stats.waiting+stats.fuzzy as waiting_strings,
+                                stats.untranslated as untranslated
                         FROM {$gpdb->prefix}project_translation_status stats
                                 LEFT JOIN {$gpdb->prefix}projects p ON stats.project_id = p.id
@@ -41 +42 @@
                         $translation_locale_statuses[ $locale_key ][ $sub_project ] = ( $percent_complete > 50 ) ? floor( $percent_complete ) : ceil( $percent_complete );
 
-                        // Increment the amount of waiting strings.
+                        // Increment the amount of waiting and untranslated strings.
                         if ( ! isset( $translation_locale_statuses[ $locale_key ]['waiting'] ) ) {
                                 $translation_locale_statuses[ $locale_key ]['waiting'] = 0;
                         }
+                        if ( ! isset( $translation_locale_statuses[ $locale_key ]['untranslated'] ) ) {
+                                $translation_locale_statuses[ $locale_key ]['untranslated'] = 0;
+                        }
                         $translation_locale_statuses[ $locale_key ]['waiting'] += (int) $set->waiting_strings;
+                        $translation_locale_statuses[ $locale_key ]['untranslated'] += (int) $set->untranslated;
+
 
                         ksort( $translation_locale_statuses[ $locale_key ], SORT_NATURAL );
@@ -53 +59 @@
                 // Order by waiting strings, ascending.
                 uksort( $translation_locale_statuses, function ( $a, $b ) use ( $translation_locale_statuses ) {
-                        if ( $translation_locale_statuses[ $a ]['waiting'] > $translation_locale_statuses[ $b ]['waiting'] ) {
+                        if ( $translation_locale_statuses[ $a ]['untranslated'] > $translation_locale_statuses[ $b ]['untranslated'] ) {
                                 return 1;
-                        } elseif ( $translation_locale_statuses[ $a ]['waiting'] == $translation_locale_statuses[ $b ]['waiting'] ) {
+                        } elseif ( $translation_locale_statuses[ $a ]['untranslated'] == $translation_locale_statuses[ $b ]['untranslated'] ) {
                                 return strnatcmp( $a, $b );
                         } else {