<!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>[6972] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main: Main: About: Use the actual page title for translatable page titles.</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/6972">6972</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/6972","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>2018-03-29 16:39:13 +0000 (Thu, 29 Mar 2018)</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'>Main: About: Use the actual page title for translatable page titles.

Adds context to all page titles. Reverts parts of <a href="http://meta.trac.wordpress.org/changeset/6969">[6969]</a>.

See <a href="http://meta.trac.wordpress.org/ticket/3046">#3046</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincpagemetadescriptionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutaccessibilityphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-accessibility.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutdomainsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-domains.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutetiquettephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-etiquette.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutfeaturesphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-features.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageabouthistoryphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-history.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutlicensephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-license.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutlogosphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-logos.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutphilosophyphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-philosophy.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacyphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutrequirementsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-requirements.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutroadmapphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-roadmap.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutsecurityphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-security.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutstatsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-stats.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutswagphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-swag.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageabouttestimonialsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-testimonials.php</a></li>

<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainincpagemetadescriptionsphp"></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/themes/pub/wporg-main/inc/page-meta-descriptions.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/themes/pub/wporg-main/inc/page-meta-descriptions.php     2018-03-29 15:32:25 UTC (rev 6971)

+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/inc/page-meta-descriptions.php       2018-03-29 16:39:13 UTC (rev 6972)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,11 +12,10 @@

</span><span class="cx" style="display: block; padding: 0 10px">  *

<span class="cx" style="display: block; padding: 0 10px">  * This is also defined here to allow it to be used on pages where the page template is not included for that page, such as the embed template.

</span><span class="cx" style="display: block; padding: 0 10px">  *

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array       $tags Optional. Open Graph tags.

- * @param WP_Post|int $post Optional. Post object or ID.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $tags Optional. Open Graph tags.

</ins><span class="cx" style="display: block; padding: 0 10px">  * @return array Filtered Open Graph tags.

</span><span class="cx" style="display: block; padding: 0 10px">  */

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function custom_open_graph_tags( $tags = [], $post = null ) {

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function custom_open_graph_tags( $tags = [] ) {

</ins><span class="cx" style="display: block; padding: 0 10px">         $post = get_post( $post );

</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! $post || 'page' !== $post->post_type ) {

</span><span class="cx" style="display: block; padding: 0 10px">                return $tags;

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +120,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'jetpack_open_graph_tags', __NAMESPACE__ . '\custom_open_graph_tags' );

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> /**

<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Maps page titles to Open Graph data which are translatable strings.

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Maps page titles to translatable strings.

</ins><span class="cx" style="display: block; padding: 0 10px">  *

<span class="cx" style="display: block; padding: 0 10px">  * @param string      $title The post title.

<span class="cx" style="display: block; padding: 0 10px">  * @param WP_Post|int $post  Optional. Post object or ID.

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,8 +131,78 @@

</span><span class="cx" style="display: block; padding: 0 10px">                return $title;

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $tags = custom_open_graph_tags( [], $post );

-       return $tags['og:title'] ?? $title;

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $post );

+       if ( ! $post || 'page' !== $post->post_type ) {

+               return $title;

+       }

+

+       switch ( $post->page_template ) {

+               case 'page-about-domains.php':

+                       $title = esc_html_x( 'Domains', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-accessibility.php':

+                       $title = esc_html_x( 'Accessibility', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-etiquette.php':

+                       $title = esc_html_x( 'Etiquette', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-features.php':

+                       $title = esc_html_x( 'Features', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-history.php':

+                       $title = esc_html_x( 'History', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-license.php':

+                       $title = esc_html_x( 'GNU Public License', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-logos.php':

+                       $title = esc_html_x( 'Graphics &amp; Logos', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-philosophy.php':

+                       $title = esc_html_x( 'Philosophy', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-privacy.php':

+                       $title = esc_html_x( 'Privacy Policy', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-requirements.php':

+                       $title = esc_html_x( 'Requirements', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-roadmap.php':

+                       $title = esc_html_x( 'Roadmap', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-security.php':

+                       $title = esc_html_x( 'About', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-stats.php':

+                       $title = esc_html_x( 'Statistics', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-swag.php':

+                       $title = esc_html_x( 'Swag', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about-testimonials.php':

+                       $title = esc_html_x( 'Testimonials', 'Page title', 'wporg' );

+                       break;

+

+               case 'page-about.php':

+                       $title = esc_html_x( 'About', 'Page title', 'wporg' );

+                       break;

+       }

+

+       return $title;

</ins><span class="cx" style="display: block; padding: 0 10px"> }

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_title', __NAMESPACE__ . '\custom_page_title', 10, 2 );

</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'single_post_title', __NAMESPACE__ . '\custom_page_title', 10, 2 );

</span></span></pre></div>

<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutaccessibilityphp"></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/themes/pub/wporg-main/page-about-accessibility.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/themes/pub/wporg-main/page-about-accessibility.php       2018-03-29 15:32:25 UTC (rev 6971)

+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-accessibility.php 2018-03-29 16:39:13 UTC (rev 6972)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,11 +10,11 @@

</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\MainTheme;

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['menu_items'] = [

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        'about/domains'       => __( 'Domains', 'wporg' ),

-       'about/license'       => __( 'GNU Public License', 'wporg' ),

-       'about/accessibility' => __( 'Accessibility', 'wporg' ),

-       'about/privacy'       => __( 'Privacy Policy', 'wporg' ),

-       'about/stats'         => __( 'Statistics', 'wporg' ),

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'about/domains'       => _x( 'Domains', 'Page title', 'wporg' ),

+       'about/license'       => _x( 'GNU Public License', 'Page title', 'wporg' ),

+       'about/accessibility' => _x( 'Accessibility', 'Page title', 'wporg' ),

+       'about/privacy'       => _x( 'Privacy Policy', 'Page title', 'wporg' ),

+       'about/stats'         => _x( 'Statistics', 'Page title', 'wporg' ),

</ins><span class="cx" style="display: block; padding: 0 10px"> ];

</span><span class="cx" style="display: block; padding: 0 10px"> 