Remove generic type suffix properly

hishamco · hishamco · commit b22f8a0b02ea · 2022-06-08T00:12:10.000+03:00
diff --git a/Oqtane.Client/Modules/Controls/LocalizableComponent.cs b/Oqtane.Client/Modules/Controls/LocalizableComponent.cs
@@ -32,10 +32,10 @@ protected IStringLocalizer T
                         var controlTypeName = controlType.Name;
                         var assemblyName = controlType.Assembly.GetName().Name;
 
-                        // Trim "`1" suffix (for generic type) to make it consistent like normal control types
-                        if (controlTypeName.EndsWith("`1"))
+                        if (controlType.IsGenericType)
                         {
-                            controlTypeName = controlTypeName.TrimEnd('`', '1');
+                            // Trim generic type suffix
+                            controlTypeName = controlTypeName[..controlTypeName.IndexOf('`')];
                         }
 
                         controlTypeName = controlType.FullName[..(controlType.FullName.IndexOf(controlTypeName) + controlTypeName.Length)];

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ protected IStringLocalizer T`
`32`	`32`	`var controlTypeName = controlType.Name;`
`33`	`33`	`var assemblyName = controlType.Assembly.GetName().Name;`
`34`	`34`
`35`		- // Trim "`1" suffix (for generic type) to make it consistent like normal control types
`36`		- if (controlTypeName.EndsWith("`1"))
	`35`	`+ if (controlType.IsGenericType)`
`37`	`36`	`{`
`38`		- controlTypeName = controlTypeName.TrimEnd('`', '1');
	`37`	`+ // Trim generic type suffix`
	`38`	+ controlTypeName = controlTypeName[..controlTypeName.IndexOf('`')];
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`controlTypeName = controlType.FullName[..(controlType.FullName.IndexOf(controlTypeName) + controlTypeName.Length)];`