Consolidate display string for optical devices

Instead of using 'Optical' in some places and 'CD/DVD' in others, simply
use 'CD/DVD' for all cases.

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>

diff --git a/lib/types/types.c b/lib/types/types.c
index 611f2a1018dba2f772b90ad245508339aa07dc53..63045e1a29d2a933abd98bb8ed8826f2adea7a9c 100644 (file)
--- a/lib/types/types.c
+++ b/lib/types/types.c
@@ -30,7 +30,7 @@ const char *device_type_display_name(enum device_type type)
        case DEVICE_TYPE_USB:
                return _("USB");
        case DEVICE_TYPE_OPTICAL:
        case DEVICE_TYPE_USB:
                return _("USB");
        case DEVICE_TYPE_OPTICAL:

-               return _("Optical");
+               return _("CD/DVD");

        case DEVICE_TYPE_NETWORK:
                return _("Network");
        case DEVICE_TYPE_ANY:
        case DEVICE_TYPE_NETWORK:
                return _("Network");
        case DEVICE_TYPE_ANY:

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index b42dc23e556c5f2dc85081a2a1dcfb718671e8ab..3f09d62385b4df4043e985d965347aad13c905c1 100644 (file)
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -264,8 +264,6 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
                }
                if (matched) {
                        snprintf(buf,sizeof(buf),"[%s: %s / %s]",
                }
                if (matched) {
                        snprintf(buf,sizeof(buf),"[%s: %s / %s]",

-                               dev->type == DEVICE_TYPE_OPTICAL ?
-                               _("CD/DVD") :

                                device_type_display_name(dev->type),
                                bd->name, bd->uuid);
                }
                                device_type_display_name(dev->type),
                                bd->name, bd->uuid);
                }