Changeset 4490

Timestamp:

12/06/2016 06:12:53 PM (8 years ago)

Author:

ocean90

Message:

Credits API: Add support for language variants.

Fixes #1768.

Location:

sites/trunk/api.wordpress.org/public_html/core/credits

Files:

• index.php (modified) (1 diff)
• wp-credits.php (modified) (3 diffs)

sites/trunk/api.wordpress.org/public_html/core/credits/index.php

@@ -44 +44 @@
 if ( ( isset( $_GET['locale'] ) && 'en_US' != $_GET['locale'] ) || ( 'cli' == php_sapi_name() && isset( $argv[2] ) ) ) {
     require GLOTPRESS_LOCALES_PATH;
+
+    // Temporary: Add language variants to the list of GlotPress locales.
+    $GLOBALS['gp_locales'] = new GP_Locales();
+
+    $de_formal = clone GP_Locales::by_field( 'wp_locale', 'de_DE' );
+    $de_formal->english_name = 'German (Formal)';
+    $de_formal->native_name = 'Deutsch (Sie)';
+    $de_formal->slug = 'de/formal';
+    $de_formal->wp_locale = 'de_DE_formal';
+    $GLOBALS['gp_locales']->locales['de/formal'] = $de_formal;
+
+    $nl_formal = clone GP_Locales::by_field( 'wp_locale', 'nl_NL' );
+    $nl_formal->english_name = 'Dutch (Formal)';
+    $nl_formal->native_name = 'Nederlands (Formeel)';
+    $nl_formal->slug = 'nl/formal';
+    $nl_formal->wp_locale = 'nl_NL_formal';
+    $GLOBALS['gp_locales']->locales['nl/formal'] = $nl_formal;
+
+    $de_ch_informal = clone GP_Locales::by_field( 'wp_locale', 'de_CH' );
+    $de_ch_informal->english_name = 'German (Switzerland, Informal)';
+    $de_ch_informal->native_name = 'Deutsch (Schweiz, Du)';
+    $de_ch_informal->slug = 'de-ch/informal';
+    $de_ch_informal->wp_locale = 'de_CH_informal';
+    $GLOBALS['gp_locales']->locales['de-ch/informal'] = $de_ch_informal;
+
     $gp_locale = GP_Locales::by_field( 'wp_locale', isset( $argv[2] ) ? $argv[2] : $_GET['locale'] );
     if ( $gp_locale ) {

sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php

@@ -143 +143 @@
         $path = 'wp/' . $path;
 
-        $locale = $gp_locale->slug;
+        $locale_parts = explode( '/', $gp_locale->slug );
+        $locale = $locale_parts[0];
+        $slug   = isset( $locale_parts[1] ) ? $locale_parts[1] : 'default';
 
         $path   = $wpdb->escape( like_escape( $path ) . '%' );
         $locale = $wpdb->escape( $locale );
+        $slug   = $wpdb->escape( $slug );
 
         $date = $wpdb->prepare( "AND tt.date_added > %s", $this->get_start_date() );
@@ -160 +163 @@
             WHERE tp.path LIKE '$path'
                 AND tts.locale = '$locale'
-                AND tts.slug = 'default'
+                AND tts.slug = '$slug'
                 AND ( tt.status = 'current' || tt.status = 'old' )
                 AND tt.user_id IS NOT NULL
@@ -220 +223 @@
         $project_ids[] = '0'; // Global validators
 
+        $locale_parts = explode( '/', $gp_locale->slug );
+        $locale = $locale_parts[0];
+
         return $wpdb->get_col( $wpdb->prepare( "
             SELECT `user_id` FROM `translate_translation_editors`
             WHERE `project_id` IN (" . implode( ', ', $project_ids ) . ") AND `locale` = %s
-        ", $gp_locale->slug ) );
+        ", $locale ) );
     }