Merge pull request #14 from HelloAsso/fix-sandbox

Fix sandbox

Author: lemarty

README.txt

@@ -3,9 +3,9 @@ Contributors: helloasso, yohannkipfer
 Donate link: https://helloasso.com
 Tags: helloasso, paiement, association, crowdfunding, don
 Requires at least: 4.0
-Tested up to: 6.8
+Tested up to: 6.9
 Requires PHP: 7.2.34
-Stable tag: 1.1.23
+Stable tag: 1.1.24
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -80,7 +80,10 @@ Please report security bugs found in the source code of the helloasso plugin thr
 2. Iframes des campagnes
 
 == Changelog ==
-= 1.1.22 =
+= 1.1.24 =
+* Corrections de l'affichage au pluriel des campagnes dans le dashboard
+
+= 1.1.23 =
 * Synchronisation avec organizationSlug seulement
 
 = 1.1.22 =

admin/class-hello-asso-admin.php

@@ -477,7 +477,7 @@ function ha_search_campaign()
 				return;
 			}
 
-			$sandbox = false;
+			$sandbox = HELLO_ASSO_SANDBOX_MODE ?? false;
 			$organizationSlug = '';			
 
 			$organizationSlug = sanitize_title_with_dashes($value);

admin/css/hello-asso-admin.css

@@ -1505,5 +1505,18 @@ a:focus {
 }
 
 #hello_asso_metabox {
-visibility: hidden;
+    visibility: hidden;
+}
+
+.ha-container-dashboard .ha-checkbox{
+    width: 1rem;
+    margin:0;    
+    padding: 0;
+}
+.ha-form-group{
+    display:flex;
+    align-items:center;
+    gap:10px;
+    justify-content:flex-start;
+    margin: 0 0 15px;
 }

admin/view/campaign.php

@@ -162,7 +162,7 @@
 								<h5>La synchronisation a échouée</h5>
 							</div>
 						<?php endif; ?>
-						<h3><?= esc_html($nbCampaign); ?> campagnes publiques synchronisées</h3>
+						<h3><?= esc_html(sprintf(_n('%d campagne publique synchronisée', '%d campagnes publiques synchronisées', $nbCampaign, 'hello-asso'), $nbCampaign)); ?></h3>
 					</div>
 					<div class="ha-header-col">
 						<a href="<?= esc_url(admin_url()); ?>admin.php?page=hello-asso" class="ha-btn ha-btn-primary">Resynchroniser</a>

admin/view/dashboard.php

@@ -69,6 +69,11 @@
 							<path d="M5 5L15 15" stroke="#BEBED7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
 						</svg>
 					</span>
+					<!-- <label for="ha-sandbox-checkbox" class="ha-sandbox-label ha-form-group">	
+						<input type="checkbox" class="ha-checkbox" id="ha-sandbox-checkbox">
+						Mode bac à sable
+					</label> -->
+				
 				</div>
 				<button class="ha-btn ha-btn-primary searchCampaign" <?php if (get_option('ha-slug') == '') {
 																			echo 'disabled';
@@ -160,7 +165,14 @@
 				<div class="ha-block-white">
 					<div class="ha-count">
 						<div class="ha-number-count"><?= esc_html($nbCampaign); ?></div>
-						<div class="ha-description-count">campagnes publiques rattachées à votre association</div>
+						<div class="ha-description-count">
+							<?= esc_html(_n(
+								'campagne publique rattachée à votre association',
+								'campagnes publiques rattachées à votre association',
+								$nbCampaign,
+								'hello-asso'
+							)); ?>
+						</div>
 					</div>
 					<?php
 					$campaign = get_option('ha-campaign');

hello-asso.php

@@ -16,7 +16,7 @@
  * Plugin Name:       HelloAsso
  * Plugin URI:        https://centredaide.helloasso.com/s/article/paiement-en-ligne-wordpress-integrer-vos-campagnes-helloasso
  * Description:       HelloAsso est la solution gratuite des associations pour collecter des paiements et des dons sur internet.
- * Version:           1.1.23
+ * Version:           1.1.24
  * Author:            HelloAsso
  * Author URI:        https://helloasso.com
  * License:           GPL-2.0+
@@ -36,7 +36,12 @@
  * Start at version 1.0.0 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define('HELLO_ASSO_VERSION', '1.1.23');
+define('HELLO_ASSO_VERSION', '1.1.24');
+
+/**
+ * Enable or disable sandbox mode.
+ */
+define('HELLO_ASSO_SANDBOX_MODE', false);
 
 /**
  * The code that runs during plugin activation.