<!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>[GlotPress][1011] trunk: project by locales: split display of locales with multiple translation slugs.</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="https://glotpress.trac.wordpress.org/changeset/1011">1011</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://glotpress.trac.wordpress.org/changeset/1011","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>yoavf</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-12 11:31:15 +0000 (Mon, 12 Jan 2015)</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'>project by locales: split display of locales with multiple translation slugs. Props ocean90. See <a href="http://glotpress.trac.wordpress.org/ticket/212">#212</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesrouterphp">trunk/gp-includes/router.php</a></li>
<li><a href="#trunkgpincludesrouteslocalephp">trunk/gp-includes/routes/locale.php</a></li>
<li><a href="#trunkgpincludesthingstranslationsetphp">trunk/gp-includes/things/translation-set.php</a></li>
<li><a href="#trunkgptemplateslocalephp">trunk/gp-templates/locale.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesrouterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/router.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/router.php 2015-01-12 11:11:38 UTC (rev 1010)
+++ trunk/gp-includes/router.php 2015-01-12 11:31:15 UTC (rev 1011)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,6 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $project = $projects.'/'.$path;
</span><span class="cx" style="display: block; padding: 0 10px"> $id = '(\d+)';
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = '('.implode('|', array_map( create_function( '$x', 'return $x->slug;' ), GP_Locales::locales() ) ).')';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $set_slug = '(' . implode( '|', GP::$translation_set->existing_slugs() ) . ')';
</ins><span class="cx" style="display: block; padding: 0 10px"> $set = "$project/$locale/$dir";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // overall structure
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,6 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post:/profile' => array('GP_Route_Profile', 'profile_post'),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'get:/languages' => array('GP_Route_Locale', 'locales_get'),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "get:/languages/$locale/$set_slug" => array('GP_Route_Locale', 'single'),
</ins><span class="cx" style="display: block; padding: 0 10px"> "get:/languages/$locale" => array('GP_Route_Locale', 'single'),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> "get:/$set/glossary" => array('GP_Route_Glossary_Entry', 'glossary_entries_get'),
</span></span></pre></div>
<a id="trunkgpincludesrouteslocalephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/routes/locale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/routes/locale.php 2015-01-12 11:11:38 UTC (rev 1010)
+++ trunk/gp-includes/routes/locale.php 2015-01-12 11:31:15 UTC (rev 1011)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,19 +19,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->tmpl( 'locales', get_defined_vars() );
</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">- public function single( $locale_slug ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function single( $locale_slug, $current_set_slug = 'default' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $locale = GP_Locales::by_slug( $locale_slug );
</span><span class="cx" style="display: block; padding: 0 10px"> $sets = GP::$translation_set->by_locale( $locale_slug );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> usort( $sets, array( $this, 'sort_sets_by_project_id' ) );
</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_projects = $projects_data = $projects = $parents = $set_slugs = $set_list = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> //TODO: switch to wp_list_pluck
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locale_projects = $projects_data = $projects = $parents = array();
</del><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sets as $key => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $locale_projects[ $key ] = $value->project_id;
</span><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"> foreach ( $sets as $set ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $set_slugs[ $set->slug ] = $set;
+
+ if ( $current_set_slug != $set->slug ) {
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Store project data for later use
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $projects[ $set->project_id ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $set_project = $projects[$set->project_id];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,6 +95,31 @@
</span><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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $set_slugs ) {
+ // Make default the first item.
+ if ( ! empty( $set_slugs[ 'default' ] ) ) {
+ $default = $set_slugs[ 'default' ];
+ unset( $set_slugs[ 'default' ] );
+ array_unshift( $set_slugs, $default );
+ }
+
+ foreach ( $set_slugs as $set ) {
+ if ( 'default' == $set->slug ) {
+ if ( 'default' != $current_set_slug ) {
+ $set_list[ $set->slug ] = gp_link_get( gp_url_join( '/languages', $locale->slug ), __( 'Default' ) );
+ } else {
+ $set_list[ $set->slug ] = __( 'Default' );
+ }
+ } else {
+ if ( $set->slug != $current_set_slug ) {
+ $set_list[ $set->slug ] = gp_link_get( gp_url_join('/languages', $locale->slug, $set->slug ), esc_html( $set->name ) );
+ } else {
+ $set_list[ $set->slug ] = esc_html( $set->name );
+ }
+ }
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->tmpl( 'locale', get_defined_vars() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunkgpincludesthingstranslationsetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/things/translation-set.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/things/translation-set.php 2015-01-12 11:11:38 UTC (rev 1010)
+++ trunk/gp-includes/things/translation-set.php 2015-01-12 11:31:15 UTC (rev 1011)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,6 +38,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $gpdb->get_col( "SELECT DISTINCT(locale) FROM $this->table" );
</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">+ function existing_slugs() {
+ global $gpdb;
+
+ return $gpdb->get_col( "SELECT DISTINCT(slug) FROM $this->table" );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function by_project_id( $project_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->many( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT * FROM $this->table
</span></span></pre></div>
<a id="trunkgptemplateslocalephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-templates/locale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-templates/locale.php 2015-01-12 11:11:38 UTC (rev 1010)
+++ trunk/gp-templates/locale.php 2015-01-12 11:31:15 UTC (rev 1011)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,13 +1,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> gp_title( sprintf( __( 'Projects translated to %s < GlotPress' ), esc_html( $locale->english_name ) ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-gp_breadcrumb( array(
- gp_link_get( '/languages', __( 'Locales' ) ),
- esc_html( $locale->english_name )
-) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+$breadcrumb = array();
+$breadcrumb[] = gp_link_get( '/languages', __( 'Locales' ) );
+if ( 'default' == $current_set_slug ) {
+ $breadcrumb[] = esc_html( $locale->english_name );
+} else {
+ $breadcrumb[] = gp_link_get( gp_url_join( '/languages', $locale->slug ), esc_html( $locale->english_name ) );
+ $breadcrumb[] = $set_list[ $current_set_slug ];
+}
+gp_breadcrumb( $breadcrumb );
</ins><span class="cx" style="display: block; padding: 0 10px"> gp_tmpl_header();
</span><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"> <h2><?php printf( __( 'Active Projects translated to %s' ), esc_html( $locale->english_name ) ); ?></h2>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+<?php if ( count( $set_list ) > 1 ) : ?>
+ <p class="actionlist secondary">
+ <?php echo implode( ' • ', $set_list ); ?>
+ </p>
+<?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $projects_data ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'No active projects found.' );
</span></span></pre>
</div>
</div>
</body>
</html>