<!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][892] trunk/gp-includes: Omit default from Translation Set URLs.</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">
<dt>Revision</dt> <dd><a href="https://glotpress.trac.wordpress.org/changeset/892">892</a></dd>
<dt>Author</dt> <dd>markoheijnen</dd>
<dt>Date</dt> <dd>2014-05-06 18:24:52 +0000 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Omit default from Translation Set URLs. Initial props juanramondiaz.
Fixes <a href="http://glotpress.trac.wordpress.org/ticket/67">#67</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesrouterphp">trunk/gp-includes/router.php</a></li>
<li><a href="#trunkgpincludesroutestranslationphp">trunk/gp-includes/routes/translation.php</a></li>
<li><a href="#trunkgpincludesthingstranslationsetphp">trunk/gp-includes/things/translation-set.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesrouterphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/router.php (891 => 892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/router.php 2014-05-06 17:38:26 UTC (rev 891)
+++ trunk/gp-includes/router.php 2014-05-06 18:24:52 UTC (rev 892)
</span><span class="lines">@@ -31,13 +31,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function default_routes() {
</span><del>- $dir = '([^_/][^/]*)';
</del><ins>+ $dir = '([^_/][^/]*)?';
</ins><span class="cx"> $path = '(.+?)';
</span><span class="cx"> $projects = 'projects';
</span><span class="cx"> $project = $projects.'/'.$path;
</span><span class="cx"> $id = '(\d+)';
</span><span class="cx"> $locale = '('.implode('|', array_map( create_function( '$x', 'return $x->slug;' ), GP_Locales::locales() ) ).')';
</span><del>- $set = "$project/$locale/$dir";
</del><ins>+ $set = "$project/$locale/?$dir";
</ins><span class="cx">
</span><span class="cx"> // overall structure
</span><span class="cx"> return apply_filters( 'routes', array(
</span></span></pre></div>
<a id="trunkgpincludesroutestranslationphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/routes/translation.php (891 => 892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/routes/translation.php 2014-05-06 17:38:26 UTC (rev 891)
+++ trunk/gp-includes/routes/translation.php 2014-05-06 18:24:52 UTC (rev 892)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> class GP_Route_Translation extends GP_Route_Main {
</span><del>- function import_translations_get( $project_path, $locale_slug, $translation_set_slug ) {
</del><ins>+ function import_translations_get( $project_path, $locale_slug, $translation_set_slug = 'default' ) {
</ins><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><span class="cx"> if ( ! $project || ! $locale ) $this->die_with_404();
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> $this->tmpl( 'project-import', get_defined_vars() );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function import_translations_post( $project_path, $locale_slug, $translation_set_slug ) {
</del><ins>+ function import_translations_post( $project_path, $locale_slug, $translation_set_slug = 'default' ) {
</ins><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><span class="cx"> if ( ! $project || ! $locale ) $this->die_with_404();
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> $this->redirect( gp_url_project( $project, gp_url_join( $locale->slug, $translation_set->slug ) ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function export_translations_get( $project_path, $locale_slug, $translation_set_slug ) {
</del><ins>+ function export_translations_get( $project_path, $locale_slug, $translation_set_slug = 'default' ) {
</ins><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><span class="cx"> if ( ! $project || ! $locale ) $this->die_with_404();
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function translations_get( $project_path, $locale_slug, $translation_set_slug ) {
</del><ins>+ function translations_get( $project_path, $locale_slug, $translation_set_slug = 'default' ) {
</ins><span class="cx"> $project = GP::$project->by_path( $project_path );
</span><span class="cx"> $locale = GP_Locales::by_slug( $locale_slug );
</span><span class="cx"> if ( ! $project || ! $locale ) $this->die_with_404();
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> $this->tmpl( 'translations', get_defined_vars() );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function translations_post( $project_path, $locale_slug, $translation_set_slug ) {
</del><ins>+ function translations_post( $project_path, $locale_slug, $translation_set_slug = 'default' ) {
</ins><span class="cx"> $this->logged_in_or_forbidden();
</span><span class="cx">
</span><span class="cx"> $project = GP::$project->by_path( $project_path );
</span></span></pre></div>
<a id="trunkgpincludesthingstranslationsetphp"></a>
<div class="modfile"><h4>Modified: trunk/gp-includes/things/translation-set.php (891 => 892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/gp-includes/things/translation-set.php 2014-05-06 17:38:26 UTC (rev 891)
+++ trunk/gp-includes/things/translation-set.php 2014-05-06 18:24:52 UTC (rev 892)
</span><span class="lines">@@ -6,6 +6,14 @@
</span><span class="cx"> var $non_db_field_names = array( 'current_count', 'untranslated_count', 'waiting_count', 'fuzzy_count' );
</span><span class="cx"> var $non_updatable_attributes = array( 'id' );
</span><span class="cx">
</span><ins>+ function __construct( $fields = array() ) {
+ parent::__construct( $fields );
+
+ if( 'default' == $this->slug ) {
+ $this->slug = '';
+ }
+ }
+
</ins><span class="cx"> function restrict_fields( $set ) {
</span><span class="cx"> $set->name_should_not_be('empty');
</span><span class="cx"> $set->slug_should_not_be('empty');
</span><span class="lines">@@ -16,8 +24,12 @@
</span><span class="cx"> function name_with_locale( $separator = '→') {
</span><span class="cx"> $locale = GP_Locales::by_slug( $this->locale );
</span><span class="cx"> $parts = array( $locale->english_name );
</span><del>- if ( 'default' != $this->slug ) $parts[] = $this->name;
- return implode( ' '.$separator.' ', $parts );
</del><ins>+
+ if ( 'default' != $this->slug ) {
+ $parts[] = $this->name;
+ }
+
+ return implode( ' ' . $separator . ' ', $parts );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function by_project_id_slug_and_locale( $project_id, $slug, $locale_slug ) {
</span></span></pre>
</div>
</div>
</body>
</html>