<!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>[5819] sites/trunk/wordcamp.org/public_html/wp-content: WordCamp: Remove tabs and newlines from internationalized strings</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="http://meta.trac.wordpress.org/changeset/5819">5819</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/5819","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coreymckrill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-08-17 22:12:36 +0000 (Thu, 17 Aug 2017)</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'>WordCamp: Remove tabs and newlines from internationalized strings
* Fix the issue for the remaining WordCamp.org strings.
* Add translator comments for placeholders in the edited strings.
* Remove some unnecessary HTML from the edited strings.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2571">#2571</a>
Props SergeyBiryukov</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweakscsssanitizationphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/css-sanitization.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewscommonpagegeneratebadgesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/common/page-generate-badges.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewsindesignbadgespageindesignbadgesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/indesign-badges/page-indesign-badges.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswccspcustomizerphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-customizer.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssappuserinterfacephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/user-interface.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelpautomatedsynchronizationphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-automated-synchronization.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelpbasicsetupphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-basic-setup.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelpoverviewphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-overview.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelptipsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-tips.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewspageremotecssphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/page-remote-css.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsjetpacktweakscsssanitizationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/css-sanitization.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/css-sanitization.php 2017-08-17 22:11:15 UTC (rev 5818)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/jetpack-tweaks/css-sanitization.php 2017-08-17 22:12:36 UTC (rev 5819)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,10 +84,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-warning">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'WARNING: <code>@import</code> rules were stripped for security reasons.
- Please use <a href="%s">the Fonts tool</a> to add web fonts, and merge other stylesheets directly into your custom CSS.',
- 'wordcamporg' ),
- admin_url( 'themes.php?page=wc-fonts-options' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: 1: '@import', 2: Fonts tool URL
+ __(
+ 'WARNING: %1$s rules were stripped for security reasons. Please use <a href="%2$s">the Fonts tool</a> to add web fonts, and merge other stylesheets directly into your custom CSS.',
+ 'wordcamporg'
+ ),
+ '<code>@import</code>',
+ admin_url( 'themes.php?page=wc-fonts-options' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewscommonpagegeneratebadgesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/common/page-generate-badges.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/common/page-generate-badges.php 2017-08-17 22:11:15 UTC (rev 5818)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/common/page-generate-badges.php 2017-08-17 22:12:36 UTC (rev 5819)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,8 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'This tool will help you create personalized badges for attendees to wear during the event.
- There are two methods for this, depending on your preferences:',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'This tool will help you create personalized badges for attendees to wear during the event. There are two methods for this, depending on your preferences:',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,10 +49,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: 1: Gravatar.com URL, 2: Notify tool URL
</ins><span class="cx" style="display: block; padding: 0 10px"> __(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Regardless of which method you choose, you\'ll get the best results if you encourage attendees to create <a href="%s">Gravatar</a> accounts before you create the badges.
- You can use <a href="%s">the Notify tool</a> to e-mail everyone.
- Make sure to tell them to create their Gravatar account using the same e-mail address that provided when purchasing a ticket.',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Regardless of which method you choose, you\'ll get the best results if you encourage attendees to create <a href="%1$s">Gravatar</a> accounts before you create the badges. You can use <a href="%2$s">the Notify tool</a> to e-mail everyone. Make sure to tell them to create their Gravatar account using the same e-mail address that provided when purchasing a ticket.',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://gravatar.com',
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginscamptixbadgegeneratorviewsindesignbadgespageindesignbadgesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/indesign-badges/page-indesign-badges.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/indesign-badges/page-indesign-badges.php 2017-08-17 22:11:15 UTC (rev 5818)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/camptix-badge-generator/views/indesign-badges/page-indesign-badges.php 2017-08-17 22:12:36 UTC (rev 5819)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,9 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "The process for building InDesign badges hasn't been automated yet, so it requires a developer to run a script.
- That script will create a CSV file and will download Gravatar images for all attendees.
- Once that's done, a designer can take those files into InDesign and use the Data Merge feature to create personalized badges for each attendee.",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "The process for building InDesign badges hasn't been automated yet, so it requires a developer to run a script. That script will create a CSV file and will download Gravatar images for all attendees. Once that's done, a designer can take those files into InDesign and use the Data Merge feature to create personalized badges for each attendee.",
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,8 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><span class="cx" style="display: block; padding: 0 10px"> __(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Full instructions are <a href="%s">available in the WordCamp Organizer Handbook</a>.
- If you\'d prefer an easier way, <a href="%s">the HTML/CSS method</a> is much more automated at this time.',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Full instructions are <a href="%s">available in the WordCamp Organizer Handbook</a>. If you\'d prefer an easier way, <a href="%s">the HTML/CSS method</a> is much more automated at this time.',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://make.wordpress.org/community/handbook/wordcamp-organizer-handbook/first-steps/helpful-documents-and-templates/create-wordcamp-badges-with-gravatars/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'if you\'d like to help automate the InDesign process, you can contribute to <a href="%s">Meta ticket #262</a>.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'If you\'d like to help automate the InDesign process, you can contribute to <a href="%s">Meta ticket #262</a>.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://meta.trac.wordpress.org/ticket/262'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswccspcustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-customizer.php 2017-08-17 22:11:15 UTC (rev 5818)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-customizer.php 2017-08-17 22:12:36 UTC (rev 5819)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,8 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Coming Soon Page', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'When enabled, the Coming Soon page will be displayed to logged-out users,
- giving you a chance to setup all of your content before your site is visible to the world.',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'When enabled, the Coming Soon page will be displayed to logged-out users, giving you a chance to setup all of your content before your site is visible to the world.',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px"> ) . $GLOBALS['WCCSP_Settings']->render_admin_notices(),
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssappuserinterfacephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/user-interface.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/user-interface.php 2017-08-17 22:11:15 UTC (rev 5818)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/app/user-interface.php 2017-08-17 22:12:36 UTC (rev 5819)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,10 +138,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $parsed_url['host'], $trusted_hostnames, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> throw new \Exception( sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Due to security constraints, only certain third-party platforms can be used,
- and the URL you provided is not hosted by one of our currently-supported platforms.
- To request that it be added, please <a href="%s">create a ticket</a> on Meta Trac.',
- 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s: WordPress Meta Trac URL
+ __(
+ 'Due to security constraints, only certain third-party platforms can be used. We currently only support GitHub, but more platforms can be added if there\'s interest from organizers. To request an additional platform, please <a href="%s">create a ticket</a> on Meta Trac.',
+ 'wordcamporg'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://meta.trac.wordpress.org/newticket'
</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">@@ -154,12 +155,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * sanitized, which would further couple the plugin to Jetpack.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '.css' !== substr( $parsed_url['path'], strlen( $parsed_url['path'] ) - 4, 4 ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- throw new \Exception(
- __( 'The URL must be a vanilla CSS file ending in <code>.css</code>.
- If you\'d like to use SASS/LESS, please compile it into vanilla CSS on your server,
- and then enter the URL for that file.',
- 'wordcamporg' )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ throw new \Exception( sprintf(
+ // translators: %s: '.css'
+ __(
+ 'The URL must be a vanilla CSS file ending in %s. If you\'d like to use SASS/LESS, please compile it into vanilla CSS on your server, and then enter the URL for that file.',
+ 'wordcamporg'
+ ),
+ '<code>.css</code>'
+ ) );
</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"> /*
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelpautomatedsynchronizationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-automated-synchronization.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-automated-synchronization.php 2017-08-17 22:11:15 UTC (rev 5818)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-automated-synchronization.php 2017-08-17 22:12:36 UTC (rev 5819)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,8 +6,10 @@
</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"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "You don't have to manually synchronize the local file every time you make a change to the remote file;
- instead, you can setup a webhook to trigger synchronization automatically.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e(
+ "You don't have to manually synchronize the local file every time you make a change to the remote file; instead, you can setup a webhook to trigger synchronization automatically.",
+ 'wordcamporg'
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Setup', 'wordcamporg' ); ?></h2>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,25 +37,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "If you're not using GitHub, your process will be different, but at the end of the day all you need to do
- is setup something to open an HTTP request to the payload URL above whenever your file changes.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e(
+ "If you're not using GitHub, your process will be different, but at the end of the day all you need to do is setup something to open an HTTP request to the payload URL above whenever your file changes.",
+ 'wordcamporg'
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Testing & Troubleshooting', 'wordcamporg' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'To test if the synchronization is working, make a change to the file, commit it, push it to GitHub,
- and then check the site to see if that change is active.', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e(
+ 'To test if the synchronization is working, make a change to the file, commit it, push it to GitHub, and then check the site to see if that change is active.',
+ 'wordcamporg'
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "If your change isn't active on WordCamp.org, edit the webhook and scroll down to the <strong>Recent Deliveries</strong> section,
- then open the latest delivery and look at the <strong>Response</strong> tab for any errors.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e(
+ "If your change isn't active on WordCamp.org, edit the webhook and scroll down to the <strong>Recent Deliveries</strong> section, then open the latest delivery and look at the <strong>Response</strong> tab for any errors.",
+ 'wordcamporg'
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'If that doesn\'t help solve the problem, you can ask for help in the <code>#meta-wordcamp</code> channel on <a href="%s">Slack</a>.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s: WordPress Slack URL */
+ __(
+ 'If that doesn\'t help solve the problem, you can ask for help in the <code>#meta-wordcamp</code> channel on <a href="%s">Slack</a>.',
+ 'wordcamporg'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://chat.wordpress.org'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelpbasicsetupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-basic-setup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-basic-setup.php 2017-08-17 22:11:15 UTC (rev 5818)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-basic-setup.php 2017-08-17 22:12:36 UTC (rev 5819)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,9 +13,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Due to security constraints, only certain third-party platforms can be used.
- We currently only support GitHub, but more platforms can be added if there\'s interest from organizers.
- To request an additional platform, please <a href="%s">create a ticket</a> on Meta Trac.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s: WordPress Meta Trac URL
+ __(
+ 'Due to security constraints, only certain third-party platforms can be used. We currently only support GitHub, but more platforms can be added if there\'s interest from organizers. To request an additional platform, please <a href="%s">create a ticket</a> on Meta Trac.',
+ 'wordcamporg'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://meta.trac.wordpress.org/newticket'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,8 +33,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "If you're using GitHub, you can enter the URL in any of the following formats,
- but we'll convert them to use the GitHub API.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e(
+ "If you're using GitHub, you can enter the URL in any of the following formats, but we'll convert them to use the GitHub API.",
+ 'wordcamporg'
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,21 +61,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Click the <strong>Update</strong> button.', 'wordcamporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "WordCamp.org will download the file, sanitize it, minify it, and store a local copy,
- then enqueue the local copy as a stylesheet alongside your theme's default stylesheet.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e(
+ "WordCamp.org will download the file, sanitize it, minify it, and store a local copy, then enqueue the local copy as a stylesheet alongside your theme's default stylesheet.",
+ 'wordcamporg'
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'The local copy will need to be <strong>synchronized</strong> whenever you make a change to the file.
- You can either update manually by pushing the <strong>Update</strong> button again, or update automatically by setting up a webhook.
- For instructions on setting up a webhook, open the <strong>Automated Synchronization</strong> tab.', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e(
+ 'The local copy will need to be <strong>synchronized</strong> whenever you make a change to the file. You can either update manually by pushing the <strong>Update</strong> button again, or update automatically by setting up a webhook. For instructions on setting up a webhook, open the <strong>Automated Synchronization</strong> tab.',
+ 'wordcamporg'
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'If you run into any problems, you can ask for help in the <code>#meta-wordcamp</code> channel on <a href="%s">Slack</a>.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s: WordPress Slack URL */
+ __(
+ 'If you run into any problems, you can ask for help in the <code>#meta-wordcamp</code> channel on <a href="%s">Slack</a>.',
+ 'wordcamporg'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'https://chat.wordpress.org'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelpoverviewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-overview.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-overview.php 2017-08-17 22:11:15 UTC (rev 5818)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-overview.php 2017-08-17 22:12:36 UTC (rev 5819)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,8 +10,10 @@
</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"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Remote CSS gives you a lot more flexibility in how you develop your site than the Core/Jetpack editor.
- For instance, you can:', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e(
+ 'Remote CSS gives you a lot more flexibility in how you develop your site than the Core/Jetpack editor. For instance, you can:',
+ 'wordcamporg'
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,19 +26,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "You can use all of those tools, only some of them, or completely different ones.
- It's up to you how you choose to work.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e(
+ "You can use all of those tools, only some of them, or completely different ones. It's up to you how you choose to work.",
+ 'wordcamporg'
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "This tool works by fetching your CSS file from a remote server (like GitHub.com), sanitizing the CSS, minifying it,
- and then storing a local copy on WordCamp.org. The local copy is then enqueued as a stylesheet, either in addition to your theme's stylesheet,
- or as a replacement for it. The local copy of the CSS is synchronized with the remote file whenever you press the <strong>Update</strong> button,
- and you can also setup webhook notifications for automatic synchronization when the remote file changes.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e(
+ "This tool works by fetching your CSS file from a remote server (like GitHub.com), sanitizing the CSS, minifying it, and then storing a local copy on WordCamp.org. The local copy is then enqueued as a stylesheet, either in addition to your theme's stylesheet, or as a replacement for it. The local copy of the CSS is synchronized with the remote file whenever you press the <strong>Update</strong> button, and you can also setup webhook notifications for automatic synchronization when the remote file changes.",
+ 'wordcamporg'
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // translators: %s: URL to Custom CSS section in the Customizer
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'If you\'re looking for something simpler, <a href="%s">the Core/Jetpack editor</a> is a great option.', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $custom_css_url )
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewshelptipsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-tips.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-tips.php 2017-08-17 22:11:15 UTC (rev 5818)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/help-tips.php 2017-08-17 22:12:36 UTC (rev 5819)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,9 +19,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "Don't use post IDs as selectors, because they can change between your development environment and production.
- Instead, use the slug; e.g. <code>body.post-slug-call-for-volunteers</code>, or <code>body.wcb_speaker-slug-sergey-biryukov</code>.
- Just make sure that you update your CSS if you rename a post.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e(
+ "Don't use post IDs as selectors, because they can change between your development environment and production. Instead, use the slug; e.g. <code>body.post-slug-call-for-volunteers</code>, or <code>body.wcb_speaker-slug-sergey-biryukov</code>. Just make sure that you update your CSS if you rename a post.",
+ 'wordcamporg'
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,15 +34,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Upload your images to <a href="%s">the Media Library</a> rather than hosting them on 3rd party servers.
- That way, visitors will avoid an extra DNS request,
- and you won\'t have to worry about them going offline if there\'s a problem with the external server.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __(
+ 'Upload your images to <a href="%s">the Media Library</a> rather than hosting them on 3rd party servers. That way, visitors will avoid an extra DNS request, and you won\'t have to worry about them going offline if there\'s a problem with the external server.',
+ 'wordcamporg'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( $media_library_url )
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "This tool plays nicely with the Core/Jetpack editor, and it's possible to use both.
- If you do, the rules in the Core/Jetpack editor will take precedence.", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e(
+ "This tool plays nicely with the Core/Jetpack editor, and it's possible to use both. If you do, the rules in the Core/Jetpack editor will take precedence.",
+ 'wordcamporg'
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampremotecssviewspageremotecssphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/page-remote-css.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/page-remote-css.php 2017-08-17 22:11:15 UTC (rev 5818)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-remote-css/views/page-remote-css.php 2017-08-17 22:12:36 UTC (rev 5819)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,10 +29,13 @@
</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="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e(
- 'Remote CSS allows you to develop your CSS in any environment that you choose, and with whatever tools that you prefer.
- <button type="button" id="wcrcss-open-help-tab" class="button-link">Open the Help tab</button> for detailed instructions.',
- 'wordcamporg'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf(
+ // translators: %s: button attributes
+ __(
+ 'Remote CSS allows you to develop your CSS in any environment that you choose, and with whatever tools that you prefer. <button %s>Open the Help tab</button> for detailed instructions.',
+ 'wordcamporg'
+ ),
+ 'type="button" id="wcrcss-open-help-tab" class="button-link"'
</ins><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>