<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[4490] sites/trunk/api.wordpress.org/public_html/core/credits: Credits API: Add support for language variants.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/4490">4490</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/4490","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-12-06 18:12:53 +0000 (Tue, 06 Dec 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Credits API: Add support for language variants.
Fixes <a href="http://meta.trac.wordpress.org/ticket/1768">#1768</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcorecreditsindexphp">sites/trunk/api.wordpress.org/public_html/core/credits/index.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcorecreditswpcreditsphp">sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlcorecreditsindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/credits/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/credits/index.php 2016-12-06 15:02:36 UTC (rev 4489)
+++ sites/trunk/api.wordpress.org/public_html/core/credits/index.php 2016-12-06 18:12:53 UTC (rev 4490)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,6 +43,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Convert a locale from a WP locale to a GP locale.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( isset( $_GET['locale'] ) && 'en_US' != $_GET['locale'] ) || ( 'cli' == php_sapi_name() && isset( $argv[2] ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require GLOTPRESS_LOCALES_PATH;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // 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;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $gp_locale = GP_Locales::by_field( 'wp_locale', isset( $argv[2] ) ? $argv[2] : $_GET['locale'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $gp_locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = $gp_locale;
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlcorecreditswpcreditsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php 2016-12-06 15:02:36 UTC (rev 4489)
+++ sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php 2016-12-06 18:12:53 UTC (rev 4490)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,10 +142,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $path = 'wp/' . $path;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locale = $gp_locale->slug;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locale_parts = explode( '/', $gp_locale->slug );
+ $locale = $locale_parts[0];
+ $slug = isset( $locale_parts[1] ) ? $locale_parts[1] : 'default';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $path = $wpdb->escape( like_escape( $path ) . '%' );
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = $wpdb->escape( $locale );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slug = $wpdb->escape( $slug );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $date = $wpdb->prepare( "AND tt.date_added > %s", $this->get_start_date() );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $end_date = $this->get_end_date() )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,7 +162,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ON tp.id = tts.project_id
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE tp.path LIKE '$path'
</span><span class="cx" style="display: block; padding: 0 10px"> AND tts.locale = '$locale'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- AND tts.slug = 'default'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ AND tts.slug = '$slug'
</ins><span class="cx" style="display: block; padding: 0 10px"> AND ( tt.status = 'current' || tt.status = 'old' )
</span><span class="cx" style="display: block; padding: 0 10px"> AND tt.user_id IS NOT NULL
</span><span class="cx" style="display: block; padding: 0 10px"> $date" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,10 +222,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $project_ids[] = '0'; // Global validators
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locale_parts = explode( '/', $gp_locale->slug );
+ $locale = $locale_parts[0];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $wpdb->get_col( $wpdb->prepare( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT `user_id` FROM `translate_translation_editors`
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE `project_id` IN (" . implode( ', ', $project_ids ) . ") AND `locale` = %s
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ", $gp_locale->slug ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ", $locale ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> final protected function get_start_date() {
</span></span></pre>
</div>
</div>
</body>
</html>