From bc16e41c7362d56c2bd2304e90bdfbe49a842e0f Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 30 Jun 2022 02:44:29 +0000
Subject: [PATCH] * Fix bug #24472.

---
 module/product/js/all.js            | 2 ++
 module/product/view/all.html.php    | 1 +
 module/program/js/browse.js         | 2 ++
 module/program/view/browse.html.php | 1 +
 4 files changed, 6 insertions(+)

diff --git a/module/product/js/all.js b/module/product/js/all.js
index 59c2438291..9d18908c92 100644
--- a/module/product/js/all.js
+++ b/module/product/js/all.js
@@ -70,7 +70,9 @@ $(function()
     {
         var checkedLength = $(":checkbox[name^='productIDList']:checked").length;
         var summary       = checkedProducts.replace('%s', checkedLength);
+        if(cilentLang == "en" && checkedLength < 2) summary = summary.replace('products', 'product');
         var statistic     = "<div id='productsSummary' class='statistic'>" + summary + "</div>";
+
         if(checkedLength > 0)
         {
             $('#productsSummary').remove();
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 55ff1f0cf0..0ac5a3c677 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -256,6 +256,7 @@
 <?php js::set('orderBy', $orderBy)?>
 <?php js::set('browseType', $browseType)?>
 <?php js::set('checkedProducts', $lang->product->checkedProducts);?>
+<?php js::set('cilentLang', $this->app->getClientLang());?>
 <?php if(commonModel::isTutorialMode()): ?>
 <style>
 #productListForm {overflow: hidden;}
diff --git a/module/program/js/browse.js b/module/program/js/browse.js
index 1b57fc93d4..446f978422 100644
--- a/module/program/js/browse.js
+++ b/module/program/js/browse.js
@@ -30,6 +30,7 @@ $(function()
         }
 
         var summary = checkedProjects.replace('%s', checkedLength);
+        if(cilentLang == "en" && checkedLength < 2) summary = summary.replace('items', 'item');
         var statistic = "<div id='projectsSummary' class='table-statistic'>" + summary + "</div>";
         if(checkedLength > 0)
         {
@@ -53,6 +54,7 @@ $(function()
             $('#programForm').addClass('has-row-checked');
             var checkedLength = $(":checkbox[name^='projectIdList']:checked").length;
             var summary = checkedProjects.replace('%s', checkedLength);
+            if(cilentLang == "en" && checkedLength < 2) summary = summary.replace('items', 'item');
             var statistic = "<div id='projectsSummary' class='table-statistic'>" + summary + "</div>";
             $('#programSummary').addClass('hidden');
             $('#projectsSummary').remove();
diff --git a/module/program/view/browse.html.php b/module/program/view/browse.html.php
index 0f2cd999cc..d876502bce 100644
--- a/module/program/view/browse.html.php
+++ b/module/program/view/browse.html.php
@@ -17,6 +17,7 @@
 <?php js::set('selectAll', $lang->selectAll);?>
 <?php js::set('hasProject', $hasProject);?>
 <?php js::set('checkedProjects', $lang->program->checkedProjects);?>
+<?php js::set('cilentLang', $this->app->getClientLang());?>
 <?php if($programType == 'bygrid'):?>
 <style>#mainMenu{padding-left: 10px; padding-right: 10px;}</style>
 <?php endif;?>