[master 2/3] Actually translate the container type labels

[dashea]

From: David Shea

---
 pyanaconda/ui/gui/spokes/custom.py                     | 8 ++++----
 pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 0dd8a21..e15ba39 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -2169,7 +2169,7 @@ def on_container_changed(self, combo):
             return

device_type = self._get_current_device_type()
-        container_type_name = get_container_type(device_type).name.lower()
+        container_type_name = _(get_container_type(device_type).name).lower()
         new_text = _(NEW_CONTAINER_TEXT) % {"container_type": container_type_name}
         create_new_container = container_name == new_text
         if create_new_container:
@@ -2447,7 +2447,7 @@ def _populate_container(self, device=None):
                 container_size_policy = container.size_policy

container_type = get_container_type(device_type)
-        self._containerLabel.set_text(container_type.label.title())
+        self._containerLabel.set_text(_(container_type.label).title())
         self._containerLabel.set_use_underline(True)
         self._containerStore.clear()
         if device_type == DEVICE_TYPE_BTRFS:
@@ -2474,8 +2474,8 @@ def _populate_container(self, device=None):
             self._containerStore.append(self._container_store_row(default_container_name))
             self._containerCombo.set_active(len(self._containerStore) - 1)

-        self._containerStore.append(self._container_store_row(_(NEW_CONTAINER_TEXT) % {"container_type": container_type.name.lower()}))
-        self._containerCombo.set_tooltip_text(_(CONTAINER_TOOLTIP) % {"container_type": container_type.name.lower()})
+        self._containerStore.append(self._container_store_row(_(NEW_CONTAINER_TEXT) % {"container_type": _(container_type.name).lower()}))
+        self._containerCombo.set_tooltip_text(_(CONTAINER_TOOLTIP) % {"container_type": _(container_type.name).lower()})
         if default_container_name is None:
             self._containerCombo.set_active(len(self._containerStore) - 1)

diff --git a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
index 2c363cf..aba056d 100644
--- a/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
+++ b/pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.py
@@ -306,7 +306,7 @@ def containerRaidLevelsSupported(device_type):
     return set()

def get_container_type(device_type):
-    return CONTAINER_TYPES.get(device_type, ContainerType(_("container"), _("container")))
+    return CONTAINER_TYPES.get(device_type, ContainerType(N_("container"), N_("container")))

class AddDialog(GUIObject):
     builderObjects = ["addDialog", "mountPointStore", "mountPointCompletion", "mountPointEntryBuffer"]
@@ -494,10 +494,10 @@ def __init__(self, *args, **kwargs):

# set up the dialog labels with device-type-specific text
         container_type = get_container_type(self.device_type)
-        title_text = _(CONTAINER_DIALOG_TITLE) % {"container_type": container_type.name.upper()}
+        title_text = _(CONTAINER_DIALOG_TITLE) % {"container_type": _(container_type.name).upper()}
         self._title_label.set_text(title_text)

-        dialog_text = _(CONTAINER_DIALOG_TEXT) % {"container_type": container_type.name.lower()}
+        dialog_text = _(CONTAINER_DIALOG_TEXT) % {"container_type": _(container_type.name).lower()}
         self._dialog_label.set_text(dialog_text)

# populate the dialog widgets