<!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>[5570] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Move hreflang from the theme into the plugin-directory plugin, change it to only show translated languages instead of all languages, in order to make google behave better.</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/5570">5570</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/5570","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>Otto42</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-06-15 12:57:31 +0000 (Thu, 15 Jun 2017)</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'>Plugin Directory: Move hreflang from the theme into the plugin-directory plugin, change it to only show translated languages instead of all languages, in order to make google behave better. Props @joostdevalk, @otto42. Fixes <a href="http://meta.trac.wordpress.org/ticket/2870">#2870</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstemplatephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php      2017-06-15 12:56:23 UTC (rev 5569)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php        2017-06-15 12:57:31 UTC (rev 5570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,6 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'single_term_title', array( $this, 'filter_single_term_title' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'the_content', array( $this, 'filter_rel_nofollow' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'wp_head', array( Template::class, 'json_ld_schema' ), 1 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                add_action( 'wp_head', array( Template::class, 'hreflang_link_attributes' ), 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Cron tasks.
</span><span class="cx" style="display: block; padding: 0 10px">                new Jobs\Manager();
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php      2017-06-15 12:56:23 UTC (rev 5569)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php        2017-06-15 12:57:31 UTC (rev 5570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -629,4 +629,81 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        ( $favorited ? 'unfavorite' : 'favorite' ) => '1'
</span><span class="cx" style="display: block; padding: 0 10px">                ), home_url( 'wp-json/plugins/v1/plugin/' . $post->post_name . '/favorite' ) );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+       /**
+        * Adds hreflang link attributes to WordPress.org pages.
+        *
+        * @link https://support.google.com/webmasters/answer/189077?hl=en Use hreflang for language and regional URLs.
+        * @link https://sites.google.com/site/webmasterhelpforum/en/faq-internationalisation FAQ: Internationalisation.
+        */
+       public function hreflang_link_attributes() {
+               global $wpdb;
+
+               wp_cache_add_global_groups( array( 'locale-associations' ) );
+
+               if ( false === ( $sites = wp_cache_get( 'local-sites', 'locale-associations' ) ) ) {
+
+                       // get subdomain/locale associations
+                       $subdomains = $wpdb->get_results( 'SELECT locale, subdomain FROM locales', OBJECT_K ); 
+
+                       $sites = Plugin_I18n::instance()->get_locales();
+
+                       require_once GLOTPRESS_LOCALES_PATH;
+
+                       foreach ( $sites as $key => $site ) {
+                               $gp_locale = \GP_Locales::by_field( 'wp_locale', $site->wp_locale );
+                               if ( empty( $gp_locale ) ) {
+                                       unset( $sites[ $key ] );
+                                       continue;
+                               }
+
+                               $sites[ $key ]->subdomain = $subdomains[ $site->wp_locale ]->subdomain;
+
+                               // Note that Google only supports ISO 639-1 codes.
+                               if ( isset( $gp_locale->lang_code_iso_639_1 ) && isset( $gp_locale->country_code ) ) {
+                                       $hreflang = $gp_locale->lang_code_iso_639_1 . '-' . $gp_locale->country_code;
+                               } elseif ( isset( $gp_locale->lang_code_iso_639_1 ) ) {
+                                       $hreflang = $gp_locale->lang_code_iso_639_1;
+                               } elseif ( isset( $gp_locale->lang_code_iso_639_2 ) ) {
+                                       $hreflang = $gp_locale->lang_code_iso_639_2;
+                               } elseif ( isset( $gp_locale->lang_code_iso_639_3 ) ) {
+                                       $hreflang = $gp_locale->lang_code_iso_639_3;
+                               }
+
+                               if ( $hreflang ) {
+                                       $sites[ $key ]->hreflang = strtolower( $hreflang );
+                               } else {
+                                       unset( $sites[ $key ] );
+                               }
+                       }
+
+                       // Add en_US to the list of sites.
+                       $sites['en_US'] = (object) array(
+                               'locale'    => 'en_US',
+                               'hreflang'  => 'en',
+                               'subdomain' => ''
+                       );
+
+                       uasort( $sites, function( $a, $b ) {
+                               return strcasecmp( $a->hreflang, $b->hreflang );
+                       } );
+
+
+                       wp_cache_set( 'local-sites', $sites, 'locale-associations' );
+               }
+
+               foreach ( $sites as $site ) {
+                       $url = sprintf(
+                               'https://%swordpress.org%s',
+                               $site->subdomain ? "{$site->subdomain}." : '',
+                               $_SERVER[ 'REQUEST_URI' ]
+                       );
+
+                       printf(
+                               '<link rel="alternate" href="%s" hreflang="%s" />' . "\n",
+                               esc_url( $url ),
+                               esc_attr( $site->hreflang )
+                       );
+               }
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>

</body>
</html>