Changeset 3374483

Timestamp:

10/07/2025 02:25:18 PM (2 months ago)

Author:

donncha

Message:

Committing 3.1.3 to trunk

Location:

polldaddy/trunk

Files:

• ajax.php (modified) (1 diff)
• css/polldaddy.css (modified) (2 diffs)
• js/polldaddy.js (modified) (1 diff)
• languages (added)
• languages/polldaddy.pot (added)
• locale (deleted)
• partials/api-key-page.php (modified) (1 diff)
• partials/crowdsignal-landing-page.php (modified) (2 diffs)
• partials/html-admin-setup-footer.php (modified) (1 diff)
• partials/html-admin-setup-header.php (modified) (6 diffs)
• partials/html-admin-setup-step-1.php (modified) (2 diffs)
• partials/poll-edit-form.php (modified) (6 diffs)
• partials/polls-table.php (modified) (5 diffs)
• partials/settings-2.php (modified) (2 diffs)
• partials/settings.php (modified) (8 diffs)
• polldaddy-org.php (modified) (4 diffs)
• polldaddy-shortcode.php (modified) (2 diffs)
• polldaddy.php (modified) (41 diffs)
• popups.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)

polldaddy/trunk/ajax.php

@@ -78 +78 @@
                         <tr>
                             <th>
-                                <span class="handle" title="' . esc_attr( __( 'click and drag to reorder' ) ) . '"><img src="' . $src . 'img/icon-reorder.png" alt="click and drag to reorder" width="6" height="9" /></span>
+                                <span class="handle" title="' . esc_attr( __( 'click and drag to reorder', 'polldaddy' ) ) . '"><img src="' . $src . 'img/icon-reorder.png" alt="' . esc_attr( __( 'click and drag to reorder', 'polldaddy' ) ) . '" width="6" height="9" /></span>
                             </th>
                             <td class="answer-input">

polldaddy/trunk/css/polldaddy.css

@@ -96 +96 @@
     padding-left: 4px;
     padding-right: 4px;
-    visibility: hidden;
+    opacity: 0.7;
 }
 
@@ -107 +107 @@
 }
 table.cs-dashboard__grid tr:hover .is-links a {
-    visibility: visible;
+    opacity: 1;
 }
 

polldaddy/trunk/js/polldaddy.js

@@ -1 @@
-jQuery(function(e){if(typeof window.$=="undefined"){window.$=jQuery}Plugin=function(t){function i(){return"https:"==document.location.protocol?true:false}function s(e,t){return false}function o(){var e=jQuery("body",window.parent.document).width();var t=jQuery("body",window.parent.document).height();var n=typeof document.body.style.maxHeight==="undefined";jQuery("#TB_window, #TB_iframeContent",window.parent.document).css("width","855px");jQuery("#TB_window",window.parent.document).css({left:(e-768)/2+"px",top:48+window.parent.scrollY+"px",position:"absolute",marginLeft:"0"});if(!n){jQuery("#TB_window, #TB_iframeContent",window.parent.document).css("height",t-73+"px")}}function p(){o();jQuery(window).resize(function(){setTimeout(o,50)});e("a.delete-media").unbind("click").click(function(){var t=e(this).parents("td.answer-media-icons");t.find("li.image-added").removeClass("image-added").html("");t.find(":hidden").val("")});e("td.answer-media-icons li.image-added").unbind("mouseover").mouseover(function(){e(this).find("img").addClass("hidden");e(this).find("a.delete-media img").removeClass("hidden");e(this).find("a.delete-media").removeClass("hidden")}).unbind("mouseout").mouseout(function(){e(this).find("a.delete-media").addClass("hidden");e(this).find("img").removeClass("hidden")});e(".image").unbind("click").click(function(){var t=e(this).attr("id").replace("add_poll_image","");tb_show("Add an Image","media-upload.php?type=image&polls_media=1TB_iframe=1");a.send_to_editor=function(n){var r=e("<div/>").html(n);img=r.find("img");attach_id=0;url=img.attr("src");if(i())url=url.replace("http://","https://");match=img.attr("class").match(/wp-image-(\d+)/);if(e.isArray(match)&&match[1]!==undefined)attach_id=match[1];tb_remove();d(url,t,attach_id)};return false});e(".video").unbind("click").click(function(){var t=e(this).attr("id").replace("add_poll_video","");tb_show("Add Video","media-upload.php?type=video&tab=type_url&polls_media=1&TB_iframe=1");a.send_to_editor=function(e){tb_remove();v(t,e,'<img height="16" width="16" src="'+n.base_url+'img/icon-report-ip-analysis.png" alt="Video Embed">')};return false});e(".audio").unbind("click").click(function(){var t=e(this).attr("id").replace("add_poll_audio","");tb_show("Add Audio","media-upload.php?type=audio&polls_media=1&TB_iframe=1");a.send_to_editor=function(n){var r=e("<div/>").html(n);img=r.find("img");attach_id=0;url=img.attr("src");if(i())url=url.replace("http://","https://");match=img.attr("class").match(/wp-image-(\d+)/);if(e.isArray(match)&&match[1]!==undefined)attach_id=match[1];tb_remove();d(url,t,attach_id)};return false})}function d(t,n,r){if(h==true)return false;h=true;e('input[name="media['+n+']"]').parents("td").find(".media-preview").addClass("st_image_loader");e("form[name=send-media] input[name=media-id]").val(n);e("form[name=send-media] input[name=attach-id]").val(r);e("form[name=send-media] input[name=url]").val(t);e("form[name=send-media] input[name=action]").val("polls_upload_image");e("form[name=send-media]").ajaxSubmit(function(e){h=false;e=e.replace(/<div.*/,"");if(e.substr(0,4)=="true"){var t=e.split("||");v(t[4],t[1],t[2])}else v(n,"","")});return false}function v(t,n,r){if(parseInt(n)>0)e('input[name="mediaType['+t+']"]').val(1);else e('input[name="mediaType['+t+']"]').val(2);if(i())r.replace("http://","https://");var s=e("div.hidden-links").find("div.delete-media-link").html();r+=s;var o=e('input[name="media['+t+']"]').parents("td.answer-media-icons").find("li.media-preview");o.removeClass("st_image_loader");o.html(r);o.addClass("image-added");e('input[name="media['+t+']"]').val(n);p()}function m(){var t=parseInt(e(".answer").size());e("input.answer-text").each(function(){var r=this;if(e(r).val()==n.new_answer||e(r).hasClass("idle"))t--});return t}var n=e.extend({delete_rating:'Are you sure you want to delete the rating for "%s"?',delete_poll:'Are you sure you want to delete "%s"?',delete_answer:"Are you sure you want to delete this answer?",new_answer:"Enter an answer here",delete_answer_title:"delete this answer",reorder_answer_title:"click and drag to reorder",add_image_title:"Add an Image",add_audio_title:"Add Audio",add_video_title:"Add Video",standard_styles:"Standard Styles",custom_styles:"Custom Styles",base_url:""},t);e(".hide-if-js").hide();e(".empty-if-js").empty();e(".hide-if-no-js").removeClass("hide-if-no-js");e(".polldaddy-shortcode-row pre").click(function(){var t=e(this)[0];if(e.browser.msie){var n=document.body.createTextRange();n.moveToElementText(t);n.select()}else if(e.browser.mozilla||e.browser.opera){var r=window.getSelection();var n=document.createRange();n.selectNodeContents(t);r.removeAllRanges();r.addRange(n)}else if(e.browser.safari){var r=window.getSelection();r.setBaseAndExtent(t,0,t,1)}});e("input#shortcode-field").click(function(){e(this).select()});e("a.delete-rating").click(function(){return confirm(n.delete_rating.replace("%s",e(this).parents("td").find("strong").text()))});e("a.delete-poll").click(function(){return confirm(n.delete_poll.replace("%s",e(this).parents("td").find("strong").text()))});e("span.view a.thickbox").attr("href",function(){return e(this).attr("href")+"&iframe&TB_iframe=true"});var r=function(t){e("a.delete-answer",t||null).click(function(){if(confirm(n.delete_answer)){e(this).parents("li").remove();e("#choices option:last-child").remove()}return false})};r();e("#answers").sortable({axis:"y",containment:"parent",handle:".handle",tolerance:"pointer"});var u=false;e("#add-answer-holder").show().find("button").click(function(){if(!u){u=true;var t=(1+m()).toString();var n=e(this).closest("p").attr("class");e("form[name=add-answer] input[name=aa]").val(t);e("form[name=add-answer] input[name=src]").val(n);e("form[name=add-answer] input[name=action]").val("polls_add_answer");e("form[name=add-answer]").ajaxSubmit(function(n){r(e("#answers").append(n).find("li:last"));e("#choices").append('<option value="'+(t-1)+'">'+(t-1)+"</option>");u=false;p()})}return false});var a=window.dialogArguments||opener||parent||top;e(".polldaddy-send-to-editor").click(function(){var t=e(this).parents("div.row-actions").find(".polldaddy-poll-id").val();if(!t)t=e(".polldaddy-poll-id:first").val();if(t){t=parseInt(t);if(t>0){a.send_to_editor("[polldaddy poll="+t.toString()+"]")}}});e(".polldaddy-show-shortcode").toggle(function(t){t.preventDefault();e(this).parents("tr:first").next("tr").fadeIn();e(this).parents("tr:first").next("tr").show();e(this).closest("tr").css("display","none");return false},function(){e(this).parents("tr:first").next("tr").fadeOut();e(this).parents("tr:first").next("tr").hide();return false});e(".pd-embed-done").click(function(t){t.preventDefault();e(this).closest("tr").hide();e(this).closest("tr").prev("tr").show()});e(".pd-tabs a").click(function(){if(!jQuery(this).closest("li").hasClass("selected")){jQuery(".pd-tabs li").removeClass("selected");jQuery(this).closest("li").addClass("selected");jQuery(".pd-tab-panel").removeClass("show");jQuery(".pd-tab-panel#"+e(this).closest("li").attr("id")+"-panel").addClass("show")}});var f=e(":input[name=styleID]");var l=e(":input[name=customSelect]");var c=parseInt(l.val());if(c>0){f.val(c.toString());e("#pd-custom-styles a").click()}e("#multipleChoice").click(function(){if(e("#multipleChoice").is(":checked")){e("#numberChoices").show("fast")}else{e("#numberChoices").hide("fast")}});e(".block-repeat").click(function(){var t=jQuery(this).val();if(t=="off"){e("#cookieip_expiration_label").hide();e("#cookieip_expiration").hide()}else{e("#cookieip_expiration_label").show();e("#cookieip_expiration").show()}});var h=false;p();var g={add_media:v};return g}})
+jQuery(function(e){if(typeof window.$=="undefined"){window.$=jQuery}Plugin=function(t){function i(){return"https:"==document.location.protocol?true:false}function s(e,t){return false}function o(){var e=jQuery("body",window.parent.document).width();var t=jQuery("body",window.parent.document).height();var n=typeof document.body.style.maxHeight==="undefined";jQuery("#TB_window, #TB_iframeContent",window.parent.document).css("width","855px");jQuery("#TB_window",window.parent.document).css({left:(e-768)/2+"px",top:48+window.parent.scrollY+"px",position:"absolute",marginLeft:"0"});if(!n){jQuery("#TB_window, #TB_iframeContent",window.parent.document).css("height",t-73+"px")}}function p(){o();jQuery(window).resize(function(){setTimeout(o,50)});e("a.delete-media").unbind("click").click(function(){var t=e(this).parents("td.answer-media-icons");t.find("li.image-added").removeClass("image-added").html("");t.find(":hidden").val("")});e("td.answer-media-icons li.image-added").unbind("mouseover").mouseover(function(){e(this).find("img").addClass("hidden");e(this).find("a.delete-media img").removeClass("hidden");e(this).find("a.delete-media").removeClass("hidden")}).unbind("mouseout").mouseout(function(){e(this).find("a.delete-media").addClass("hidden");e(this).find("img").removeClass("hidden")});e(".image").unbind("click").click(function(){var t=e(this).attr("id").replace("add_poll_image","");var r="media-upload.php?type=image&polls_media=1";if(typeof pollsMediaSecurity!=="undefined"&&pollsMediaSecurity.nonce){r+="&_wpnonce="+encodeURIComponent(pollsMediaSecurity.nonce)}tb_show("Add an Image",r+"&TB_iframe=1");a.send_to_editor=function(n){var r=e("<div/>").html(n);img=r.find("img");attach_id=0;url=img.attr("src");if(i())url=url.replace("http://","https://");match=img.attr("class").match(/wp-image-(\d+)/);if(e.isArray(match)&&match[1]!==undefined)attach_id=match[1];tb_remove();d(url,t,attach_id)};return false});e(".video").unbind("click").click(function(){var t=e(this).attr("id").replace("add_poll_video","");var r="media-upload.php?type=video&tab=type_url&polls_media=1";if(typeof pollsMediaSecurity!=="undefined"&&pollsMediaSecurity.nonce){r+="&_wpnonce="+encodeURIComponent(pollsMediaSecurity.nonce)}tb_show("Add Video",r+"&TB_iframe=1");a.send_to_editor=function(e){tb_remove();v(t,e,'<img height="16" width="16" src="'+n.base_url+'img/icon-report-ip-analysis.png" alt="Video Embed">')};return false});e(".audio").unbind("click").click(function(){var t=e(this).attr("id").replace("add_poll_audio","");var r="media-upload.php?type=audio&polls_media=1";if(typeof pollsMediaSecurity!=="undefined"&&pollsMediaSecurity.nonce){r+="&_wpnonce="+encodeURIComponent(pollsMediaSecurity.nonce)}tb_show("Add Audio",r+"&TB_iframe=1");a.send_to_editor=function(n){var r=e("<div/>").html(n);img=r.find("img");attach_id=0;url=img.attr("src");if(i())url=url.replace("http://","https://");match=img.attr("class").match(/wp-image-(\d+)/);if(e.isArray(match)&&match[1]!==undefined)attach_id=match[1];tb_remove();d(url,t,attach_id)};return false})}function d(t,n,r){if(h==true)return false;h=true;e('input[name="media['+n+']"]').parents("td").find(".media-preview").addClass("st_image_loader");e("form[name=send-media] input[name=media-id]").val(n);e("form[name=send-media] input[name=attach-id]").val(r);e("form[name=send-media] input[name=url]").val(t);e("form[name=send-media] input[name=action]").val("polls_upload_image");e("form[name=send-media]").ajaxSubmit(function(e){h=false;e=e.replace(/<div.*/,"");if(e.substr(0,4)=="true"){var t=e.split("||");v(t[4],t[1],t[2])}else v(n,"","")});return false}function v(t,n,r){if(parseInt(n)>0)e('input[name="mediaType['+t+']"]').val(1);else e('input[name="mediaType['+t+']"]').val(2);if(i())r.replace("http://","https://");var s=e("div.hidden-links").find("div.delete-media-link").html();r+=s;var o=e('input[name="media['+t+']"]').parents("td.answer-media-icons").find("li.media-preview");o.removeClass("st_image_loader");o.html(r);o.addClass("image-added");e('input[name="media['+t+']"]').val(n);p()}function m(){var t=parseInt(e(".answer").size());e("input.answer-text").each(function(){var r=this;if(e(r).val()==n.new_answer||e(r).hasClass("idle"))t--});return t}var n=e.extend({delete_rating:'Are you sure you want to delete the rating for "%s"?',delete_poll:'Are you sure you want to delete "%s"?',delete_answer:"Are you sure you want to delete this answer?",new_answer:"Enter an answer here",delete_answer_title:"delete this answer",reorder_answer_title:"click and drag to reorder",add_image_title:"Add an Image",add_audio_title:"Add Audio",add_video_title:"Add Video",standard_styles:"Standard Styles",custom_styles:"Custom Styles",base_url:""},t);e(".hide-if-js").hide();e(".empty-if-js").empty();e(".hide-if-no-js").removeClass("hide-if-no-js");e(".polldaddy-shortcode-row pre").click(function(){var t=e(this)[0];if(e.browser.msie){var n=document.body.createTextRange();n.moveToElementText(t);n.select()}else if(e.browser.mozilla||e.browser.opera){var r=window.getSelection();var n=document.createRange();n.selectNodeContents(t);r.removeAllRanges();r.addRange(n)}else if(e.browser.safari){var r=window.getSelection();r.setBaseAndExtent(t,0,t,1)}});e("input#shortcode-field").click(function(){e(this).select()});e("a.delete-rating").click(function(){return confirm(n.delete_rating.replace("%s",e(this).parents("td").find("strong").text()))});e("a.delete-poll").click(function(){return confirm(n.delete_poll.replace("%s",e(this).parents("td").find("strong").text()))});e("span.view a.thickbox").attr("href",function(){return e(this).attr("href")+"&iframe&TB_iframe=true"});var r=function(t){e("a.delete-answer",t||null).click(function(){if(confirm(n.delete_answer)){e(this).parents("li").remove();e("#choices option:last-child").remove()}return false})};r();e("#answers").sortable({axis:"y",containment:"parent",handle:".handle",tolerance:"pointer"});var u=false;e("#add-answer-holder").show().find("button").click(function(){if(!u){u=true;var t=(1+m()).toString();var n=e(this).closest("p").attr("class");e("form[name=add-answer] input[name=aa]").val(t);e("form[name=add-answer] input[name=src]").val(n);e("form[name=add-answer] input[name=action]").val("polls_add_answer");e("form[name=add-answer]").ajaxSubmit(function(n){r(e("#answers").append(n).find("li:last"));e("#choices").append('<option value="'+(t-1)+'">'+(t-1)+"</option>");u=false;p()})}return false});var a=window.dialogArguments||opener||parent||top;e(".polldaddy-send-to-editor").click(function(){var t=e(this).parents("div.row-actions").find(".polldaddy-poll-id").val();if(!t)t=e(".polldaddy-poll-id:first").val();if(t){t=parseInt(t);if(t>0){a.send_to_editor("[polldaddy poll="+t.toString()+"]")}}});e(".polldaddy-show-shortcode").toggle(function(t){t.preventDefault();e(this).parents("tr:first").next("tr").fadeIn();e(this).parents("tr:first").next("tr").show();e(this).closest("tr").css("display","none");return false},function(){e(this).parents("tr:first").next("tr").fadeOut();e(this).parents("tr:first").next("tr").hide();return false});e(".pd-embed-done").click(function(t){t.preventDefault();e(this).closest("tr").hide();e(this).closest("tr").prev("tr").show()});e(".pd-tabs a").click(function(){if(!jQuery(this).closest("li").hasClass("selected")){jQuery(".pd-tabs li").removeClass("selected");jQuery(this).closest("li").addClass("selected");jQuery(".pd-tab-panel").removeClass("show");jQuery(".pd-tab-panel#"+e(this).closest("li").attr("id")+"-panel").addClass("show")}});var f=e(":input[name=styleID]");var l=e(":input[name=customSelect]");var c=parseInt(l.val());if(c>0){f.val(c.toString());e("#pd-custom-styles a").click()}e("#multipleChoice").click(function(){if(e("#multipleChoice").is(":checked")){e("#numberChoices").show("fast")}else{e("#numberChoices").hide("fast")}});e(".block-repeat").click(function(){var t=jQuery(this).val();if(t=="off"){e("#cookieip_expiration_label").hide();e("#cookieip_expiration").hide()}else{e("#cookieip_expiration_label").show();e("#cookieip_expiration").show()}});var h=false;p();var g={add_media:v};return g}})

polldaddy/trunk/partials/api-key-page.php

@@ -10 +10 @@
 <p>
     <?php
-    /* translators: name of the rating being deleted */
+    /* translators: %s is the URL to the Crowdsignal.com account details */
     printf( __( 'Before you can use the Crowdsignal plugin, you need to enter your <a href="%s">Crowdsignal.com</a> account details.', 'polldaddy' ), 'https://crowdsignal.com/' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- fixed input
     ?>

polldaddy/trunk/partials/crowdsignal-landing-page.php

@@ -24 +24 @@
         <div class="crowdsignal-landing__hero">
             <div class="crowdsignal-landing__hero-left">
-                <div class="crowdsignal-landing__hero-headline"><?php esc_html_e( 'Looking for insights?' ); ?><br><?php esc_html_e( 'Start asking!' ); ?></div>
+                <div class="crowdsignal-landing__hero-headline"><?php esc_html_e( 'Looking for insights?', 'polldaddy' ); ?><br><?php esc_html_e( 'Start asking!', 'polldaddy' ); ?></div>
                 <div class="crowdsignal-landing__hero-subline">
                     <strong><?php esc_html_e( 'Crowdsignal', 'polldaddy' ); ?></strong>
-                    <?php esc_html_e( 'is a collection of powerful blocks that help you to collect feedback, analyze incoming responses and learn from your audience.' ); ?>
+                    <?php esc_html_e( 'is a collection of powerful blocks that help you to collect feedback, analyze incoming responses and learn from your audience.', 'polldaddy' ); ?>
                 </div>
             </div>
@@ -129 +129 @@
     <div class="crowdsignal-landing__blocks-cta crowdsignal-landing__blocks-export-showcase">
         <img src="<?php echo esc_html( $resource_path ); ?>/img/export-everywhere.png"
-            alt="<?php esc_html_e( 'Export showcase image', 'polldady' ); ?>"
-            title="<?php esc_html_e( 'Export showcase', 'polldady' ); ?>" width="583px" />
+            alt="<?php esc_html_e( 'Export showcase image', 'polldaddy' ); ?>"
+            title="<?php esc_html_e( 'Export showcase', 'polldaddy' ); ?>" width="583px" />
     </div>
 </div>

polldaddy/trunk/partials/html-admin-setup-footer.php

@@ -22 +22 @@
         <ul class="cs-footer__links">
             <li class="cs-footer__link-item"><a href="https://crowdsignal.com" target="_blank" rel="noopener noreferrer" class="cs-footer__link" title="Crowdsignal">Crowdsignal.com</a></li>
-            <li class="cs-footer__link-item"><a href="https://crowdsignal.com/support" target="_blank" rel="noopener noreferrer" class="cs-footer__link" title="<?php esc_html_e( 'Crowdsignal Support', 'crowdsignal-forms' ); ?>"><?php esc_html_e( 'Support', 'crowdsignal-forms' ); ?></a></li>
-            <li class="cs-footer__link-item"><a href="https://crowdsignal.com/terms/" target="_blank" rel="noopener noreferrer" title="<?php esc_attr_e( 'Terms of Service', 'crowdsignal-forms' ); ?>" class="cs-footer__link"><?php esc_html_e( 'Terms', 'crowdsignal-forms' ); ?></a></li>
-            <li class="cs-footer__link-item"><a href="https://automattic.com/privacy/" target="_blank" rel="noopener noreferrer" title="<?php esc_attr_e( 'Privacy Policy', 'crowdsignal-forms' ); ?>" class="cs-footer__link"><?php esc_html_e( 'Privacy', 'crowdsignal-forms' ); ?></a></li>
+            <li class="cs-footer__link-item"><a href="https://crowdsignal.com/support" target="_blank" rel="noopener noreferrer" class="cs-footer__link" title="<?php esc_html_e( 'Crowdsignal Support', 'polldaddy' ); ?>"><?php esc_html_e( 'Support', 'polldaddy' ); ?></a></li>
+            <li class="cs-footer__link-item"><a href="https://crowdsignal.com/terms/" target="_blank" rel="noopener noreferrer" title="<?php esc_attr_e( 'Terms of Service', 'polldaddy' ); ?>" class="cs-footer__link"><?php esc_html_e( 'Terms', 'polldaddy' ); ?></a></li>
+            <li class="cs-footer__link-item"><a href="https://automattic.com/privacy/" target="_blank" rel="noopener noreferrer" title="<?php esc_attr_e( 'Privacy Policy', 'polldaddy' ); ?>" class="cs-footer__link"><?php esc_html_e( 'Privacy', 'polldaddy' ); ?></a></li>
         </ul>
     </div>

polldaddy/trunk/partials/html-admin-setup-header.php

@@ -13 +13 @@
     <div id="cs-plugin-container">
         <div class='cs-lower'>
-            <h1 id='crowdsignal__logo'><?php esc_html_e( 'Crowdsignal Settings', 'crowdsignal-forms' ); ?></h1>
+            <h1 id='crowdsignal__logo'><?php esc_html_e( 'Crowdsignal Settings', 'polldaddy' ); ?></h1>
             <?php
             // phpcs:ignore WordPress.Security.NonceVerification.Recommended
@@ -22 +22 @@
                         echo '<div class="error fade crowdsignal-message"><p>' .
                         // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Content is svg from internal lib
-                        esc_html__( 'Could not disconnect. Please try again.', 'crowdsignal-forms' ) .
+                        esc_html__( 'Could not disconnect. Please try again.', 'polldaddy' ) .
                         '</p></div>';
                         break;
@@ -28 +28 @@
                         echo '<div class="updated fade crowdsignal-message"><p>' .
                         // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Content is svg from internal lib
-                        esc_html__( 'Successfully disconnected from Crowdsignal.', 'crowdsignal-forms' ) .
+                        esc_html__( 'Successfully disconnected from Crowdsignal.', 'polldaddy' ) .
                         '</p></div>';
                         break;
@@ -34 +34 @@
                         echo '<div class="updated crowdsignal-message"><p>' .
                         // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Content is svg from internal lib
-                        esc_html__( 'Success! Your Crowdsignal account is successfully connected! You are ready!', 'crowdsignal-forms' ) .
+                        esc_html__( 'Success! Your Crowdsignal account is successfully connected! You are ready!', 'polldaddy' ) .
                         '</p></div>';
                         break;
@@ -40 +40 @@
                         echo '<div class="updated crowdsignal-message"><p>' .
                         // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Content is svg from internal lib
-                        esc_html__( 'You have been connected to Crowdsignal.', 'crowdsignal-forms' ) .
+                        esc_html__( 'You have been connected to Crowdsignal.', 'polldaddy' ) .
                         '</p></div>';
                         break;
@@ -46 +46 @@
                         echo '<div class="error fade crowdsignal-message"><p>' .
                         // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Content is svg from internal lib
-                        esc_html__( 'Your API key has not been updated, please try again.', 'crowdsignal-forms' ) .
+                        esc_html__( 'Your API key has not been updated, please try again.', 'polldaddy' ) .
                         '</p></div>';
                         break;

polldaddy/trunk/partials/html-admin-setup-step-1.php

@@ -14 +14 @@
                 <div class="cs-card cs-section-header is-compact">
                     <div class="cs-section-header__label">
-                        <span class="cs-section-header__label-text"><?php esc_html_e( 'Getting Started', 'crowdsignal-forms' ); ?></span>
+                        <span class="cs-section-header__label-text"><?php esc_html_e( 'Getting Started', 'polldaddy' ); ?></span>
                     </div>
                 </div>
@@ -23 +23 @@
                         <div class="crowdsignal-setup__content">
                             <div class="crowdsignal-setup__description">
-                                <h1><?php esc_html_e( 'Welcome to Crowdsignal', 'crowdsignal-forms' ); ?></h1>
+                                <h1><?php esc_html_e( 'Welcome to Crowdsignal', 'polldaddy' ); ?></h1>
                                 <p><?php echo wp_kses_post( 'To collect and manage responses you need to connect the plugin to <a href="https://crowdsignal.com">Crowdsignal</a>. <br />It will take less than a minute and it’s free.', 'polldaddy' ); ?></p>
                             </div>

polldaddy/trunk/partials/poll-edit-form.php

@@ -13 +13 @@
 // phpcs:disable WordPress.WP.I18n.MissingTranslatorsComment -- TODO
 
-$delete_media_link = '<a href="#" class="delete-media delete hidden" title="' . esc_attr( __( 'delete this image' ) ) . '"><img src="' . esc_url( $base_url ) . 'img/icon-clear-search.png" width="16" height="16" /></a>';
+$delete_media_link = '<a href="#" class="delete-media delete hidden" title="' . esc_attr( __( 'delete this image', 'polldaddy' ) ) . '"><img src="' . esc_url( $base_url ) . 'img/icon-clear-search.png" width="16" height="16" /></a>';
 ?>
 <form enctype="multipart/form-data" name="send-media" action="admin-ajax.php" method="post">
@@ -184 +184 @@
                     <span style="margin:6px 6px 8px;<?php echo $poll->blockRepeatVotersType === 'off' ? 'display:none;' : ''; ?>" id="cookieip_expiration_label"><label><?php _e( 'Expires: ', 'polldaddy' ); ?></label></span>
                     <select id="cookieip_expiration" name="cookieip_expiration" style="width: auto;<?php echo $poll->blockRepeatVotersType === 'off' ? 'display:none;' : ''; ?>">
-                        <option value="3600" <?php echo (int) $poll->blockExpiration === 3600 ? 'selected' : ''; ?>><?php printf( __( '%d hour', 'polldaddy' ), 1 ); ?></option>
-                        <option value="10800" <?php echo (int) $poll->blockExpiration === 10800 ? 'selected' : ''; ?>><?php printf( __( '%d hours', 'polldaddy' ), 3 ); ?></option>
-                        <option value="21600" <?php echo (int) $poll->blockExpiration === 21600 ? 'selected' : ''; ?>><?php printf( __( '%d hours', 'polldaddy' ), 6 ); ?></option>
+                        <option value="3600" <?php echo (int) $poll->blockExpiration === 3600 ? 'selected' : ''; ?>><?php
+                        /* translators: %d is the number of hours */
+                        printf( __( '%d hour', 'polldaddy' ), 1 ); ?></option>
+                        <option value="10800" <?php echo (int) $poll->blockExpiration === 10800 ? 'selected' : ''; ?>><?php
+                        /* translators: %d is the number of hours */
+                        printf( __( '%d hours', 'polldaddy' ), 3 ); ?></option>
+                        <option value="21600" <?php echo (int) $poll->blockExpiration === 21600 ? 'selected' : ''; ?>><?php
+                        /* translators: %d is the number of hours */
+                        printf( __( '%d hours', 'polldaddy' ), 6 ); ?></option>
                         <option value="43200" <?php echo (int) $poll->blockExpiration === 43200 ? 'selected' : ''; ?>><?php printf( __( '%d hours', 'polldaddy' ), 12 ); ?></option>
-                        <option value="86400" <?php echo (int) $poll->blockExpiration === 86400 ? 'selected' : ''; ?>><?php printf( __( '%d day', 'polldaddy' ), 1 ); ?></option>
-                        <option value="604800" <?php echo (int) $poll->blockExpiration === 604800 ? 'selected' : ''; ?>><?php printf( __( '%d week', 'polldaddy' ), 1 ); ?></option>
+                        <option value="86400" <?php echo (int) $poll->blockExpiration === 86400 ? 'selected' : ''; ?>><?php
+                        /* translators: %d is the number of days */
+                        printf( __( '%d day', 'polldaddy' ), 1 ); ?></option>
+                        <option value="604800" <?php echo (int) $poll->blockExpiration === 604800 ? 'selected' : ''; ?>><?php
+                        /* translators: %d is the number of weeks */
+                        printf( __( '%d week', 'polldaddy' ), 1 ); ?></option>
                     </select>
                     <p><?php _e( 'Note: Blocking by cookie and IP address can be problematic for some voters.', 'polldaddy' ); ?></p>
@@ -279 +289 @@
                                 <strong><?php _e( 'WordPress Shortcode:', 'polldaddy' ); ?></strong>
                                 <input type="text" style="color:#999;" value="[crowdsignal poll=<?php echo esc_attr( $poll->_id ); ?>]" id="shortcode-field" readonly="readonly" />
-                                <span><a href="post-new.php?content=[crowdsignal poll=<?php echo esc_attr( $poll->_id ); ?>]" class="button"><?php _e( 'Embed Poll in New Post' ); ?></a></span>
+                                <span><a href="post-new.php?content=[crowdsignal poll=<?php echo esc_attr( $poll->_id ); ?>]" class="button"><?php _e( 'Embed Poll in New Post', 'polldaddy' ); ?></a></span>
                             </div>
                         </div>
@@ -308 +318 @@
                                 <tr>
                                     <th>
-                                        <span class="handle" title="<?php echo esc_attr( __( 'click and drag to reorder' ) ); ?>"><img src="<?php echo esc_url( $base_url ); ?>img/icon-reorder.png" alt="click and drag to reorder" width="6" height="9" /></span>
+                                        <span class="handle" title="<?php echo esc_attr( __( 'click and drag to reorder', 'polldaddy' ) ); ?>"><img src="<?php echo esc_url( $base_url ); ?>img/icon-reorder.png" alt="click and drag to reorder" width="6" height="9" /></span>
                                     </th>
                                     <td class="answer-input">
@@ -371 +381 @@
                                     <tr>
                                         <th>
-                                            <span class="handle" title="<?php echo esc_attr( __( 'click and drag to reorder' ) ); ?>"><img src="<?php echo esc_url( $base_url ); ?>img/icon-reorder.png" alt="click and drag to reorder" width="6" height="9" /></span>
+                                            <span class="handle" title="<?php echo esc_attr( __( 'click and drag to reorder', 'polldaddy' ) ); ?>"><img src="<?php echo esc_url( $base_url ); ?>img/icon-reorder.png" alt="click and drag to reorder" width="6" height="9" /></span>
                                         </th>
                                         <td class="answer-input">
@@ -708 +718 @@
                         jQuery( document ).ready(function(){
                             plugin = new Plugin( {
-                                delete_rating: '<?php echo esc_attr( __( 'Are you sure you want to delete the rating for "%s"?', 'polldaddy' ) ); ?>',
-                                delete_poll: '<?php echo esc_attr( __( 'Are you sure you want to delete "%s"?', 'polldaddy' ) ); ?>',
+                                delete_rating: '<?php echo esc_attr(
+                                    /* translators: %s is the name of the rating being deleted */
+                                    __( 'Are you sure you want to delete the rating for "%s"?', 'polldaddy' ) ); ?>',
+                                delete_poll: '<?php echo esc_attr(
+                                    /* translators: %s is the name of the poll being deleted */
+                                    __( 'Are you sure you want to delete "%s"?', 'polldaddy' ) ); ?>',
                                 delete_answer: '<?php echo esc_attr( __( 'Are you sure you want to delete this answer?', 'polldaddy' ) ); ?>',
                                 new_answer_test: '<?php echo esc_attr( __( 'Enter an answer here', 'polldaddy' ) ); ?>',

polldaddy/trunk/partials/polls-table.php

@@ -34 +34 @@
                 <thead>
                     <tr>
-                        <th class="cs-dashboard__grid is-name"><?php esc_html_e( 'Name' ); ?></th>
-                        <th class="cs-dashboard__grid is-type"><span class="cs-dashboard__mq-desktop-only"><?php esc_html_e( 'Type' ); ?></span></th>
-                        <th class="cs-dashboard__grid is-created"><span class="cs-dashboard__mq-desktop-only"><?php esc_html_e( 'Created' ); ?></span></th>
-                        <th class="cs-dashboard__grid is-status"><?php esc_html_e( 'Status' ); ?></th>
-                        <th class="cs-dashboard__grid is-responses-total"><?php esc_html_e( 'Responses' ); ?></th>
-                        <th class="cs-dashboard__grid is-source"><span class="cs-dashboard__mq-desktop-only"><?php esc_html_e( 'Source' ); ?></span></th>
+                        <th class="cs-dashboard__grid is-name"><?php esc_html_e( 'Name', 'polldaddy' ); ?></th>
+                        <th class="cs-dashboard__grid is-type"><span class="cs-dashboard__mq-desktop-only"><?php esc_html_e( 'Type', 'polldaddy' ); ?></span></th>
+                        <th class="cs-dashboard__grid is-created"><span class="cs-dashboard__mq-desktop-only"><?php esc_html_e( 'Created', 'polldaddy' ); ?></span></th>
+                        <th class="cs-dashboard__grid is-status"><?php esc_html_e( 'Status', 'polldaddy' ); ?></th>
+                        <th class="cs-dashboard__grid is-responses-total"><?php esc_html_e( 'Responses', 'polldaddy' ); ?></th>
+                        <th class="cs-dashboard__grid is-source"><span class="cs-dashboard__mq-desktop-only"><?php esc_html_e( 'Source', 'polldaddy' ); ?></span></th>
                         <th class="cs-dashboard__grid is-links"></th>
                     </tr>
@@ -73 +73 @@
                             $item->name = trim( wp_strip_all_tags( $item->name ) );
                             if ( 0 === strlen( $item->name ) ) {
-                                $item->name = __( 'Unknown' );
+                                $item->name = __( 'Unknown', 'polldaddy' );
                             }
 
@@ -198 +198 @@
                             </td>
                             <td class="cs-dashboard__grid is-status" data-open="<?php echo $item->_closed ? 0 : 1; ?>">
-                            <?php echo ! $item->_closed ? esc_html__( 'Open' ) : esc_html__( 'Closed' ); ?>
+                            <?php echo ! $item->_closed ? esc_html__( 'Open', 'polldaddy' ) : esc_html__( 'Closed', 'polldaddy' ); ?>
                             </td>
                             <td class="cs-dashboard__grid is-responses-total">
@@ -212 +212 @@
                             <td class="cs-dashboard__grid is-links">
                                 <span class="cs-dashboard__mq-desktop-only">
-                                    <a target="_blank" rel="noopener" href="<?php echo esc_url( $results_link ); ?>"><?php esc_html_e( 'Results' ); ?></a>
+                                    <a target="_blank" rel="noopener" href="<?php echo esc_url( $results_link ); ?>"><?php esc_html_e( 'Results', 'polldaddy' ); ?></a>
                                     <?php if ( $edit_link ) { ?>
-                                        <a target="<?php echo $item_post_id ? '' : '_blank'; ?>" rel="noopener" href="<?php echo esc_url( $edit_link ); ?>"><?php esc_html_e( 'Edit' ); ?></a>
+                                        <a target="<?php echo $item_post_id ? '' : '_blank'; ?>" rel="noopener" href="<?php echo esc_url( $edit_link ); ?>"><?php esc_html_e( 'Edit', 'polldaddy' ); ?></a>
                                     <?php } ?>
                                     <?php if ( $open_link || $close_link ) { ?>
-                                        <a target="_blank" rel="noopener" href="<?php echo $item->_closed ? esc_url( $open_link ) : esc_url( $close_link ); ?>"><?php $item->_closed ? esc_html_e( 'Open' ) : esc_html_e( 'Close' ); ?></a>
+                                        <a target="_blank" rel="noopener" href="<?php echo $item->_closed ? esc_url( $open_link ) : esc_url( $close_link ); ?>"><?php $item->_closed ? esc_html_e( 'Open', 'polldaddy' ) : esc_html_e( 'Close', 'polldaddy' ); ?></a>
                                     <?php } ?>
 
                                     <?php if ( $delete_link ) { ?>
-                                        <a target="_blank" rel="noopener" class="delete-poll delete" href="<?php esc_url( $delete_link ); ?>"><?php esc_html_e( 'Delete' ); ?></a>
+                                        <a target="_blank" rel="noopener" class="delete-poll delete" href="<?php esc_url( $delete_link ); ?>"><?php esc_html_e( 'Delete', 'polldaddy' ); ?></a>
                                     <?php } ?>
 
                                     <?php if ( $preview_link ) { ?>
-                                        <a class='thickbox' href="<?php echo esc_url( $preview_link ); ?>"><?php esc_html_e( 'Preview' ); ?></a>
+                                        <a class='thickbox' href="<?php echo esc_url( $preview_link ); ?>"><?php esc_html_e( 'Preview', 'polldaddy' ); ?></a>
                                     <?php } ?>
                                 </span>
@@ -288 +288 @@
 
     plugin = new Plugin( {
-        <?php /* translators: name of the rating being deleted */ ?>
+        <?php /* translators: %s is the name of the rating being deleted */ ?>
         delete_rating: '<?php echo esc_js( __( 'Are you sure you want to delete the rating for "%s"?', 'polldaddy' ) ); ?>',
-        <?php /* translators: name of the poll being deleted */ ?>
+        <?php /* translators: %s is the name of the poll being deleted */ ?>
         delete_poll: '<?php echo esc_js( __( 'Are you sure you want to delete the poll %s?', 'polldaddy' ) ); ?>',
         delete_answer: '<?php echo esc_js( __( 'Are you sure you want to delete this answer?', 'polldaddy' ) ); ?>',

polldaddy/trunk/partials/settings-2.php

@@ -8 +8 @@
 ?>
             <br />
-            <div id='crowdsignal_advanced_link'><a href="#" id='toggle_advanced_setting_link'><?php _e( 'Advanced Settings' ); ?></a></div>
+            <div id='crowdsignal_advanced_link'><a href="#" id='toggle_advanced_setting_link'><?php _e( 'Advanced Settings', 'polldaddy' ); ?></a></div>
             <br />
 
@@ -94 +94 @@
                                     <input type="hidden" name="action" value="reset-account" />
                                     <input type="hidden" name="account" value="import" />
-                                    <p><input type="checkbox" name="email" value="1" /> <?php _e( 'Send me an email with the connection settings for future reference' ); ?></p>
+                                    <p><input type="checkbox" name="email" value="1" /> <?php _e( 'Send me an email with the connection settings for future reference', 'polldaddy' ); ?></p>
                                     <input type="submit" class="button-primary" value="<?php echo esc_attr( __( 'Reset API Connection', 'polldaddy' ) ); ?>" />
                                     </p>

polldaddy/trunk/partials/settings.php

@@ -11 +11 @@
                 <div class="cs-card cs-section-header is-compact">
                     <div class="cs-section-header__label">
-                        <span class="cs-section-header__label-text"><?php esc_html_e( 'Account Settings', 'crowdsignal-forms' ); ?></span>
+                        <span class="cs-section-header__label-text"><?php esc_html_e( 'Account Settings', 'polldaddy' ); ?></span>
                     </div>
                 </div>
@@ -17 +17 @@
                 <div class="cs-card cs-section-header is-compact">
                     <div class="cs-form-settings-group">
-                        <h2><?php esc_html_e( 'API Key', 'crowdsignal-forms' ); ?></h2>
+                        <h2><?php esc_html_e( 'API Key', 'polldaddy' ); ?></h2>
                         <p>
             <?php
             printf(
                 /* translators: Placeholder is the text "Crowdsignal". */
-                esc_html__( 'Your website is connected to a %s account to collect responses and data from your visitors.', 'crowdsignal-forms' ),
+                esc_html__( 'Your website is connected to a %s account to collect responses and data from your visitors.', 'polldaddy' ),
                 '<a href="https://crowdsignal.com/">Crowdsignal</a>'
             );
@@ -30 +30 @@
             printf(
                 /* translators: Placeholder is the text "Crowdsignal acount page". */
-                esc_html__( 'Visit your %s to find out more about your settings.', 'crowdsignal-forms' ),
+                esc_html__( 'Visit your %s to find out more about your settings.', 'polldaddy' ),
                 sprintf(
                     '<a href="https://crowdsignal.com/account/">%s</a>',
-                    esc_html__( 'Crowdsignal account page', 'crowdsignal-forms' )
+                    esc_html__( 'Crowdsignal account page', 'polldaddy' )
                 )
             );
@@ -40 +40 @@
             <?php if ( ! $api_key ) { ?>
                         <p>
-                        <?php esc_html_e( 'If you have a Crowdsignal account, click the "Get API Key" button to connect. This will open a new window.', 'crowdsignal-forms' ); ?>
+                        <?php esc_html_e( 'If you have a Crowdsignal account, click the "Get API Key" button to connect. This will open a new window.', 'polldaddy' ); ?>
                         <form id="cs-connect-form" class="crowdsignal-options" method="post" action="https://app.crowdsignal.com/get-api-key/" target="CSCONNECT">
                         <input type="hidden" name="get_api_key" value="<?php echo esc_attr( get_option( 'crowdsignal_api_key_secret' ) ); ?>" />
                         <input type="hidden" name="ref" value="<?php echo esc_attr( admin_url( 'options-general.php?page=crowdsignal-settings' ) ); ?>" />
-                        <input type="submit" value="<?php esc_html_e( 'Get API Key', 'crowdsignal-forms' ); ?>" class="cs-button is-primary" />
+                        <input type="submit" value="<?php esc_html_e( 'Get API Key', 'polldaddy' ); ?>" class="cs-button is-primary" />
                         </form>
                         </p>
@@ -52 +52 @@
             // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Used for basic flow.
             if ( ! empty( $_GET['settings-updated'] ) ) {
-                echo '<div class="updated fade crowdsignal-updated"><p>' . esc_html__( 'Settings successfully saved', 'crowdsignal-forms' ) . '</p></div>';
+                echo '<div class="updated fade crowdsignal-updated"><p>' . esc_html__( 'Settings successfully saved', 'polldaddy' ) . '</p></div>';
             }
 
@@ -59 +59 @@
                                 <table class="form-table settings parent-settings">
                                     <tr valign="top" class="">
-                                        <th scope="row"><label for="setting-crowdsignal_api_key"><?php esc_html_e( 'Your Crowdsignal API Key', 'crowdsignal-forms' ); ?></a></th>
+                                        <th scope="row"><label for="setting-crowdsignal_api_key"><?php esc_html_e( 'Your Crowdsignal API Key', 'polldaddy' ); ?></a></th>
                                         <td><input
                                     <?php echo $api_key ? 'readonly' : ''; ?>
@@ -75 +75 @@
                                             ?>
                                             <input type="hidden" name="action" value="disconnect" />
-                                            <input type="submit" class="button-primary" value="<?php esc_attr_e( 'Disconnect', 'crowdsignal-forms' ); ?>" />
+                                            <input type="submit" class="button-primary" value="<?php esc_attr_e( 'Disconnect', 'polldaddy' ); ?>" />
                                             <?php
                                         } else {
@@ -81 +81 @@
                                             ?>
                                             <input type="hidden" name="action" value="update" />
-                                            <input type="submit" class="button-primary" value="<?php esc_attr_e( 'Connect', 'crowdsignal-forms' ); ?>" />
+                                            <input type="submit" class="button-primary" value="<?php esc_attr_e( 'Connect', 'polldaddy' ); ?>" />
                                             <?php
                                         }

polldaddy/trunk/polldaddy-org.php

@@ -261 +261 @@
     <h2><?php _e( 'Crowdsignal Account', 'polldaddy' ); ?></h2>
 
+    <?php /* translators: %s is the URL to the Crowdsignal.com account details */ ?>
     <p><?php printf( __( 'Before you can use the Crowdsignal plugin, you need to enter your <a href="%s">Crowdsignal.com</a> account details.', 'polldaddy' ), 'https://app.crowdsignal.com/' ); ?></p>
 
@@ -472 +473 @@
     $polldaddy_class  = WP_POLLDADDY__CLASS;
     $polldaddy_object = new $polldaddy_class;
-    load_plugin_textdomain( 'polldaddy', '', 'polldaddy/locale' );
     add_action( 'admin_menu', array( &$polldaddy_object, 'admin_menu' ) );
 }
@@ -609 +609 @@
                     <label for="<?php echo esc_attr( $this->get_field_id( 'filter_by_category' ) ); ?>">
                         <input type="checkbox" class="checkbox" id="<?php echo esc_attr( $this->get_field_id( 'filter_by_category' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'filter_by_category' ) ); ?>" value="1" <?php echo $filter_by_category == 1 ? 'checked="checked"':''; ?>/>
-                        <?php _e('Filter by category'); ?>
+                        <?php _e('Filter by category', 'polldaddy'); ?>
                     </label>
                 </p>
                 <p>
-                    <label for="rss-items-<?php echo esc_attr( $number ); ?>"><?php _e( 'How many items would you like to display?', 'polldaddy' ); ?>
+                    <label for="<?php echo esc_attr( $this->get_field_id( 'item_count' ) ); ?>"><?php _e( 'How many items would you like to display?', 'polldaddy' ); ?>
                             <select id="<?php echo esc_attr( $this->get_field_id( 'item_count' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'item_count' ) ); ?>">
                         <?php
@@ -653 +653 @@
     }
 
-    echo '<div class="updated"><p><strong>' . sprintf( __( 'Crowdsignal features will be unavailable until you link your Crowdsignal.com account. Please visit the <a href="%s">plugin settings page</a> to login.', 'polldaddy' ), admin_url( 'options-general.php?page=crowdsignal-settings' ) ) . '</strong></p></div>';
+    echo '<div class="updated"><p><strong>' . sprintf(
+        /* translators: %s is the URL to the plugin settings page */
+        __( 'Crowdsignal features will be unavailable until you link your Crowdsignal.com account. Please visit the <a href="%s">plugin settings page</a> to login.', 'polldaddy' ), admin_url( 'options-general.php?page=crowdsignal-settings' ) ) . '</strong></p></div>';
 }
 add_action( 'admin_notices', 'polldaddy_login_warning' );

polldaddy/trunk/polldaddy-shortcode.php

@@ -181 +181 @@
             $poll      = intval( $poll );
             $poll_url  = sprintf( 'https://poll.fm/%d', $poll );
-            $poll_js   = sprintf( '%s.polldaddy.com/p/%d.js', '//static', $poll );
+            $poll_js   = sprintf( 'https://static.polldaddy.com/p/%d.js', $poll );
             $poll_link = sprintf( '<a href="%s">Take Our Poll</a>', $poll_url );
 
@@ -443 +443 @@
 if ( !function_exists( 'polldaddy_link' ) ) {
     // http://polldaddy.com/poll/1562975/?view=results&msg=voted
+    // http://poll.fm/1562975
     function polldaddy_link( $content ) {
-        if ( false === strpos( $content, "polldaddy.com/" ) )
+        if ( false === strpos( $content, "polldaddy.com/" ) && false === strpos( $content, "poll.fm/" ) )
             return $content;
         $textarr = wp_html_split( $content );

polldaddy/trunk/polldaddy.php

@@ -2 +2 @@
 /**
  * Plugin Name: Crowdsignal Polls & Ratings
- * Plugin URI: http://wordpress.org/extend/plugins/polldaddy/
+ * Plugin URI: https://wordpress.org/plugins/polldaddy/
  * Description: Create and manage Crowdsignal polls and ratings in WordPress
  * Author: Automattic, Inc.
  * Author URL: https://crowdsignal.com/
- * Version: 3.1.2
+ * Version: 3.1.3
+ * Text Domain: polldaddy
+ * Domain Path: /languages
  */
 
@@ -39 +41 @@
 }
 add_action( 'init', 'polldaddy_add_oembed_provider' );
+
+/**
+ * Get the nonce action string for polls media functionality.
+ *
+ * @return string Nonce action string specific to current user
+ */
+function get_polls_media_nonce() {
+    return 'polls_media_' . get_current_user_id();
+}
 
 class WP_Polldaddy {
@@ -203 +214 @@
         // Add settings pages.
         foreach( array( 'crowdsignal-settings' => __( 'Crowdsignal', 'polldaddy' ), 'ratingsettings' => __( 'Ratings', 'polldaddy' ) ) as $menu_slug => $page_title ) {
-            // translators: %s placeholder is the setting page type (Poll or Rating).
-            $settings_page_title = sprintf( esc_html__( '%s', 'polldaddy' ), $page_title );
+            $settings_page_title = sprintf( esc_html( $page_title ) );
             $hook = add_options_page( $settings_page_title, $settings_page_title, $menu_slug == 'ratingsettings' ? 'manage_options' : 'edit_others_posts', $menu_slug, array( $this, 'settings_page' ) );
             add_action( "load-$hook", array( $this, 'management_page_load' ) );
@@ -360 +370 @@
             <h2 id="polldaddy-header"><?php _e( 'Crowdsignal', 'polldaddy' ); ?></h2>
 
+            <?php /* translators: %s is the URL to the Crowdsignal.com account details */ ?>
             <p><?php printf( __( 'Before you can use the Crowdsignal plugin, you need to enter your <a href="%s">Crowdsignal.com</a> account details.', 'polldaddy' ), 'https://app.crowdsignal.com/' ); ?></p>
 
@@ -493 +504 @@
         wp_enqueue_script( 'polls-common', "{$this->base_url}js/common.js", array(), $this->version );
 
+        // Localize script with nonce data for secure media uploads
+        if ( $page === 'polls' && in_array( $action, array( 'edit', 'edit-poll', 'create-poll' ) ) ) {
+            $user_id = get_current_user_id();
+            $nonce_action = get_polls_media_nonce();
+            wp_localize_script( 'polls', 'pollsMediaSecurity', array(
+                'nonce' => wp_create_nonce( $nonce_action ),
+                'user_id' => $user_id,
+            ) );
+        }
+
         if ( $page == 'polls' ) {
             if ( !$this->is_author && in_array( $action, array( 'edit', 'edit-poll', 'create-poll', 'edit-style', 'create-style', 'list-styles', 'options', 'update-options', 'import-account', 'create-block-poll' ) ) ) {//check user privileges has access to action
@@ -502 +523 @@
                     $post_id = wp_insert_post(
                         array(
-                            'post_title'   => esc_html__( 'Crowdsignal blocks in WordPress' ),
+                            'post_title'   => esc_html__( 'Crowdsignal blocks in WordPress', 'polldaddy' ),
 
                             'post_content' => '
@@ -900 +921 @@
                 check_admin_referer( 'polldaddy-reset' . $this->id );
                 $fields = array( 'polldaddy_api_key', 'pd-rating-comments', 'pd-rating-comments-id', 'pd-rating-comments-pos', 'pd-rating-exclude-post-ids', 'pd-rating-pages', 'pd-rating-pages-id', 'pd-rating-posts', 'pd-rating-posts-id', 'pd-rating-posts-index', 'pd-rating-posts-index-id', 'pd-rating-posts-index-pos', 'pd-rating-posts-pos', 'pd-rating-title-filter', 'pd-rating-usercode', 'pd-rich-snippets', 'pd-usercode-' . $current_user->ID );
-                $msg = __( "You have just reset your Polldaddy connection settings." ) . "\n\n";
+                $msg = __( "You have just reset your Polldaddy connection settings.", 'polldaddy' ) . "\n\n";
                 foreach( $fields as $field ) {
                     $value = get_option( $field );
@@ -1593 +1614 @@
                         $message = __( 'Poll deleted.', 'polldaddy' );
                     } else {
-                        $message = sprintf( _n( '%s Poll Deleted.', '%s Polls Deleted.', $deleted, 'polldaddy' ), number_format_i18n( $deleted ) );
+                        $message = sprintf(
+                            /* translators: %s is the number of polls deleted */
+                            _n( '%s Poll Deleted.', '%s Polls Deleted.', $deleted, 'polldaddy' ), number_format_i18n( $deleted ) );
                     }
                     break;
@@ -1601 +1624 @@
                         $message = __( 'Poll opened.', 'polldaddy' );
                     } else {
-                        $message = sprintf( _n( '%s Poll Opened.', '%s Polls Opened.', $opened, 'polldaddy' ), number_format_i18n( $opened ) );
+                        $message = sprintf(
+                            /* translators: %s is the number of polls opened */
+                            _n( '%s Poll Opened.', '%s Polls Opened.', $opened, 'polldaddy' ), number_format_i18n( $opened ) );
                     }
                     break;
@@ -1609 +1634 @@
                         $message = __( 'Poll closed.', 'polldaddy' );
                     } else {
-                        $message = sprintf( _n( '%s Poll Closed.', '%s Polls Closed.', $closed, 'polldaddy' ), number_format_i18n( $closed ) );
+                        $message = sprintf(
+                            /* translators: %s is the number of polls closed */
+                            _n( '%s Poll Closed.', '%s Polls Closed.', $closed, 'polldaddy' ), number_format_i18n( $closed ) );
                     }
                     break;
@@ -1632 +1659 @@
                         $message = __( 'Custom Style deleted.', 'polldaddy' );
                     } else {
-                        $message = sprintf( _n( '%s Style Deleted.', '%s Custom Styles Deleted.', $deleted, 'polldaddy' ), number_format_i18n( $deleted ) );
+                        $message = sprintf(
+                            /* translators: %s is the number of styles deleted */
+                            _n( '%s Style Deleted.', '%s Custom Styles Deleted.', $deleted, 'polldaddy' ), number_format_i18n( $deleted ) );
                     }
                     break;
@@ -1650 +1679 @@
                         $message = __( 'Rating deleted.', 'polldaddy' );
                     } else {
-                        $message = sprintf( _n( '%s Rating Deleted.', '%s Ratings Deleted.', $deleted, 'polldaddy' ), number_format_i18n( $deleted ) );
+                        $message = sprintf(
+                            /* translators: %s is the number of ratings deleted */
+                            _n( '%s Rating Deleted.', '%s Ratings Deleted.', $deleted, 'polldaddy' ), number_format_i18n( $deleted ) );
                     }
                     break;
@@ -1733 +1764 @@
                                 if ( isset( $_GET['popup'] ) ) {
                                     ?>
-                                    <h2 id="poll-list-header"><?php printf( __( 'Preview Poll <a href="%s" class="add-new-h2">All Polls</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'polls', 'poll' => false, 'message' => false ) ) ) ); ?></h2>
+                                    <h2 id="poll-list-header"><?php
+                                    /* translators: %s is the URL to all polls */
+                                    printf( __( 'Preview Poll <a href="%s" class="add-new-h2">All Polls</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'polls', 'poll' => false, 'message' => false ) ) ) ); ?></h2>
                                     <?php
                                 }
@@ -1745 +1778 @@
                             ?>
                             <h2 id="poll-list-header">
-                                <?php printf( __( 'Poll Results <a href="%s" class="add-new-h2">All Polls</a> <a href="%s" class="add-new-h2">Edit Poll</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'polls', 'poll' => false, 'message' => false ) ) ), esc_url( add_query_arg( array( 'action' => 'edit-poll', 'poll' => $poll, 'message' => false ) ) ) ); ?>
+                                <?php
+                                /* translators: %s is the URL to all polls, %s is the URL to edit poll */
+                                printf( __( 'Poll Results <a href="%1$s" class="add-new-h2">All Polls</a> <a href="%2$s" class="add-new-h2">Edit Poll</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'polls', 'poll' => false, 'message' => false ) ) ), esc_url( add_query_arg( array( 'action' => 'edit-poll', 'poll' => $poll, 'message' => false ) ) ) ); ?>
                             </h2>
                             <?php
@@ -1756 +1791 @@
                                 <?php
                                 printf(
-                                    __( 'Edit Poll <a href="%s" class="add-new-h2">All Polls</a> <a href="%s" class="add-new-h2">View Results</a>', 'polldaddy' ),
+                                    /* translators: %s is the URL to all polls, %s is the URL to view results */
+                                    __( 'Edit Poll <a href="%1$s" class="add-new-h2">All Polls</a> <a href="%2$s" class="add-new-h2">View Results</a>', 'polldaddy' ),
                                     esc_url( add_query_arg( array( 'action' => 'polls', 'poll' => false, 'message' => false ) ) ),
                                     esc_url( add_query_arg( array( 'action' => 'results', 'poll' => $poll, 'message' => false ) ) )
@@ -1768 +1804 @@
                         case 'create-poll':
                             ?>
-                            <h2 id="poll-list-header"><?php printf( __( 'Add New Poll <a href="%s" class="add-new-h2">All Polls</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'polls', 'poll' => false, 'message' => false ) ) ) ); ?></h2>
+                            <h2 id="poll-list-header"><?php
+                            /* translators: %s is the URL to all polls */
+                            printf( __( 'Add New Poll <a href="%s" class="add-new-h2">All Polls</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'polls', 'poll' => false, 'message' => false ) ) ) ); ?></h2>
                             <?php
                             $this->poll_edit_form();
@@ -1776 +1814 @@
                             <h2 id="polldaddy-header">
                                 <?php
-                                if ( $this->is_author )
+                                if ( $this->is_author ) {
+                                    /* translators: %s is the URL to add new style */
                                     printf( __( 'Custom Styles <a href="%s" class="add-new-h2">Add New</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'create-style', 'poll' => false, 'message' => false ) ) ) );
-                                else
+                                } else {
                                     _e( 'Custom Styles', 'polldaddy' );
+                                }
                                 ?>
                             </h2>
@@ -1788 +1828 @@
                             ?>
                             <h2 id="polldaddy-header">
-                                <?php printf( __( 'Edit Style <a href="%s" class="add-new-h2">List Styles</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'list-styles', 'style' => false, 'message' => false, 'preload' => false ) ) ) ); ?>
+                                <?php
+                                /* translators: %s is the URL to list styles */
+                                printf( __( 'Edit Style <a href="%s" class="add-new-h2">List Styles</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'list-styles', 'style' => false, 'message' => false, 'preload' => false ) ) ) ); ?>
                             </h2>
                             <?php
@@ -1797 +1839 @@
                             ?>
                             <h2 id="polldaddy-header">
-                                <?php printf( __( 'Create Style <a href="%s" class="add-new-h2">List Styles</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'list-styles', 'style' => false, 'message' => false, 'preload' => false ) ) ) ); ?>
+                                <?php
+                                /* translators: %s is the URL to list styles */
+                                printf( __( 'Create Style <a href="%s" class="add-new-h2">List Styles</a>', 'polldaddy' ), esc_url( add_query_arg( array( 'action' => 'list-styles', 'style' => false, 'message' => false, 'preload' => false ) ) ) ); ?>
                             </h2>
                             <?php
@@ -2127 +2171 @@
 
         $class = $class ? '' : ' class="alternate"';
+        /* translators: %s is the URL to other answers results */
         $content = $results->others && 'Other answer…' === $answer->text ? sprintf( __( 'Other (<a href="%s">see below</a>)', 'polldaddy' ), '#other-answers-results' ) : esc_html( $answer->text );
 
@@ -2396 +2441 @@
             <table>
                 <tr>
-                    <td class="pd-editor-label"><label for="styleName"><?php _e( 'Select a template part to edit:' ); ?></label></td>
+                    <td class="pd-editor-label"><label for="styleName"><?php _e( 'Select a template part to edit:', 'polldaddy' ); ?></label></td>
                     <td>
                         <select id="styleName" onchange="renderStyleEdit(this.value);">
@@ -3140 +3185 @@
                                                                     <span class="pds-answer-text" id="pds-answer-text"><?php _e( 'I use it in school!', 'polldaddy' ); ?></span>
                                                                     <span class="pds-feedback-result" id="pds-feedback-result">
-                                                                        <span class="pds-feedback-per" id="pds-feedback-per">&nbsp;46%</span>&nbsp;<span class="pds-feedback-votes" id="pds-feedback-votes"> <?php printf( __( '(%d votes)', 'polldaddy' ), 620 ); ?></span>
+                                                                        <span class="pds-feedback-per" id="pds-feedback-per">&nbsp;46%</span>&nbsp;<span class="pds-feedback-votes" id="pds-feedback-votes"> <?php
+                                                                        /* translators: %d is the number of votes */
+                                                                        printf( __( '(%d votes)', 'polldaddy' ), 620 ); ?></span>
                                                                     </span>
                                                                 </label>
@@ -3154 +3201 @@
                                                                     <span class="pds-answer-text" id="pds-answer-text1"><?php _e( 'I use it at home.', 'polldaddy' ); ?></span>
                                                                     <span class="pds-feedback-result" id="pds-feedback-result1">
+                                                                        <?php /* translators: %d is the number of votes */ ?>
                                                                         <span class="pds-feedback-per" id="pds-feedback-per1">&nbsp;30%</span>&nbsp;<span class="pds-feedback-votes" id="pds-feedback-votes1"> <?php printf( __( '(%d votes)', 'polldaddy' ), 400 ); ?></span>
                                                                     </span>
@@ -3168 +3216 @@
                                                                     <span class="pds-answer-text" id="pds-answer-text2"><?php _e( 'I use it every where I go, at work and home and anywhere else that I can!', 'polldaddy' ); ?></span>
                                                                     <span class="pds-feedback-result" id="pds-feedback-result2">
+                                                                        <?php /* translators: %d is the number of votes */ ?>
                                                                         <span class="pds-feedback-per" id="pds-feedback-per2">&nbsp;16%</span>&nbsp;<span class="pds-feedback-votes" id="pds-feedback-votes2"> <?php printf( __( '(%d votes)', 'polldaddy' ), 220 ); ?></span>
                                                                     </span>
@@ -3182 +3231 @@
                                                                     <span class="pds-answer-text" id="pds-answer-text3"><?php _e( 'Other', 'polldaddy' ); ?></span>
                                                                     <span class="pds-feedback-result" id="pds-feedback-result3">
+                                                                        <?php /* translators: %d is the number of votes */ ?>
                                                                         <span class="pds-feedback-per" id="pds-feedback-per3">&nbsp;8%</span>&nbsp;<span class="pds-feedback-votes" id="pds-feedback-votes3"> <?php printf( __( '(%d votes)', 'polldaddy' ), 110 ); ?></span>
                                                                     </span>
@@ -3237 +3287 @@
     jQuery( document ).ready(function(){
         plugin = new Plugin( {
+            <?php /* translators: %s is the name of the rating being deleted */ ?>
             delete_rating: '<?php echo esc_attr( __( 'Are you sure you want to delete the rating for "%s"?', 'polldaddy' ) ); ?>',
+            <?php /* translators: %s is the name of the poll being deleted */ ?>
             delete_poll: '<?php echo esc_attr( __( 'Are you sure you want to delete "%s"?', 'polldaddy' ) ); ?>',
             delete_answer: '<?php echo esc_attr( __( 'Are you sure you want to delete this answer?', 'polldaddy' ) ); ?>',
@@ -3346 +3398 @@
                     }
                 } elseif ( isset( $polldaddy->errors[ -1 ] ) && $polldaddy->errors[ -1 ] == "Can't connect" ) {
-                    $this->contact_support_message( __( 'Could not connect to the Crowdsignal API' ), $rating_errors );
+                    $this->contact_support_message( __( 'Could not connect to the Crowdsignal API', 'polldaddy' ), $rating_errors );
                     $error = true;
                 } elseif ( isset( $polldaddy->errors[ -1 ] ) && $polldaddy->errors[ -1 ] == "Invalid API URL" ) {
-                    $this->contact_support_message( __( 'The API URL is incorrect' ), $rating_errors );
+                    $this->contact_support_message( __( 'The API URL is incorrect', 'polldaddy' ), $rating_errors );
                     $error = true;
                 } elseif ( isset( $polldaddy->errors[ -2 ] ) && $polldaddy->errors[ -2 ] == "No Data" ) {
-                    $this->contact_support_message( __( 'Your API request did not return any data' ), $rating_errors );
+                    $this->contact_support_message( __( 'Your API request did not return any data', 'polldaddy' ), $rating_errors );
                     $error = true;
                 }
@@ -3358 +3410 @@
 
             if ( $error == false && empty( $pd_rating ) ) { //something's up!
-                $this->contact_support_message( __( 'There was an error creating your rating widget' ), $rating_errors );
+                $this->contact_support_message( __( 'There was an error creating your rating widget', 'polldaddy' ), $rating_errors );
                 $error = true;
             } else {
@@ -3591 +3643 @@
         $current_setting   = get_option( 'pd-rating-posts-id' );
         if ( $current_setting && isset( $previous_settings[ 'pd-rating-posts-id' ] ) && $current_setting != $previous_settings[ 'pd-rating-posts-id' ] ) {
-            echo "<p>" . sprintf( __( "Previous settings for ratings on this site discovered. You can restore them on the <a href='%s'>poll settings page</a> if your site is missing ratings after resetting your connection settings.", 'polldaddy' ), "options-general.php?page=crowdsignal-settings" ) . "</p>";
+            echo "<p>" . sprintf(
+                /* translators: %s is the URL to Crowdsignal settings page */
+                __( "Previous settings for ratings on this site discovered. You can restore them on the <a href='%s'>poll settings page</a> if your site is missing ratings after resetting your connection settings.", 'polldaddy' ), 
+                "options-general.php?page=crowdsignal-settings" 
+            ) . "</p>";
         }
         ?>
@@ -3663 +3719 @@
                   </tr>
                   <tr>
-                    <td><p style="margin-bottom: 0px;"><?php printf( __( '%d star', 'polldaddy' ), 1 );?></p></td>
+                    <td><p style="margin-bottom: 0px;"><?php
+                    /* translators: %d is the number of stars */
+                    printf( __( '%d star', 'polldaddy' ), 1 );?></p></td>
                   </tr>
                   <tr>
@@ -3669 +3727 @@
                   </tr>
                   <tr>
-                    <td><p style="margin-bottom: 0px;"><?php printf( __( '%d stars', 'polldaddy' ), 2 );?></p></td>
+                    <td><p style="margin-bottom: 0px;"><?php
+                    /* translators: %d is the number of stars */
+                    printf( __( '%d stars', 'polldaddy' ), 2 );?></p></td>
                   </tr>
                   <tr>
@@ -3675 +3735 @@
                   </tr>
                   <tr>
-                    <td><p style="margin-bottom: 0px;"><?php printf( __( '%d stars', 'polldaddy' ), 3 );?></p></td>
+                    <td><p style="margin-bottom: 0px;"><?php
+                        /* translators: %d is the number of stars */
+                        printf( __( '%d stars', 'polldaddy' ), 3 );?></p></td>
                   </tr>
                   <tr>
@@ -3681 +3743 @@
                   </tr>
                   <tr>
-                    <td><p style="margin-bottom: 0px;"><?php printf( __( '%d stars', 'polldaddy' ), 4 );?></p></td>
+                    <td><p style="margin-bottom: 0px;"><?php
+                        /* translators: %d is the number of stars */
+                        printf( __( '%d stars', 'polldaddy' ), 4 );?></p></td>
                   </tr>
                   <tr>
@@ -3687 +3751 @@
                   </tr>
                   <tr>
-                    <td><p style="margin-bottom: 0px;"><?php printf( __( '%d stars', 'polldaddy' ), 5 );?></p></td>
+                    <td><p style="margin-bottom: 0px;"><?php
+                        /* translators: %d is the number of stars */
+                        printf( __( '%d stars', 'polldaddy' ), 5 );?></p></td>
                   </tr>
                   <tr>
@@ -3774 +3840 @@
                     $checked = ' checked="checked"';?>
                         <input type="radio" onchange="pd_change_type( 0 );" <?php echo $checked; ?> value="stars" id="stars" name="rating_type" />
-                          <?php printf( __( '%d Star Rating', 'polldaddy' ), 5 );?>
+                          <?php
+                          /* translators: %d is the number of stars */
+                          printf( __( '%d Star Rating', 'polldaddy' ), 5 );?>
                         </label>
                     </li>
@@ -4023 +4091 @@
     jQuery( document ).ready(function(){
         plugin = new Plugin( {
+            <?php /* translators: %s is the name of the rating being deleted */ ?>
             delete_rating: '<?php echo esc_attr( __( 'Are you sure you want to delete the rating for "%s"?', 'polldaddy' ) ); ?>',
+            <?php /* translators: %s is the name of the poll being deleted */ ?>
             delete_poll: '<?php echo esc_attr( __( 'Are you sure you want to delete "%s"?', 'polldaddy' ) ); ?>',
             delete_answer: '<?php echo esc_attr( __( 'Are you sure you want to delete this answer?', 'polldaddy' ) ); ?>',
@@ -4301 +4371 @@
         <div class="wrap">
             <?php if ( $this->is_admin ) : ?>
-            <h2 id="polldaddy-header"><?php printf( __( 'Rating Results <a href="%s" class="add-new-h2">Settings</a>', 'polldaddy' ), esc_url( 'options-general.php?page=ratingsettings' ) ); ?></h2>
+            <h2 id="polldaddy-header"><?php
+                /* translators: %s is the URL to Crowdsignal settings page */
+                printf( __( 'Rating Results <a href="%s" class="add-new-h2">Settings</a>', 'polldaddy' ), esc_url( 'options-general.php?page=ratingsettings' ) ); ?></h2>
             <?php else : ?>
             <h2 id="polldaddy-header"><?php _e( 'Rating Results', 'polldaddy' ); ?></h2>
@@ -4338 +4410 @@
                         <input class="button-secondary action" type="submit" value="<?php _e( 'Filter', 'polldaddy' );?>" />
                         <?php if ( in_array( $period, array( 1, 7 ) ) ) : ?>
-                        <label><?php _e( '* The results are cached and are updated every hour' ); ?></label>
+                        <label><?php _e( '* The results are cached and are updated every hour', 'polldaddy' ); ?></label>
                         <?php elseif ( $period == 31 ) : ?>
-                        <label><?php _e( '* The results are cached and are updated every day' ); ?></label>
+                        <label><?php _e( '* The results are cached and are updated every day', 'polldaddy' ); ?></label>
                         <?php else : ?>
-                        <label><?php _e( '* The results are cached and are updated every 3 days' ); ?></label>
+                        <label><?php _e( '* The results are cached and are updated every 3 days', 'polldaddy' ); ?></label>
                         <?php endif; ?>
                     </div>
@@ -4356 +4428 @@
                 <tbody>
                     <tr>
-                        <td colspan="4"><?php printf( __( 'No ratings have been collected for your %s yet.', 'polldaddy' ), $report_type ); ?></td>
+                        <td colspan="4"><?php
+                        /* translators: %s is the report type */
+                        printf( __( 'No ratings have been collected for your %s yet.', 'polldaddy' ), $report_type ); ?></td>
                     </tr>
                 </tbody><?php
@@ -4446 +4520 @@
     jQuery( document ).ready(function(){
         plugin = new Plugin( {
+            <?php /* translators: %s is the name of the rating being deleted */ ?>
             delete_rating: '<?php echo esc_attr( __( 'Are you sure you want to delete the rating for "%s"?', 'polldaddy' ) ); ?>',
+            <?php /* translators: %s is the name of the poll being deleted */ ?>
             delete_poll: '<?php echo esc_attr( __( 'Are you sure you want to delete "%s"?', 'polldaddy' ) ); ?>',
             delete_answer: '<?php echo esc_attr( __( 'Are you sure you want to delete this answer?', 'polldaddy' ) ); ?>',
@@ -4621 +4697 @@
         echo '<div class="error" id="polldaddy">';
         echo '<h1>' . $message . '</h1>';
-        echo '<p>' . __( "There are a few things you can do:" );
+        echo '<p>' . __( "There are a few things you can do:", 'polldaddy' );
         echo "<ul><ol>" . __( "Press reload on your browser and reload this page. There may have been a temporary problem communicating with Crowdsignal.com", "polldaddy" ) . "</ol>";
+        /* translators: %1$s is the URL to Crowdsignal settings page */
         echo "<ol>" . sprintf( __( "Go to the <a href='%s'>poll settings page</a>, scroll to the end of the page and reset your connection settings. Link your account again with the same API key.", "polldaddy" ), 'options-general.php?page=crowdsignal-settings' ) . "</ol>";
+        /* translators: %1$s is the URL to Crowdsignal support, %2$s is the target attribute, %3$s is the rating usercode */
         echo "<ol>" . sprintf( __( 'Contact <a href="%1$s" %2$s>Crowdsignal support</a> and tell them your rating usercode is %3$s', 'polldaddy' ), 'https://crowdsignal.com/feedback/', 'target="_blank"', $this->rating_user_code ) . '<br />' . __( 'Also include the following information when contacting support to help us resolve your problem as quickly as possible:', 'polldaddy' ) . '';
         echo "<ul><li> API Key: " . get_option( 'polldaddy_api_key' ) . "</li>";

polldaddy/trunk/popups.php

@@ -18 +18 @@
                 <p>' . __('Paste your YouTube or Google Video URL above, or use the examples below.', 'polldaddy') . '</p>
                 <ul class="short-code-list">
-                    <li>' . sprintf( __('<a href="%s" target="_blank">YouTube instructions</a> %s', 'polldaddy'), 'http://support.wordpress.com/videos/youtube/', '<code>[youtube=http://www.youtube.com/watch?v=cXXm696UbKY]</code>' )  .'</li>
-                    <li>' . sprintf( __('<a href="%s" target="_blank">Google instructions</a> %s', 'polldaddy') , 'http://support.wordpress.com/videos/google-video/', '<code>[googlevideo=http://video.google.com/googleplayer.swf?docId=-8459301055248673864]</code>' ) . '</li>
-                    <li>' . sprintf( __('<a href="%s" target="_blank">DailyMotion instructions</a> %s', 'polldaddy'), 'http://support.wordpress.com/videos/dailymotion/', '<code>[dailymotion id=5zYRy1JLhuGlP3BGw]</code>' ) . '</li>
+                    <li>' . sprintf( 
+                        /* translators: %1$s is the URL to YouTube instructions, %2$s is the example shortcode */
+                        __('<a href="%1$s" target="_blank">YouTube instructions</a> %2$s', 'polldaddy'), 
+                        'http://support.wordpress.com/videos/youtube/', 
+                        '<code>[youtube=http://www.youtube.com/watch?v=cXXm696UbKY]</code>' 
+                    ) . '</li>
+                    <li>' . sprintf( 
+                        /* translators: %1$s is the URL to Google Video instructions, %2$s is the example shortcode */
+                        __('<a href="%1$s" target="_blank">Google instructions</a> %2$s', 'polldaddy'), 
+                        'http://support.wordpress.com/videos/google-video/', 
+                        '<code>[googlevideo=http://video.google.com/googleplayer.swf?docId=-8459301055248673864]</code>' 
+                    ) . '</li>
+                    <li>' . sprintf( 
+                        /* translators: %1$s is the URL to DailyMotion instructions, %2$s is the example shortcode */
+                        __('<a href="%1$s" target="_blank">DailyMotion instructions</a> %2$s', 'polldaddy'), 
+                        'http://support.wordpress.com/videos/dailymotion/', 
+                        '<code>[dailymotion id=5zYRy1JLhuGlP3BGw]</code>' 
+                    ) . '</li>
                 </ul>
             </td>
@@ -84 +99 @@
 
 function polldaddy_popups_init() {
-    if( isset( $_REQUEST['polls_media'] ) ){
-        add_filter( 'type_url_form_video', 'pd_video_shortcodes_help');
-        add_filter( 'type_url_form_audio', 'pd_audio_shortcodes_help');
-        add_filter( 'type_url_form_image', 'pd_image_shortcodes_help');
+    // Only process polls_media requests
+    if ( ! isset( $_REQUEST['polls_media'] ) ) {
+        return;
     }
+
+    // Security checks for CSRF vulnerability (CVE-2024-43338)
+    // Verify admin context
+    if ( ! is_admin() ) {
+        return;
+    }
+
+    // Verify user capability
+    if ( ! current_user_can( 'edit_posts' ) ) {
+        return;
+    }
+
+    // Verify nonce for CSRF protection
+    $nonce_action = get_polls_media_nonce();
+
+    if ( ! isset( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], $nonce_action ) ) {
+        return;
+    }
+
+    // All security checks passed, add the filters
+    add_filter( 'type_url_form_video', 'pd_video_shortcodes_help' );
+    add_filter( 'type_url_form_audio', 'pd_audio_shortcodes_help' );
+    add_filter( 'type_url_form_image', 'pd_image_shortcodes_help' );
 }
 

polldaddy/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 5.5
 Requires PHP: 5.6
-Tested up to: 6.6.1
-Stable tag: 3.1.2
+Tested up to: 6.8
+Stable tag: 3.1.3
 
 == Description ==
@@ -26 +26 @@
 Some strings are not translated when polls and surveys are embedded. You will have to translate them using a language pack on [Crowdsignal.com](https://crowdsignal.com/).
 
-Development of the plugin will take place in [this Github repository](https://github.com/Automattic/crowdsignal-plugin).
+Development of the plugin takes place in [this GitHub repository](https://github.com/Automattic/crowdsignal-plugin). Contributions are welcome!
 
 === The Classic Editor ===
@@ -96 +96 @@
 
 == Changelog ==
+
+= 3.1.3 =
+* Fix: Make 'Results' and 'Edit' Links Always Visible on Polls Dashboard by @vk17-starlord in #108
+* fix: Update item count field ID in polldaddy-org.php by @GaryJones in #115
+* fix: CSRF vulnerability for CVE-2024-43338 by @oviul in #136
+* Add: poll.fm URL detection for shortcode by @ovidiul in #138
+* Modernise i18n configuration by @GaryJones in #131
+* fix: Add translation comments to enhance understanding for translators by @GaryJones in #128
+* refactor: Remove makepot task and update build script for i18n by @GaryJones in #130
+* fix: Add and fix text domain for translations by @GaryJones in #129
+* Update issue and pull request templates by @GaryJones in #126
+* fix: Update .wp-env.json to set core to null by @GaryJones in #114
+* Add development environment setup by @ovidiul in #113
+* Add WordPress Coding Standards (PHPCS) by @ovidiul in #132
+* Add PHPUnit Testing Framework by @ovidiul in #133
+
 = 3.1.2 =
 * Add referer check on deprecated multi-account user action.