<!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>[9813] sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates: Translate: Remove unchanged template copies and update translation editor template to use renamed variable.</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/9813">9813</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/9813","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-05-02 10:13:03 +0000 (Sat, 02 May 2020)</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'>Translate: Remove unchanged template copies and update translation editor template to use renamed variable.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatestranslationroweditorphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/translation-row-editor.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatestranslationrowpreviewphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/translation-row-preview.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatestranslationrowphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/translation-row.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatestranslationroweditorphp"></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/plugins/wporg-gp-customizations/templates/translation-row-editor.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/plugins/wporg-gp-customizations/templates/translation-row-editor.php 2020-05-01 23:53:45 UTC (rev 9812)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/translation-row-editor.php 2020-05-02 10:13:03 UTC (rev 9813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,19 +3,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Template for a single translation row editor in a translation set display.
</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">-$user = wp_get_current_user();
-$can_reject_self = ( isset( $t->user->user_login ) && $user->user_login === $t->user->user_login && 'waiting' === $t->translation_status );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $more_links = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $t->translation_status ) {
- $translation_permalink = gp_url_project_locale( $project, $locale->slug, $translation_set->slug, array( 'filters[status]' => 'either', 'filters[original_id]' => $t->original_id, 'filters[translation_id]' => $t->id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $translation->translation_status ) {
+ $translation_permalink = gp_url_project_locale( $project, $locale->slug, $translation_set->slug, array( 'filters[status]' => 'either', 'filters[original_id]' => $translation->original_id, 'filters[translation_id]' => $translation->id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $more_links['translation-permalink'] = '<a href="' . esc_url( $translation_permalink ) . '">Permalink to translation</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $original_permalink = gp_url_project_locale( $project, $locale->slug, $translation_set->slug, array( 'filters[original_id]' => $t->original_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $original_permalink = gp_url_project_locale( $project, $locale->slug, $translation_set->slug, array( 'filters[original_id]' => $translation->original_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $more_links['original-permalink'] = '<a href="' . esc_url( $original_permalink ) . '">Permalink to original</a>';
</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">-$original_history = gp_url_project_locale( $project, $locale->slug, $translation_set->slug, array( 'filters[status]' => 'either', 'filters[original_id]' => $t->original_id, 'sort[by]' => 'translation_date_added', 'sort[how]' => 'asc' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$original_history = gp_url_project_locale( $project, $locale->slug, $translation_set->slug, array( 'filters[status]' => 'either', 'filters[original_id]' => $translation->original_id, 'sort[by]' => 'translation_date_added', 'sort[how]' => 'asc' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $more_links['history'] = '<a href="' . esc_url( $original_history ) . '">Translation History</a>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,25 +21,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $more_links The links to be output.
- * @param GP_Project $project Project object.
- * @param GP_Locale $locale Locale object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $more_links The links to be output.
+ * @param GP_Project $project Project object.
+ * @param GP_Locale $locale Locale object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param GP_Translation_Set $translation_set Translation Set object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param GP_Translation $t Translation object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param GP_Translation $translation Translation object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$more_links = apply_filters( 'gp_translation_row_template_more_links', $more_links, $project, $locale, $translation_set, $t );
-
-if ( is_object( $glossary ) ) {
- if ( ! isset( $glossary_entries_terms ) ) {
- $glossary_entries = $glossary->get_entries();
- $glossary_entries_terms = gp_sort_glossary_entries_terms( $glossary_entries );
- }
-
- $t = map_glossary_entries_to_translation_originals( $t, $glossary, $glossary_entries_terms );
-}
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$more_links = apply_filters( 'gp_translation_row_template_more_links', $more_links, $project, $locale, $translation_set, $translation );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<tr class="editor <?php echo gp_translation_row_classes( $t ); ?>" id="editor-<?php echo esc_attr( $t->row_id ); ?>" row="<?php echo esc_attr( $t->row_id ); ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<tr class="editor <?php echo gp_translation_row_classes( $translation ); ?>" id="editor-<?php echo esc_attr( $translation->row_id ); ?>" row="<?php echo esc_attr( $translation->row_id ); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <td colspan="<?php echo $can_approve ? 5 : 4 ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="editor-panel">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="editor-panel__left">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,11 +37,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $status = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="panel-header__bubble%s">%s</span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t->translation_status ? ' panel-header__bubble--' . $t->translation_status : '',
- display_status( $t->translation_status )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translation->translation_status ? ' panel-header__bubble--' . $translation->translation_status : '',
+ display_status( $translation->translation_status )
</ins><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">- $warnings_count = wporg_gp_count_warnings( $t );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $warnings_count = wporg_gp_count_warnings( $translation );
</ins><span class="cx" style="display: block; padding: 0 10px"> $warnings_info = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $warnings_count ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $warnings_info = ' <span class="panel-header__bubble panel-header__bubble--warning">' . sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,39 +74,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="panel-content">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- $singular = isset( $t->singular_glossary_markup ) ? $t->singular_glossary_markup : esc_translation( $t->singular );
- $plural = isset( $t->plural_glossary_markup ) ? $t->plural_glossary_markup : esc_translation( $t->plural );
- ?>
</del><span class="cx" style="display: block; padding: 0 10px"> <div class="source-string strings">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( ! $t->plural ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $singular = $translation->singular_glossary_markup ?? esc_translation( $translation->singular );
+ $plural = $translation->plural_glossary_markup ?? esc_translation( $translation->plural );
+
+ if ( ! $translation->plural ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="source-string__singular">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="original"><?php echo prepare_original( $singular ); ?></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span aria-hidden="true" class="original-raw"><?php echo esc_translation( $t->singular ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span aria-hidden="true" class="original-raw"><?php echo esc_translation( $translation->singular ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else: ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="source-string__singular">
</span><span class="cx" style="display: block; padding: 0 10px"> <small>Singular:</small>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="original"><?php echo $singular; ?></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span aria-hidden="true" class="original-raw"><?php echo esc_translation( $t->singular ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span aria-hidden="true" class="original-raw"><?php echo esc_translation( $translation->singular ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="source-string__plural">
</span><span class="cx" style="display: block; padding: 0 10px"> <small>Plural:</small>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="original"><?php echo $plural; ?></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span aria-hidden="true" class="original-raw"><?php echo esc_translation( $t->plural ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span aria-hidden="true" class="original-raw"><?php echo esc_translation( $translation->plural ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="source-details">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $t->context ): ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $translation->context ): ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <details open class="source-details__context">
</span><span class="cx" style="display: block; padding: 0 10px"> <summary>Context</summary>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="context bubble"><?php echo esc_translation( $t->context ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="context bubble"><?php echo esc_translation( $translation->context ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </details>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $t->extracted_comments ) :
- $comments = trim( preg_replace( '/^translators:/ ', '', $t->extracted_comments ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $translation->extracted_comments ) :
+ $comments = trim( preg_replace( '/^translators:/ ', '', $translation->extracted_comments ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <details open class="source-details__comment">
</span><span class="cx" style="display: block; padding: 0 10px"> <summary><?php _e( 'Comment', 'glotpress' ); ?></summary>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,16 +113,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php echo make_clickable( esc_translation( $comments ) ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </details>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $t->references ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $translation->references ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <details class="source-details__references">
</span><span class="cx" style="display: block; padding: 0 10px"> <summary>References</summary>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wporg_references( $project, $t ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wporg_references( $project, $translation ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </details>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="translation-wrapper">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $t->plural && $locale->nplurals > 1 ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $translation->plural && $locale->nplurals > 1 ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="translation-form-wrapper">
</span><span class="cx" style="display: block; padding: 0 10px"> <span>Form:</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="translation-form-list">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,11 +162,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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 ( ! $t->plural ) : ?>
- <?php wporg_gp_translate_textarea( $t, [ $can_edit, $can_approve_translation ] ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! $translation->plural ) : ?>
+ <?php wporg_gp_translate_textarea( $translation, [ $can_edit, $can_approve_translation ] ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach( range( 0, $locale->nplurals - 1 ) as $plural_index ): ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wporg_gp_translate_textarea( $t, [ $can_edit, $can_approve ], $plural_index ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wporg_gp_translate_textarea( $translation, [ $can_edit, $can_approve ], $plural_index ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <button class="translation-actions__save with-tooltip"
</span><span class="cx" style="display: block; padding: 0 10px"> type="button"
</span><span class="cx" style="display: block; padding: 0 10px"> aria-label="<?php echo $can_approve_translation ? 'Save and approve translation' : 'Suggest new translation'; ?>"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- data-nonce="<?php echo esc_attr( wp_create_nonce( 'add-translation_' . $t->original_id ) ); ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ data-nonce="<?php echo esc_attr( wp_create_nonce( 'add-translation_' . $translation->original_id ) ); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo $can_approve_translation ? 'Save' : 'Suggest'; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </button>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( has_action( 'wporg_translate_suggestions' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="suggestions-wrapper">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php do_action( 'wporg_translate_suggestions', $t ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php do_action( 'wporg_translate_suggestions', $translation ); ?>
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,21 +228,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="panel-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="meta">
</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 ( $t->translation_status ): ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $translation->translation_status ): ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="status-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $can_approve_translation ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'current' !== $t->translation_status ) : ?>
- <button class="approve" tabindex="-1" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-current_' . $t->id ) ); ?>"><strong>+</strong> <?php _e( 'Approve', 'glotpress' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'current' !== $translation->translation_status ) : ?>
+ <button class="approve" tabindex="-1" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-current_' . $translation->id ) ); ?>"><strong>+</strong> <?php _e( 'Approve', 'glotpress' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'rejected' !== $t->translation_status ) : ?>
- <button class="reject" tabindex="-1" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-rejected_' . $t->id ) ); ?>"><strong>−</strong> <?php _e( 'Reject', 'glotpress' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'rejected' !== $translation->translation_status ) : ?>
+ <button class="reject" tabindex="-1" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-rejected_' . $translation->id ) ); ?>"><strong>−</strong> <?php _e( 'Reject', 'glotpress' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'fuzzy' !== $t->translation_status ) : ?>
- <button class="fuzzy" tabindex="-1" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-fuzzy_' . $t->id ) ); ?>"><strong>~</strong> <?php _e( 'Fuzzy', 'glotpress' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'fuzzy' !== $translation->translation_status ) : ?>
+ <button class="fuzzy" tabindex="-1" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-fuzzy_' . $translation->id ) ); ?>"><strong>~</strong> <?php _e( 'Fuzzy', 'glotpress' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $can_reject_self ): ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button class="reject" tabindex="-1" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-rejected_' . $t->id ) ); ?>"><strong>−</strong> <?php _e( 'Reject Suggestion', 'glotpress' ); ?></button>
- <button class="fuzzy" tabindex="-1" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-fuzzy_' . $t->id ) ); ?>"><strong>~</strong> <?php _e( 'Fuzzy', 'glotpress' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button class="reject" tabindex="-1" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-rejected_' . $translation->id ) ); ?>"><strong>−</strong> <?php _e( 'Reject Suggestion', 'glotpress' ); ?></button>
+ <button class="fuzzy" tabindex="-1" data-nonce="<?php echo esc_attr( wp_create_nonce( 'update-translation-status-fuzzy_' . $translation->id ) ); ?>"><strong>~</strong> <?php _e( 'Fuzzy', 'glotpress' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,28 +250,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <dl>
</span><span class="cx" style="display: block; padding: 0 10px"> <dt><?php _e( 'Status:', 'glotpress' ); ?></dt>
</span><span class="cx" style="display: block; padding: 0 10px"> <dd>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo display_status( $t->translation_status ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo display_status( $translation->translation_status ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </dd>
</span><span class="cx" style="display: block; padding: 0 10px"> </dl>
</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 ( $t->translation_added && $t->translation_added != '0000-00-00 00:00:00' ): ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $translation->translation_added && $translation->translation_added != '0000-00-00 00:00:00' ): ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <dl>
</span><span class="cx" style="display: block; padding: 0 10px"> <dt><?php _e( 'Date added:', 'glotpress' ); ?></dt>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <dd><?php echo $t->translation_added; ?> GMT</dd>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <dd><?php echo $translation->translation_added; ?> GMT</dd>
</ins><span class="cx" style="display: block; padding: 0 10px"> </dl>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $t->user ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $translation->user ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <dl>
</span><span class="cx" style="display: block; padding: 0 10px"> <dt><?php _e( 'Translated by:', 'glotpress' ); ?></dt>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <dd><?php gp_link_user( $t->user ); ?></dd>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <dd><?php gp_link_user( $translation->user ); ?></dd>
</ins><span class="cx" style="display: block; padding: 0 10px"> </dl>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $t->user_last_modified && ( ! $t->user || $t->user->ID !== $t->user_last_modified->ID ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $translation->user_last_modified && ( ! $translation->user || $translation->user->ID !== $translation->user_last_modified->ID ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <dl>
</span><span class="cx" style="display: block; padding: 0 10px"> <dt><?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'current' === $t->translation_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'current' === $translation->translation_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _e( 'Approved by:', 'glotpress' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'rejected' === $t->translation_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'rejected' === $translation->translation_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _e( 'Rejected by:', 'glotpress' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> _e( 'Last updated by:', 'glotpress' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -290,7 +278,7 @@
</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"> </dt>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <dd><?php gp_link_user( $t->user_last_modified ); ?></dd>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <dd><?php gp_link_user( $translation->user_last_modified ); ?></dd>
</ins><span class="cx" style="display: block; padding: 0 10px"> </dl>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,23 +287,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $can_write ): ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <dd><?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo gp_select(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'priority-' . $t->original_id,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'priority-' . $translation->original_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> GP::$original->get_static( 'priorities' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t->priority,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translation->priority,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class' => 'priority',
</span><span class="cx" style="display: block; padding: 0 10px"> 'tabindex' => '-1',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'data-nonce' => wp_create_nonce( 'set-priority_' . $t->original_id ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'data-nonce' => wp_create_nonce( 'set-priority_' . $translation->original_id ),
</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"> ?></dd>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <dd><?php echo gp_array_get( GP::$original->get_static( 'priorities' ), $t->priority, 'unknown' ); // WPCS: XSS ok. ?></dd>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <dd><?php echo gp_array_get( GP::$original->get_static( 'priorities' ), $translation->priority, 'unknown' ); ?></dd>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </dl>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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 do_action( 'wporg_translate_meta', $t ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php do_action( 'wporg_translate_meta', $translation ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatestranslationrowpreviewphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/translation-row-preview.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/plugins/wporg-gp-customizations/templates/translation-row-preview.php 2020-05-01 23:53:45 UTC (rev 9812)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/translation-row-preview.php 2020-05-02 10:13:03 UTC (rev 9813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,64 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Template for a single translation row preview in a translation set display
- */
-
-$priority_char = array(
- '-2' => array('×', 'transparent', '#ccc'),
- '-1' => array('↓', 'transparent', 'blue'),
- '0' => array('', 'transparent', 'white'),
- '1' => array('↑', 'transparent', 'green'),
-);
-?>
-
-<tr class="preview <?php gp_translation_row_classes( $t ); ?>" id="preview-<?php echo esc_attr( $t->row_id ) ?>" row="<?php echo esc_attr( $t->row_id ); ?>">
- <?php if ( $can_approve_translation ) : ?>
- <th scope="row" class="checkbox"><input type="checkbox" name="selected-row[]" /></th>
- <?php elseif ( $can_approve ) : ?>
- <th scope="row"></th>
- <?php endif; ?>
- <td class="priority" title="<?php echo esc_attr( sprintf( __( 'Priority: %s', 'glotpress' ), gp_array_get( GP::$original->get_static( 'priorities' ), $t->priority ) ) ); ?>">
- <?php echo $priority_char[$t->priority][0] ?>
- </td>
- <td class="original">
- <span class="original-text"><?php echo esc_translation( $t->singular ); ?></span>
- <?php if ( $t->context ): ?>
- <span class="context bubble" title="<?php printf( __( 'Context: %s', 'glotpress' ), esc_html($t->context) ); ?>"><?php echo esc_html($t->context); ?></span>
- <?php endif; ?>
-
- </td>
- <td class="translation foreign-text">
- <?php
- if ( $can_edit ) {
- $edit_text = __( 'Double-click to add', 'glotpress' );
- }
- elseif ( is_user_logged_in() ) {
- $edit_text = __( 'You are not allowed to add a translation.', 'glotpress' );
- }
- else {
- $edit_text = sprintf( __( 'You <a href="%s">have to log in</a> to add a translation.', 'glotpress' ), esc_url( wp_login_url( gp_url_current() ) ) );
- }
-
- $missing_text = "<span class='missing'>$edit_text</span>";
- if ( ! count( array_filter( $t->translations, 'gp_is_not_null' ) ) ) :
- echo $missing_text;
- elseif ( ! $t->plural ) :
- echo '<span class="translation-text">' . esc_translation( $t->translations[0] ) . '</span>';
- else: ?>
- <ul>
- <?php
- foreach( $t->translations as $translation ):
- ?>
- <li><?php echo gp_is_empty_string( $translation ) ? $missing_text : '<span class="translation-text">' . esc_translation( $translation ) . '</span>' ; ?></li>
- <?php
- endforeach;
- ?>
- </ul>
- <?php
- endif;
- ?>
- </td>
- <td class="actions">
- <a href="#" row="<?php echo $t->row_id; ?>" class="action edit"><?php _e( 'Details', 'glotpress' ); ?></a>
- </td>
-</tr>
</del></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginswporggpcustomizationstemplatestranslationrowphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/translation-row.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/plugins/wporg-gp-customizations/templates/translation-row.php 2020-05-01 23:53:45 UTC (rev 9812)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-customizations/templates/translation-row.php 2020-05-02 10:13:03 UTC (rev 9813)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Template for a single translation row in a translation set display.
- */
-
-gp_tmpl_load( 'translation-row-preview', get_defined_vars() );
-gp_tmpl_load( 'translation-row-editor', get_defined_vars() );
</del></span></pre>
</div>
</div>
</body>
</html>