Making WordPress.org

Ticket #6600: 6600.diff

File 6600.diff, 2.7 KB (added by ryelle, 23 months ago)
  • lang-guess-ajax.php

     
    99require dirname( __DIR__ ) . '/define.php';
    1010require WPORGPATH . 'hyperdb/bb-10-hyper-db.php';
    1111require WPORGPATH . 'object-cache.php';
     12require WPORGPATH . 'wp-includes/formatting.php';
    1213wp_cache_init();
    1314require __DIR__ . '/class-guess-lang.php';
    1415require GLOTPRESS_LOCALES_PATH;
     
    7879        }
    7980
    8081        if ( is_array( $guesses ) && ! empty( $guesses ) ) {
    81                 $num_guesses = count( $guesses );
    82 
    8382                if ( $is_forums ) {
    84                         if ( 1 === $num_guesses ) {
    85                                 $string = translate_gp( 'WordPress support forums are also available in %s.', $guesses[0]['locale'] );
    86                         } else {
    87                                 $string = translate_gp( 'WordPress support forums are also available in %s (also %s).', $guesses[0]['locale'] );
    88                         }
     83                        $string = translate_gp( 'WordPress support forums are also available in %s.', $guesses[0]['locale'] );
    8984                } else {
    90                         if ( 1 === $num_guesses ) {
    91                                 $string = translate_gp( 'WordPress is also available in %s.', $guesses[0]['locale'] );
    92                         } else {
    93                                 $string = translate_gp( 'WordPress is also available in %s (also %s).', $guesses['0']['locale'] );
    94                         }
     85                        $string = translate_gp( 'WordPress is also available in %s.', $guesses[0]['locale'] );
    9586                }
    9687
    9788                $translated = array();
     
    10495                                        $path = '/downloads/';
    10596                                }
    10697
    107                                 $translated[] = "<a href='https://{$guess['subdomain']}.wordpress.org{$path}'>{$guess['name']}</a>";
     98                                $name = \GP_Locales::by_field( 'wp_locale', $guess['locale'] )->native_name;
     99                                $translated[] = "<a href='https://{$guess['subdomain']}.wordpress.org{$path}'>{$name}</a>";
    108100                        }
    109101                }
    110102
     
    114106                }
    115107
    116108                echo '<div id="lang-guess">';
    117 
    118                 if ( 1 === $num_guesses ) {
    119                         printf( $string, $translated[0] );
    120                 } else {
    121                         $main_language = array_shift( $translated );
    122                         printf( $string, $main_language, implode( ', ', $translated ) );
    123                 }
    124 
     109                printf( $string, wp_sprintf_l( '%l', $translated ) );
    125110                echo '</div>';
    126111        }
    127112}
     
    130115        global $wpdb;
    131116        $strings = array(
    132117                204369 => 'WordPress support forums are also available in %s.',
    133                 204370 => 'WordPress support forums are also available in %s (also %s).',
    134118                204371 => 'WordPress is also available in %s.',
    135                 204372 => 'WordPress is also available in %s (also %s).',
    136119        );
    137120
    138121        $original_id = array_search( $string, $strings, true );
     
    199182exit;
    200183
    201184__( 'WordPress support forums are also available in %s.' );
    202 __( 'WordPress support forums are also available in %s (also %s).' );
    203185__( 'WordPress is also available in %s.' );
    204 __( 'WordPress is also available in %s (also %s).' );
    205