Merge remote-tracking branch 'origin/feat/add-inventory-screen-title'…

… into feat/add-inventory-screen-title
Terasology · Aug 6, 2021 · 0d9a999 · 0d9a999
2 parents 1d9b057 + 1491e47
commit 0d9a999
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/assets/skins/inventoryDefault.skin b/assets/skins/inventoryDefault.skin
@@ -39,9 +39,9 @@
         }
     },
     "families": {
-        "title":{
+        "title": {
             "font":"NotoSans-Regular-Medium",
-			"text-align-horizontal": "left"
+            "text-align-horizontal": "left"
         }
     }
 }
diff --git a/src/main/java/org/terasology/module/inventory/ui/ContainerScreen.java b/src/main/java/org/terasology/module/inventory/ui/ContainerScreen.java
@@ -4,23 +4,25 @@
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.prefab.Prefab;
+import org.terasology.engine.i18n.TranslationSystem;
 import org.terasology.engine.logic.characters.CharacterComponent;
 import org.terasology.engine.logic.common.DisplayNameComponent;
 import org.terasology.engine.logic.players.LocalPlayer;
-import org.terasology.nui.databinding.ReadOnlyBinding;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.nui.CoreScreenLayer;
+import org.terasology.nui.databinding.ReadOnlyBinding;
 import org.terasology.nui.widgets.UILabel;
 
-import java.util.Optional;
-
 /**
  */
 public class ContainerScreen extends CoreScreenLayer {
 
     @In
     private LocalPlayer localPlayer;
 
+    @In
+    private TranslationSystem i18n;
+
     private InventoryGrid containerInventory;
 
     @Override
@@ -50,7 +52,10 @@ public String get() {
                 Prefab parentPrefab = characterEntity.getComponent(CharacterComponent.class).predictedInteractionTarget.getParentPrefab();
                 DisplayNameComponent displayName = parentPrefab.getComponent(DisplayNameComponent.class);
                 if (displayName != null) {
-                    return displayName.name;
+                    // The display name may contain a translatable string reference, thus we attempt to get the translation.
+                    // If the string is just non-translatable display name the fallback mechanism will yield just the input string.
+                    // NOTE: Unfortunately, this contract is not guaranteed by `TranslationSystem#translate(String)`.
+                    return i18n.translate(displayName.name);
                 } else {
                     return parentPrefab.getName();
                 }