From 0774f95de07bfafc398531b0bb26bc1edf817dd7 Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Wed, 11 Sep 2024 08:59:59 +0000
Subject: [PATCH] * [bug#55187] fix bug.

---
 module/dev/model.php   | 3 ++-
 module/pivot/model.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/dev/model.php b/module/dev/model.php
index 462cfc8d2b..cc833340c3 100644
--- a/module/dev/model.php
+++ b/module/dev/model.php
@@ -75,7 +75,8 @@ class devModel extends model
             $type     = substr($rawField->type, 0, $firstPOS > 0 ? $firstPOS : strlen($rawField->type));
             $type     = str_replace(array('big', 'small', 'medium', 'tiny'), '', $type);
             $field    = array();
-            $field['name'] = (isset($this->lang->$module->{$rawField->field}) and is_string($this->lang->$module->{$rawField->field})) ? sprintf($this->lang->$module->{$rawField->field}, $this->lang->dev->tableList[$module]) : '';
+            $tableName = zget($this->lang->dev->tableList, $module, $module);
+            $field['name'] = (isset($this->lang->$module->{$rawField->field}) and is_string($this->lang->$module->{$rawField->field})) ? str_replace('%s', $tableName, $this->lang->$module->{$rawField->field}) : '';
             if((empty($field['name']) or !is_string($field['name'])) and $aliasModule) $field['name'] = isset($this->lang->$aliasModule->{$rawField->field}) ? $this->lang->$aliasModule->{$rawField->field} : '';
             if($subLang) $field['name'] = isset($this->lang->$aliasModule->$subLang->{$rawField->field}) ? $this->lang->$aliasModule->$subLang->{$rawField->field} : $field['name'];
 
diff --git a/module/pivot/model.php b/module/pivot/model.php
index 5ba8f2717d..76f132c895 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -153,7 +153,7 @@ class pivotModel extends model
             if(!empty($pivot->name))
             {
                 $pivotNames   = json_decode($pivot->name, true);
-                $pivot->name  = zget($pivotNames, $this->app->getClientLang(), '') ? : reset(array_filter($pivotNames));
+                $pivot->name  = zget($pivotNames, $this->app->getClientLang(), '') ?? reset(array_filter($pivotNames));
                 $pivot->names = $pivotNames;
             }