fix

app/Http/Controllers/Api/EsgController.php

@@ -16,8 +16,7 @@ use Illuminate\Support\Facades\Log;
  */
 class EsgController extends Controller
 {
-    public function __construct(
-    )
+    public function __construct()
     {
     }
 
@@ -28,7 +27,7 @@ class EsgController extends Controller
         $yearList = EsgHistory::select("selected_year", \DB::raw("concat(selected_year, '年') as lable"))->distinct()->orderBy("selected_year", "desc")->pluck('lable', 'selected_year');
         $result = [];
         $result["yearList"] = $yearList;
-        foreach($data as $item){
+        foreach ($data as $item) {
             $result["list"][$item->selected_year][] = [
                 "operateMonth " => $item->selected_year . "." . str_pad($item->selected_month, 2, "0", STR_PAD_LEFT),
                 "title" => $item->getTranslation("title", $locale),
@@ -41,17 +40,27 @@ class EsgController extends Controller
     public function uploadFiles($locale = "tw")
     {
         $locale = $locale == "tw" ? "zh_TW" : $locale;
+
+        // 定義「取得時間」的翻譯
+        $awardDateLabels = [
+            'zh_TW' => '取得時間',
+            'en' => 'Awarded',
+        ];
+
+        // 取得對應的標籤，如果找不到則使用預設值
+        $awardDateLabel = $awardDateLabels[$locale] ?? $awardDateLabels['zh_TW'];
+
         $request_ordering = $request->ordering ?? "desc";
         $fileList = UploadFile::where("type", 1)
-                                        ->select("title", "upload_link", "award_date")
-                                        ->orderBy("award_date", $request_ordering)
-                                        ->orderBy("order", $request_ordering)->get()->map(function ($record) {
-            return [
-                "title" => $record->title,
-                "uploadLink" => $record->upload_file_link,
-                "awardDate" => "獲頒日期 : " . date("Y/m/d", strtotime($record->award_date))
-            ];
-        });
+            ->select("title", "upload_link", "award_date")
+            ->orderBy("award_date", $request_ordering)
+            ->orderBy("order", $request_ordering)->get()->map(function ($record) use ($awardDateLabel, $locale) {
+                return [
+                    "title" => $record->getTranslation("title", $locale),
+                    "uploadLink" => $record->upload_file_link,
+                    "awardDate" => $awardDateLabel . " : " . date("Y/m/d", strtotime($record->award_date))
+                ];
+            });
         return Response::ok($fileList);
     }
 }

app/Http/Controllers/Api/ProjectController.php

@@ -133,10 +133,18 @@ class ProjectController extends Controller
         return Response::ok($result);
     }
 
-    public function badges($locale = 'tw')
-    {
+    public function badges($locale = 'tw') {
         $locale = $locale == 'tw' ? 'zh_TW' : $locale;
 
+        // 定義「取得時間」的翻譯
+        $awardDateLabels = [
+            'zh_TW' => '取得時間',
+            'en' => 'Awarded',
+        ];
+
+        // 取得對應的標籤，如果找不到則使用預設值
+        $awardDateLabel = $awardDateLabels[$locale] ?? $awardDateLabels['zh_TW'];
+
         $projects = Project::where('badge_type', 2)->get();
         $result = [];
 
@@ -147,7 +155,7 @@ class ProjectController extends Controller
                 $badges[] = [
                     'imgUrl' => $badge->imgUrlLink,
                     'name' => $badge->getTranslation('title', $locale),
-                    'rewardYear' => '取得時間 : '.date('Y.m', strtotime($badge->pivot->award_date)),
+                    'rewardYear' => $awardDateLabel . ' : ' . date('Y.m', strtotime($badge->pivot->award_date)),
                 ];
             }
             $result[] = [

app/Models/Project.php

@@ -77,49 +77,49 @@ class Project extends Model
     public function firstListImgUrl(): Attribute
     {
         return Attribute::make(
-            get: fn ($value) => ! empty($this->img_url) ? Storage::url($this->img_url[0]) : null,
+            get: fn($value) => !empty($this->img_url) ? Storage::url($this->img_url[0]) : null,
         );
     }
 
     public function imgList(): Attribute
     {
         $imgList = [];
-        if (! is_null($this->img_url) && count($this->img_url) > 0) {
+        if (!is_null($this->img_url) && count($this->img_url) > 0) {
             foreach ($this->img_url as $img) {
                 $imgList[] = Storage::url($img);
             }
         }
 
         return Attribute::make(
-            get: fn ($value) => $imgList,
+            get: fn($value) => $imgList,
         );
     }
 
     public function thumbnailUrl(): Attribute
     {
         return Attribute::make(
-            get: fn ($value) => ! empty($this->thumbnail) ? Storage::url($this->thumbnail) : null,
+            get: fn($value) => !empty($this->thumbnail) ? Storage::url($this->thumbnail) : null,
         );
     }
 
     public function firstMobileImgUrl(): Attribute
     {
         return Attribute::make(
-            get: fn ($value) => ! empty($this->mobile_img_url) ? Storage::url($this->mobile_img_url[0]) : null,
+            get: fn($value) => !empty($this->mobile_img_url) ? Storage::url($this->mobile_img_url[0]) : null,
         );
     }
 
     public function mobileImgList(): Attribute
     {
         $imgList = [];
-        if (! is_null($this->mobile_img_url) && count($this->mobile_img_url) > 0) {
+        if (!is_null($this->mobile_img_url) && count($this->mobile_img_url) > 0) {
             foreach ($this->mobile_img_url as $img) {
                 $imgList[] = Storage::url($img);
             }
         }
 
         return Attribute::make(
-            get: fn ($value) => $imgList,
+            get: fn($value) => $imgList,
         );
     }
 
@@ -131,7 +131,7 @@ class Project extends Model
                 $badges[] = [
                     'imgUrl' => $badge->imgUrlLink,
                     'name' => $badge->getTranslation('title', $locale),
-                    'awardDate' => '取得時間 : '.date('Y.m', strtotime($badge->pivot->award_date)),
+                    'awardDate' => '取得時間 : ' . date('Y.m', strtotime($badge->pivot->award_date)),
                 ];
             }
         }
@@ -141,6 +141,15 @@ class Project extends Model
 
     public function getBadgesByType($locale, $badgeType): array
     {
+        // 定義「取得時間」的翻譯
+        $awardDateLabels = [
+            'zh_TW' => '取得時間',
+            'en' => 'Awarded',
+        ];
+
+        // 取得對應的標籤，如果找不到則使用預設值
+        $awardDateLabel = $awardDateLabels[$locale] ?? $awardDateLabels['zh_TW'];
+
         $badges = [];
         switch ($badgeType) {
             case '1':
@@ -159,7 +168,7 @@ class Project extends Model
                     $badges[] = [
                         'imgUrl' => $badge->imgUrlLink,
                         'name' => $badge->getTranslation('title', $locale),
-                        'awardDate' => '取得時間 : '.date('Y.m', strtotime($badge->pivot->award_date)),
+                        'awardDate' => $awardDateLabel . ' : ' . date('Y.m', strtotime($badge->pivot->award_date)),
                     ];
                 }
                 break;