diff --git a/src/BootstrapBlazor.Server/Components/Components/AttributeTable.razor b/src/BootstrapBlazor.Server/Components/Components/AttributeTable.razor
index 75bc3aec939..1bdfdffede2 100644
--- a/src/BootstrapBlazor.Server/Components/Components/AttributeTable.razor
+++ b/src/BootstrapBlazor.Server/Components/Components/AttributeTable.razor
@@ -13,7 +13,10 @@
                 <Template Context="v">
                     @if (v.Row.IsObsolete)
                     {
-                        <span class="text-decoration-line-through text-danger">@v.Value</span>
+                        <span class="text-decoration-line-through text-danger me-2">@v.Value</span>
+                        <Badge Color="Color.Danger" IsPill="true">
+                            @Localizer["Obsolete"]
+                        </Badge>
                     }
                     else
                     {
diff --git a/src/BootstrapBlazor.Server/Components/Components/AttributeTable.razor.cs b/src/BootstrapBlazor.Server/Components/Components/AttributeTable.razor.cs
index e2d6dabd809..55d1fa791f6 100644
--- a/src/BootstrapBlazor.Server/Components/Components/AttributeTable.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Components/AttributeTable.razor.cs
@@ -58,7 +58,7 @@ private static string FormatTypeName(Type type)
         }
 
         var index = type.Name.IndexOf('`');
-        var typeName = type.Name.Substring(0, index);
+        var typeName = type.Name[..index];
         var genericArgs = string.Join(", ", type.GetGenericArguments().Select(i => i.Name));
         return $"{typeName}<{genericArgs}>";
     }
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
index 0834bf32809..e60901ea17f 100644
--- a/src/BootstrapBlazor.Server/Locales/en-US.json
+++ b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -20,6 +20,7 @@
     "Type": "Type"
   },
   "BootstrapBlazor.Server.Components.Components.AttributeTable": {
+    "Obsolete": "Obsolete",
     "AutoGenerateColumns": "Automatically generated",
     "Total": "Total"
   },
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
index 203c924eea6..2e8a842f0b2 100644
--- a/src/BootstrapBlazor.Server/Locales/zh-CN.json
+++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -20,6 +20,7 @@
     "Type": "类型"
   },
   "BootstrapBlazor.Server.Components.Components.AttributeTable": {
+    "Obsolete": "已弃用",
     "AutoGenerateColumns": "自动生成",
     "Total": "合计"
   },