From 501c88d3c91100f67f04a39852e9e1fde12be923 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Wed, 16 Sep 2026 16:08:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E6=96=87=E6=98=BE=E7=A4=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8D=95=E4=BD=8D=E5=8A=A0=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common.php | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/common.php b/app/common.php
index 5399cd8..3526e80 100644
--- a/app/common.php
+++ b/app/common.php
@@ -1,5 +1,6 @@
 <?php
 use Carbon\Carbon;
+use Illuminate\Support\Facades\App;
 
 if (!function_exists('generate_tree')) {
     function generate_tree(
@@ -155,20 +156,30 @@ if (!function_exists('get_time_difference')) {
 if (!function_exists('get_time_difference_str')) {
     function get_time_difference_str($date, $now_date = ''): string
     {
+        $locale = App::getLocale();
+        $str = $locale == 'en' ? ' ' : '';
         $value = '';
         $difference = get_time_difference($date, $now_date);
         if (!isset($difference['error'])) {
             if (!empty($difference['days'])) {
-                $value .= $difference['days'] . __('controller.parking_space.days');
+                $value .= $difference['days'] . $str . __(
+                        'controller.parking_space.days'
+                    );
             }
             if (!empty($difference['hours']) || !empty($value)) {
-                $value .= $difference['hours'] . __('controller.parking_space.hours');
+                $value .= $difference['hours'] . $str . __(
+                        'controller.parking_space.hours'
+                    );
             }
             if (!empty($difference['minutes']) || !empty($value)) {
-                $value .= $difference['minutes'] . __('controller.parking_space.minutes');
+                $value .= $difference['minutes'] . $str . __(
+                        'controller.parking_space.minutes'
+                    );
             }
             if (!empty($difference['seconds']) || !empty($value)) {
-                $value .= $difference['seconds'] . __('controller.parking_space.seconds');
+                $value .= $difference['seconds'] . $str . __(
+                        'controller.parking_space.seconds'
+                    );
             }
         }
         return $value;
@@ -190,6 +201,9 @@ if (!function_exists('get_diff_in_minutes')) {
 if (!function_exists('get_minutes')) {
     function get_minutes($totalSeconds): string
     {
+        $locale = App::getLocale();
+        $str = $locale == 'en' ? ' ' : '';
+
         // 2. 根据规则计算分钟数：超过1秒按1分钟算，即向上取整
         $minutes = (int)ceil($totalSeconds / 60);
 
@@ -204,10 +218,10 @@ if (!function_exists('get_minutes')) {
                 // 超过一小时，显示X小时X分钟
                 $hours = intdiv($minutes, 60);
                 $remainingMinutes = $minutes % 60;
-                $minutesStr = $remainingMinutes . __(
+                $minutesStr = $remainingMinutes . $str . __(
                         'controller.parking_space.minutes'
                     );
-                $hoursStr = $hours . __('controller.parking_space.hours');
+                $hoursStr = $hours . $str . __('controller.parking_space.hours');
                 return $hoursStr . $minutesStr;
             }
         }