<!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][1068] trunk: Inherit glossary from closest parent when there isn't one existing for the current translation set.</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/1068">1068</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/1068","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>markoheijnen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-15 17:44:49 +0000 (Wed, 15 Jul 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'>Inherit glossary from closest parent when there isn't one existing for the current translation set.
Props Yoavf
See <a href="http://glotpress.trac.wordpress.org/ticket/97">#97</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesroutesglossaryentryphp">trunk/gp-includes/routes/glossary-entry.php</a></li>
<li><a href="#trunkgpincludesroutestranslationphp">trunk/gp-includes/routes/translation.php</a></li>
<li><a href="#trunkgpincludesthingsglossaryphp">trunk/gp-includes/things/glossary.php</a></li>
<li><a href="#trunkgptemplatestranslationsphp">trunk/gp-templates/translations.php</a></li>
<li><a href="#trunktteststests_thingstest_thing_glossaryphp">trunk/t/tests/tests_things/test_thing_glossary.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesroutesglossaryentryphp"></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/glossary-entry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/routes/glossary-entry.php 2015-07-15 13:18:05 UTC (rev 1067)
+++ trunk/gp-includes/routes/glossary-entry.php 2015-07-15 17:44:49 UTC (rev 1068)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $project = GP::$project->by_path( $project_path );
</span><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"> $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $project->id, $translation_set_slug, $locale_slug );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $glossary = GP::$glossary->by_set_id( $translation_set->id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $glossary = GP::$glossary->by_set_or_parent_project( $translation_set, $project );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $glossary ){
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->die_with_404();
</span></span></pre></div>
<a id="trunkgpincludesroutestranslationphp"></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/translation.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/routes/translation.php 2015-07-15 13:18:05 UTC (rev 1067)
+++ trunk/gp-includes/routes/translation.php 2015-07-15 17:44:49 UTC (rev 1068)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->die_with_404();
</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">- $glossary = GP::$glossary->by_set_id( $translation_set->id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $glossary = GP::$glossary->by_set_or_parent_project( $translation_set, $project );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page = gp_get( 'page', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $filters = gp_get( 'filters', array() );
</span></span></pre></div>
<a id="trunkgpincludesthingsglossaryphp"></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/glossary.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/things/glossary.php 2015-07-15 13:18:05 UTC (rev 1067)
+++ trunk/gp-includes/things/glossary.php 2015-07-15 17:44:49 UTC (rev 1068)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var $table_basename = 'glossaries';
</span><span class="cx" style="display: block; padding: 0 10px"> var $field_names = array( 'id', 'translation_set_id', 'description' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $non_db_field_names = array( 'translation_set' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var $non_updatable_attributes = array( 'id' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,16 +10,62 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $glossary->translation_set_id_should_not_be('empty');
</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">+ /**
+ * Get the path to the glossary.
+ *
+ * @return string
+ */
+ public function path() {
+ $translation_set = GP::$translation_set->get( $this->translation_set_id );
+ $project = GP::$project->get( $translation_set->project_id );
+
+ return gp_url_join( gp_url_project_locale( $project->path, $translation_set->locale, $translation_set->slug ), 'glossary' );
+ }
+
+ /**
+ * Get the glossary by set/project.
+ * If there's no glossary for this specific project, get the nearest parent glossary
+ *
+ * @param GP_Project $project
+ * @param GP_Translation_Set $translation_set
+ *
+ * @return GP_Glossary
+ */
+ public function by_set_or_parent_project( $translation_set, $project ) {
+ $glossary = $this->by_set_id( $translation_set->id );
+
+ if ( ! $glossary && $project->parent_project_id ) {
+ $locale = $translation_set->locale;
+ $slug = $translation_set->slug;
+ $translation_set = false;
+
+ while ( ! $translation_set && $project->parent_project_id ) {
+ $project = GP::$project->get( $project->parent_project_id );
+ $translation_set = GP::$translation_set->by_project_id_slug_and_locale( $project->id, $slug, $locale );
+ }
+
+ if ( $translation_set ) {
+ $glossary = $this->by_set_id( $translation_set->id );
+ }
+ }
+
+ return $glossary;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function by_set_id( $set_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->one( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT * FROM $this->table
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE translation_set_id = %d LIMIT 1", $set_id );
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Copies glossary items from a glossary to the current one
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This function does not merge then, just copies unconditionally. If a translation already exists, it will be duplicated.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This function doesn't merge then, just copies unconditionally. If a translation already exists, it will be duplicated.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $source_glossary_id
+ *
+ * @return mixed
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function copy_glossary_items_from( $source_glossary_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $gpdb;
</span></span></pre></div>
<a id="trunkgptemplatestranslationsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-templates/translations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-templates/translations.php 2015-07-15 13:18:05 UTC (rev 1067)
+++ trunk/gp-templates/translations.php 2015-07-15 17:44:49 UTC (rev 1068)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf( __("Translation of %s"), esc_html( $project->name )); ?>: <?php echo esc_html( $translation_set->name ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php gp_link_set_edit( $translation_set, $project, __('(edit)') ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $glossary ): ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo gp_link( gp_url_project_locale( $project, $locale->slug, $translation_set->slug ) . '/glossary', __('glossary'), array('class'=>'glossary-link') ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo gp_link( $glossary->path(), __('glossary'), array('class'=>'glossary-link') ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $can_approve ): ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo gp_link_get( gp_url( '/glossaries/-new', array( 'translation_set_id' => $translation_set->id ) ), __('Create glossary'), array('class'=>'glossary-link') ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="trunktteststests_thingstest_thing_glossaryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/t/tests/tests_things/test_thing_glossary.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/t/tests/tests_things/test_thing_glossary.php 2015-07-15 13:18:05 UTC (rev 1067)
+++ trunk/t/tests/tests_things/test_thing_glossary.php 2015-07-15 17:44:49 UTC (rev 1068)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,4 +16,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $glossary_1, $new );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEquals( $glossary_2, $new );
</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 test_by_set_or_parent_project() {
+ $locale = $this->factory->locale->create( array( 'slug' => 'bg' ) );
+
+ $root = $this->factory->project->create( array( 'name' => 'root' ) );
+ $root_set = $this->factory->translation_set->create( array( 'project_id' => $root->id, 'locale' => $locale->slug ) );
+
+ $sub = $this->factory->project->create( array( 'name' => 'sub', 'parent_project_id' => $root->id ) );
+
+ $subsub = $this->factory->project->create( array( 'name' => 'subsub', 'parent_project_id' => $sub->id ) );
+ $subsub_set = $this->factory->translation_set->create( array( 'project_id' => $subsub->id, 'locale' => $locale->slug ) );
+
+ $glossary = GP::$glossary->create_and_select( array( 'translation_set_id' => $root_set->id ) );
+ $subsub_glossary = GP::$glossary->by_set_or_parent_project( $subsub_set, $subsub );
+
+ $this->assertEquals( $glossary, $subsub_glossary );
+ $this->assertEquals( $glossary->path(), $subsub_glossary->path() );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>