<!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>[11590] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse: Openverse: Update the theme to use path-based localisation.</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 { white-space: pre-line; 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/11590">11590</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/11590","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-02-22 03:06:29 +0000 (Tue, 22 Feb 2022)</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'>Openverse: Update the theme to use path-based localisation.
Props sarayourfriend.
Closes https://github.com/WordPress/wordpress.org/pull/61
Fixes <a href="http://meta.trac.wordpress.org/ticket/6195">#6195</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgopenversegitignore">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse/.gitignore</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgopenversefunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgopenversejsiframe_navjs">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse/js/iframe_nav.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgopenversejsmessagejs">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse/js/message.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgopenversegitignore"></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-openverse/.gitignore</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-openverse/.gitignore 2022-02-21 21:53:34 UTC (rev 11589)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse/.gitignore 2022-02-22 03:06:29 UTC (rev 11590)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,3 +3,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> mu-plugins/
</span><span class="cx" style="display: block; padding: 0 10px"> vendor/
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wporg_locales.sql
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgopenversefunctionsphp"></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-openverse/functions.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-openverse/functions.php 2022-02-21 21:53:34 UTC (rev 11589)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse/functions.php 2022-02-22 03:06:29 UTC (rev 11590)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,6 +2,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\Openverse\Theme;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use function WordPressdotorg\Locales\get_locales;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * This is the URL on which the frontend site of Openverse is hosted. Unless
</span><span class="cx" style="display: block; padding: 0 10px"> * overridden from the Customizer UI, this is the URL for the embedded `iframe`.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,13 +85,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* ver */ filemtime( __DIR__ . '/js/message.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* in_footer */ true
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $use_path_based_locale_forwarding = get_theme_mod( 'ov_path_based_i18n', false );
+ $wp_locale = get_locale();
+ $locale = get_locales()[ $wp_locale ];
+ $locale_slug = $use_path_based_locale_forwarding && $wp_locale !== 'en_US' ? $locale->slug : '';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_script(
</span><span class="cx" style="display: block; padding: 0 10px"> /* handle */ 'openverse-message',
</span><span class="cx" style="display: block; padding: 0 10px"> /* JS */ 'const openverseUrl = ' . wp_json_encode( get_theme_mod( 'ov_src_url', OPENVERSE_URL ) ) . ";\n" .
</span><span class="cx" style="display: block; padding: 0 10px"> /* JS */ 'const openverseSubpath = ' . wp_json_encode( OPENVERSE_SUBPATH ) . ";\n" .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* JS */ 'const currentLocale = ' . wp_json_encode( get_locale() ) . ";\n",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* JS */ 'const currentLocale = ' . wp_json_encode( $wp_locale ) . ";\n" . /* Used for legacy cookie based locale forwarding */
+ /* JS */ 'const localeSlug = ' . wp_json_encode( $locale_slug ) . ";\n",
</ins><span class="cx" style="display: block; padding: 0 10px"> /* position */ 'before'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script(
</span><span class="cx" style="display: block; padding: 0 10px"> /* handle */ 'openverse-navigation',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,5 +169,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'placeholder' => 'URL'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $wp_customize->add_setting( 'ov_path_based_i18n', array(
+ 'type' => 'theme_mod',
+ 'capability' => 'edit_theme_options',
+ 'default' => false
+ ) );
+
+ $wp_customize->add_control( 'ov_path_based_i18n', array(
+ 'section' => 'ov_embed',
+ 'type' => 'checkbox',
+ 'id' => 'ov_path_based_i18n',
+ 'label' => 'Use path based locale forwarding',
+ 'priority' => 10
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'customize_register', __NAMESPACE__ . '\wporg_ov_customizer' );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgopenversejsiframe_navjs"></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-openverse/js/iframe_nav.js</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-openverse/js/iframe_nav.js 2022-02-21 21:53:34 UTC (rev 11589)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse/js/iframe_nav.js 2022-02-22 03:06:29 UTC (rev 11590)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .toLocaleLowerCase()
</span><span class="cx" style="display: block; padding: 0 10px"> .replace(openverseSubpath, '')
</span><span class="cx" style="display: block; padding: 0 10px"> .replace(/^\/$/, ''); // Remove Openverse site subpath
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- iframePath = `${openverseUrl}${iframePath}${query}`; // Add domain and query
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const localePart = localeSlug
+ ? openverseUrl.endsWith('/')
+ ? localeSlug
+ : `/${localeSlug}`
+ : '';
+ iframePath = `${openverseUrl}${localePart}${iframePath}${query}`; // Add domain and query
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> console.log(`Navigating iframe to ${iframePath}`);
</span><span class="cx" style="display: block; padding: 0 10px"> const iframe = document.getElementById('openverse_embed');
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgopenversejsmessagejs"></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-openverse/js/message.js</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-openverse/js/message.js 2022-02-21 21:53:34 UTC (rev 11589)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-openverse/js/message.js 2022-02-22 03:06:29 UTC (rev 11590)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function updatePath(value) {
</span><span class="cx" style="display: block; padding: 0 10px"> const path = value.path;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- const url = `${openverseSubpath}${path}`; // openverseSubpath defined in `index.php`
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ let url = `${openverseSubpath}${path}`; // openverseSubpath defined in `index.php`
+ if (localeSlug) {
+ url = url.replace(`openverse/${localeSlug}`, 'openverse');
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> console.log(`Replacing state URL: ${url}`);
</span><span class="cx" style="display: block; padding: 0 10px"> history.replaceState(
</span></span></pre>
</div>
</div>
</body>
</html>