(e3ae570b4) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-03 13:52:49 +03:00
parent 7545e8efec
commit c01eddbebb
5 changed files with 314 additions and 71 deletions
@@ -125,7 +125,7 @@ namespace Barotrauma.Items.Components
            for (int i = 0; i < labels.Length; i++)
            {
                labels[i] = i < newLabels.Length ? newLabels[i] : customInterfaceElementList[i].Label;
-                customInterfaceElementList[i].Label = labels[i];
+                customInterfaceElementList[i].Label = TextManager.Get(labels[i], returnNull: true) ?? labels[i];
            }
            UpdateLabelsProjSpecific();
        }