<!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][1072] trunk: Make the ability to translate a string a capability.</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/1072">1072</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/1072","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-17 10:04:07 +0000 (Fri, 17 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'>Make the ability to translate a string a capability. Fixes <a href="http://glotpress.trac.wordpress.org/ticket/447">#447</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgpincludesadvancedpermissionsphp">trunk/gp-includes/advanced-permissions.php</a></li>
<li><a href="#trunkgpincludesroutestranslationphp">trunk/gp-includes/routes/translation.php</a></li>
<li><a href="#trunkgptemplateshelperfunctionsphp">trunk/gp-templates/helper-functions.php</a></li>
<li><a href="#trunkgptemplatestranslationrowphp">trunk/gp-templates/translation-row.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgpincludesadvancedpermissionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-includes/advanced-permissions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-includes/advanced-permissions.php 2015-07-16 15:14:33 UTC (rev 1071)
+++ trunk/gp-includes/advanced-permissions.php 2015-07-17 10:04:07 UTC (rev 1072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,9 +39,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $set = GP::$translation_set->get( $args['object_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> return $args['user']->can( 'approve', GP::$validator_permission->object_type,
</span><span class="cx" style="display: block; padding: 0 10px"> GP::$validator_permission->object_id( $set->project_id, $set->locale, $set->slug ) );
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function gp_allow_everyone_to_translate( $verdict, $args ) {
+ if ( 'edit' == $args['action'] && 'translation-set' == $args['object_type'] ) {
+ return GP::$user->logged_in();
+ }
+
+ return $verdict;
</ins><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"> add_filter( 'can_user', 'gp_recurse_project_permissions', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'can_user', 'gp_recurse_validator_permission', 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_can_user', 'gp_route_translation_set_permissions_to_validator_permissions', 10, 2 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'pre_can_user', 'gp_allow_everyone_to_translate', 10, 2 );
</ins></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-16 15:14:33 UTC (rev 1071)
+++ trunk/gp-includes/routes/translation.php 2015-07-17 10:04:07 UTC (rev 1072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $translations = GP::$translation->for_translation( $project, $translation_set, $page, $filters, $sort );
</span><span class="cx" style="display: block; padding: 0 10px"> $total_translations_count = GP::$translation->found_rows;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $can_edit = GP::$user->logged_in();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $can_edit = $this->can( 'edit', 'translation-set', $translation_set->id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $can_write = $this->can( 'write', 'project', $project->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $can_approve = $this->can( 'approve', 'translation-set', $translation_set->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = gp_url_project( $project, gp_url_join( $locale->slug, $translation_set->slug ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,8 +145,6 @@
</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"> public function translations_post( $project_path, $locale_slug, $translation_set_slug ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->logged_in_or_forbidden();
-
</del><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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,6 +154,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</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><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->can_or_forbidden( 'edit', 'translation-set', $translation_set->id );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $translation_set ) {
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,7 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $translations ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $t = $translations[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $parity = returner( 'even' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $can_edit = GP::$user->logged_in();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $can_edit = $this->can( 'edit', 'translation-set', $translation_set->id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $can_write = $this->can( 'write', 'project', $project->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $can_approve = $this->can( 'approve', 'translation-set', $translation_set->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $output[$original_id] = gp_tmpl_get_output( 'translation-row', get_defined_vars() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +376,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $translations ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $t = $translations[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $parity = returner( 'even' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $can_edit = GP::$user->logged_in();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $can_edit = $this->can( 'edit', 'translation-set', $translation_set->id );
</ins><span class="cx" style="display: block; padding: 0 10px"> $can_write = $this->can( 'write', 'project', $project->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $can_approve = $this->can( 'approve', 'translation-set', $translation_set->id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->tmpl( 'translation-row', get_defined_vars() );
</span></span></pre></div>
<a id="trunkgptemplateshelperfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-templates/helper-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-templates/helper-functions.php 2015-07-16 15:14:33 UTC (rev 1071)
+++ trunk/gp-templates/helper-functions.php 2015-07-17 10:04:07 UTC (rev 1072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,15 +73,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <blockquote><em><small><?php echo esc_translation( gp_array_get( $entry->translations, $index ) ); ?></small></em></blockquote>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea class="foreign-text" name="translation[<?php echo $entry->original_id; ?>][]" <?php echo $disabled; ?>><?php echo esc_translation(gp_array_get($entry->translations, $index)); ?></textarea>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $can_edit ): ?>
- <p>
- <?php gp_entry_actions(); ?>
- </p>
- <?php else: ?>
- <p>
- <?php printf( __('You <a href="%s">have to log in</a> to edit this translation.'), gp_url_login() ); ?>
- </p>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
+ if ( $can_edit ) {
+ gp_entry_actions();
+ }
+ elseif ( GP::$user->logged_in() ) {
+ _e('You are not allowed to edit this translation.');
+ }
+ else {
+ printf( __('You <a href="%s">have to log in</a> to edit this translation.'), gp_url_login() );
+ }
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunkgptemplatestranslationrowphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/gp-templates/translation-row.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/gp-templates/translation-row.php 2015-07-16 15:14:33 UTC (rev 1071)
+++ trunk/gp-templates/translation-row.php 2015-07-17 10:04:07 UTC (rev 1072)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="translation foreign-text">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $edit_text = $can_edit? __('Double-click to add') : sprintf(__('You <a href="%s">have to login</a> to add a translation.'), gp_url_login());
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $can_edit ) {
+ $edit_text = __('Double-click to add');
+ }
+ elseif ( GP::$user->logged_in() ) {
+ $edit_text = __('You are not allowed to add a translation.');
+ }
+ else {
+ $edit_text = sprintf( __('You <a href="%s">have to login</a> to add a translation.'), gp_url_login() );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $missing_text = "<span class='missing'>$edit_text</span>";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! count( array_filter( $t->translations, 'gp_is_not_empty_string' ) ) ):
</span><span class="cx" style="display: block; padding: 0 10px"> echo $missing_text;
</span></span></pre>
</div>
</div>
</body>
</html>