diff options
| author | Samuel Mendoza-Jonas <sam.mj@au1.ibm.com> | 2015-08-25 11:08:09 +1000 |
|---|---|---|
| committer | Samuel Mendoza-Jonas <sam.mj@au1.ibm.com> | 2015-08-31 14:58:14 +1000 |
| commit | b4d338c2ae40f16091a4bb4a0cc4f2e322f4f4b9 (patch) | |
| tree | 8deb44f8945302b0ef9d42b9eb15443bc98a8411 | |
| parent | 70907c3fc4b344d00ce900e6a536e9cc16a35216 (diff) | |
| download | talos-petitboot-b4d338c2ae40f16091a4bb4a0cc4f2e322f4f4b9.tar.gz talos-petitboot-b4d338c2ae40f16091a4bb4a0cc4f2e322f4f4b9.zip | |
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>
| -rw-r--r-- | lib/types/types.c | 2 | ||||
| -rw-r--r-- | ui/ncurses/nc-menu.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/types/types.c b/lib/types/types.c index 611f2a1..63045e1 100644 --- 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: - return _("Optical"); + return _("CD/DVD"); 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 b42dc23..3f09d62 100644 --- 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]", - dev->type == DEVICE_TYPE_OPTICAL ? - _("CD/DVD") : device_type_display_name(dev->type), bd->name, bd->uuid); } |
