fix field captions

data/src/Field.php

@@ -441,7 +441,7 @@ public function isHidden(): bool
      */
     public function getCaption(): string
     {
-        return $this->caption ?? $this->ui['caption'] ?? $this->readableCaption(preg_replace('~^atk_fp_\w+?__~', '', $this->short_name));
+        return $this->caption ?? $this->ui['caption'] ?? $this->readableCaption($this->short_name);
     }
 
     // }}}

demos/init-db.php

@@ -22,6 +22,9 @@
 
 class ModelWithPrefixedFields extends Model
 {
+    /** @var <string, string> */
+    private static $prefixedFieldNames = [];
+
     private function prefixFieldName(string $fieldName, bool $forActualName = false): string
     {
         $tableShort = $this->table;
@@ -30,7 +33,7 @@ private function prefixFieldName(string $fieldName, bool $forActualName = false)
         }
 
         if ($forActualName) {
-            $fieldName = preg_replace('~^atk_fp_' . preg_quote($tableShort, '~') . '__~', '', $fieldName);
+            $fieldName = $this->unprefixFieldName($fieldName);
         }
 
         $fieldShort = $fieldName;
@@ -46,7 +49,24 @@ private function prefixFieldName(string $fieldName, bool $forActualName = false)
             $fieldShort .= '_id';
         }
 
-        return 'atk_' . ($forActualName ? 'a' : '') . 'fp_' . $tableShort . '__' . $fieldShort;
+        $res = 'atk_' . ($forActualName ? 'a' : '') . 'fp_' . $tableShort . '__' . $fieldShort;
+
+        self::$prefixedFieldNames[$res] = $fieldName;
+
+        return $res;
+    }
+
+    private function unprefixFieldName(string $name): string
+    {
+        if (!str_starts_with($name, 'atk_fp_')) {
+            return $name;
+        }
+
+        if (isset(self::$prefixedFieldNames[$name . '_id'])) {
+            return self::$prefixedFieldNames[$name . '_id'];
+        }
+
+        return self::$prefixedFieldNames[$name];
     }
 
     protected function createHintablePropsFromClassDoc(string $className): array
@@ -75,6 +95,7 @@ public function addField($name, $seed = []): \Atk4\Data\Field
     {
         $seed = \Atk4\Core\Factory::mergeSeeds($seed, [
             'actual' => $this->prefixFieldName($name, true),
+            'caption' => $this->readableCaption($this->unprefixFieldName($name)),
         ]);
 
         return parent::addField($name, $seed);