From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 16 Jun 2021 09:53:15 +0000 (+0200)
Subject: Cleaning up new Dashboard.
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=12d2d8f602474fe08822a3755cea78e0ac81a0e2

Cleaning up new Dashboard.
---

diff --git a/includes/dashboard.inc b/includes/dashboard.inc
index 56f69a56..43eb29df 100644
--- a/includes/dashboard.inc
+++ b/includes/dashboard.inc
@@ -735,7 +735,7 @@ function gl_week_performance($today, $width="33", $weeks=4)
 			GROUP BY week_name ORDER BY week_name DESC LIMIT 0, $weeks) b 
 		GROUP BY week_name ORDER BY week_name ASC";
 	$result = db_query($sql, "Transactions could not be calculated");
-	$title = _("Last $weeks weeks Performance");
+	$title = sprintf(_("Last %s weeks Performance"), $weeks);
 	check_page_security('SA_GLANALYTIC');
 	$week_names = $sales = $costs = $results = array();
 	while ($myrow = db_fetch($result))
@@ -774,7 +774,7 @@ function gl_month_performance($today, $width="33", $months=5)
 			GROUP BY month_name ORDER BY month_name DESC LIMIT 0, $months) b 
 		GROUP BY month_name ORDER BY month_name ASC";
 	$result = db_query($sql, "Transactions could not be calculated");
-	$title = _("Last $months Months Performance");
+	$title = sprintf(_("Last %s Months Performance"), $months);
 	check_page_security('SA_GLANALYTIC');
 	$month_names = $sales = $costs = $results = array();
 	while ($myrow = db_fetch($result))
@@ -964,7 +964,7 @@ function cash_flow($today)
 		$date[$i] = $y.$sep.$m;
 		$total[$i] = round($total[$i]);
 	}
-	$title = _("Last $months Months Cash Flow");
+	$title = sprintf(_("Last %s Months Cash Flow"), $months);
 	check_page_security('SA_BANKREP');
 	$pg->setLabels($date);
 	$pg->addSerie(_('Balances'), $total, false, true);
diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index c4a476ed..bb24fb2d 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -253,7 +253,7 @@ class BoxReports
 
 				case 'GRAPHIC':
 					$sel = array(_("No Graphics"), _("Vertical bars"), _("Horizontal bars"), 
-								_("Dots"), _("Lines"), _("Pie"), _("Donut"), _("Half donut"), _("Spline"));
+								_("Dots"), _("Lines"), _("Pie"), _("Donut"), _("Half Donut"), _("Splines"));
 					return array_selector($name, null, $sel);
 
 				case 'SYS_TYPES':