Ticket #6600: 6600.diff
File 6600.diff, 2.7 KB (added by , 23 months ago) |
---|
-
lang-guess-ajax.php
9 9 require dirname( __DIR__ ) . '/define.php'; 10 10 require WPORGPATH . 'hyperdb/bb-10-hyper-db.php'; 11 11 require WPORGPATH . 'object-cache.php'; 12 require WPORGPATH . 'wp-includes/formatting.php'; 12 13 wp_cache_init(); 13 14 require __DIR__ . '/class-guess-lang.php'; 14 15 require GLOTPRESS_LOCALES_PATH; … … 78 79 } 79 80 80 81 if ( is_array( $guesses ) && ! empty( $guesses ) ) { 81 $num_guesses = count( $guesses );82 83 82 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'] ); 89 84 } 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'] ); 95 86 } 96 87 97 88 $translated = array(); … … 104 95 $path = '/downloads/'; 105 96 } 106 97 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>"; 108 100 } 109 101 } 110 102 … … 114 106 } 115 107 116 108 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 ) ); 125 110 echo '</div>'; 126 111 } 127 112 } … … 130 115 global $wpdb; 131 116 $strings = array( 132 117 204369 => 'WordPress support forums are also available in %s.', 133 204370 => 'WordPress support forums are also available in %s (also %s).',134 118 204371 => 'WordPress is also available in %s.', 135 204372 => 'WordPress is also available in %s (also %s).',136 119 ); 137 120 138 121 $original_id = array_search( $string, $strings, true ); … … 199 182 exit; 200 183 201 184 __( 'WordPress support forums are also available in %s.' ); 202 __( 'WordPress support forums are also available in %s (also %s).' );203 185 __( 'WordPress is also available in %s.' ); 204 __( 'WordPress is also available in %s (also %s).' );205