Merge pull request #684 from shacky/2.0

Unify formatLabel methods and fix error with dots replacing in translation

src/Form/Field.php

@@ -249,11 +249,15 @@ class Field implements Renderable
      */
     protected function formatLabel($arguments = [])
     {
+        if(isset($arguments[0])) {
+            return $arguments[0];
+        }
+
         $column = is_array($this->column) ? current($this->column) : $this->column;
 
-        $label = isset($arguments[0]) ? $arguments[0] : admin_trans_field($column);
+        $label = admin_trans_field($column);
 
-        return str_replace(['.', '_'], ' ', $label);
+        return str_replace('_', ' ', $label);
     }
 
     /**

src/Grid/Column.php

@@ -410,9 +410,11 @@ class Column
      */
     protected function formatLabel($label)
     {
-        $label = $label ?: admin_trans_field($this->name);
+        if($label) return $label;
 
-        return str_replace(['.', '_'], ' ', $label);
+        $label = admin_trans_field($this->name);
+
+        return str_replace('_', ' ', $label);
     }
 
     /**

src/Grid/Filter/AbstractFilter.php

@@ -141,9 +141,11 @@ abstract class AbstractFilter
      */
     protected function formatLabel($label)
     {
-        $label = $label ?: admin_trans_field($this->column);
+        if($label) return $label;
 
-        return str_replace(['.', '_'], ' ', $label);
+        $label = admin_trans_field($this->column);
+
+        return str_replace('_', ' ', $label);
     }
 
     /**

src/Show/Field.php

@@ -158,9 +158,11 @@ class Field implements Renderable
      */
     protected function formatLabel($label)
     {
-        $label = $label ?: admin_trans_field($this->name);
+        if($label) return $label;
 
-        return str_replace(['.', '_'], ' ', $label);
+        $label = admin_trans_field($this->name);
+
+        return str_replace('_', ' ', $label);
     }
 
     /**