(e9f10995d) Merge branch 'bugreporterUI' into dev

2019-05-18 17:43:00 +03:00
parent 3a2310e547
commit 78b67de866
52 changed files with 428 additions and 223 deletions
@@ -294,7 +294,8 @@ namespace Barotrauma
            {
                value = "";
            }
-            string displayName = property.GetAttribute<Editable>().DisplayName;
+            string propertyName = (entity.GetType().Name + "." + property.PropertyInfo.Name).ToLowerInvariant();
+            string displayName = TextManager.Get(propertyName, returnNull: true) ?? property.GetAttribute<Editable>().DisplayName;
            if (displayName == null)
            {
                displayName = property.Name.FormatCamelCaseWithSpaces();