From b587d946bfa63526b13009e683e852af0c7a4efa Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Fri, 27 May 2022 00:00:00 -0500 Subject: [PATCH] top: don't make translatable text subject to a #define While it is acceptable to make text usage conditional, one must never make the text itself conditional. After all, the translators must be presented with all of the text so the opportunity to translate it is never lost. [ one wonders who the idiot was that did this anyway ] Signed-off-by: Jim Warner --- top/top.c | 6 +++++- top/top_nls.c | 7 ++----- top/top_nls.h | 6 ++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/top/top.c b/top/top.c index 4ffcccd1..cb661481 100644 --- a/top/top.c +++ b/top/top.c @@ -5517,7 +5517,11 @@ static void keys_global (int ch) { break; case 'Y': if (!Inspect.total) - ioline(N_txt(YINSP_noents_txt)); +#ifndef INSP_OFFDEMO + ioline(N_txt(YINSP_noent1_txt)); +#else + ioline(N_txt(YINSP_noent2_txt)); +#endif else { def = PID_VAL(EU_PID, s_int, w->ppt[w->begtask]); pid = get_int(fmtmk(N_fmt(YINSP_pidsee_fmt), def)); diff --git a/top/top_nls.c b/top/top_nls.c index 1619836b..3a144f89 100644 --- a/top/top_nls.c +++ b/top/top_nls.c @@ -507,7 +507,6 @@ static void build_norm_nlstab (void) { Norm_nlstab[XTRA_warncfg_txt] = _("rcfile has inspect/other-filter error(s), save anyway?"); Norm_nlstab[XTRA_badflds_fmt] = _("unrecognized field name '%s'"); Norm_nlstab[XTRA_winsize_txt] = _("even using field names only, window is now too small"); -#ifndef INSP_OFFDEMO Norm_nlstab[YINSP_demo01_txt] = _("Open Files"); Norm_nlstab[YINSP_demo02_txt] = _("NUMA Info"); Norm_nlstab[YINSP_demo03_txt] = _("Log"); @@ -545,10 +544,8 @@ static void build_norm_nlstab (void) { "Then, enhance top with your very own customized 'file' and/or 'pipe' entries.\n" "\n" "Enjoy!\n"); - Norm_nlstab[YINSP_noents_txt] = _("to enable 'Y' press then type 'W' and restart top"); -#else - Norm_nlstab[YINSP_noents_txt] = _("to enable 'Y' please consult the top man page (press Enter)"); -#endif + Norm_nlstab[YINSP_noent1_txt] = _("to enable 'Y' press then type 'W' and restart top"); + Norm_nlstab[YINSP_noent2_txt] = _("to enable 'Y' please consult the top man page (press Enter)"); Norm_nlstab[YINSP_failed_fmt] = _("Selection failed with: %s\n"); Norm_nlstab[YINSP_pidbad_fmt] = _("unable to inspect, pid %d not found"); Norm_nlstab[YINSP_pidsee_fmt] = _("inspect at PID [default pid = %d]"); diff --git a/top/top_nls.h b/top/top_nls.h index 8ae505f1..8201f0bb 100644 --- a/top/top_nls.h +++ b/top/top_nls.h @@ -86,12 +86,10 @@ enum norm_nls { XTRA_badflds_fmt, XTRA_fixwide_fmt, XTRA_modebad_txt, XTRA_size2up_txt, XTRA_vforest_fmt, XTRA_warncfg_txt, XTRA_warnold_txt, XTRA_winsize_txt, X_RESTRICTED_txt, X_SEMAPHORES_fmt, X_THREADINGS_fmt, -#ifndef INSP_OFFDEMO YINSP_demo01_txt, YINSP_demo02_txt, YINSP_demo03_txt, YINSP_deqfmt_txt, YINSP_deqtyp_txt, YINSP_dstory_txt, -#endif - YINSP_failed_fmt, YINSP_noents_txt, YINSP_pidbad_fmt, YINSP_pidsee_fmt, - YINSP_status_fmt, YINSP_waitin_txt, YINSP_workin_txt, + YINSP_failed_fmt, YINSP_noent1_txt, YINSP_noent2_txt, YINSP_pidbad_fmt, + YINSP_pidsee_fmt, YINSP_status_fmt, YINSP_waitin_txt, YINSP_workin_txt, norm_MAX };