emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

top: don't make translatable text subject to a #define

Browse Source 
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 <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2022-05-27 00:00:00 -05:00 committed by Craig Small
parent daedcb974e
commit b587d946bf
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
top/top.c
View File

@ -5517,7 +5517,11 @@ static void keys_global (int ch) {
break; break;
case 'Y': case 'Y':
if (!Inspect.total) 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 { else {
def = PID_VAL(EU_PID, s_int, w->ppt[w->begtask]); def = PID_VAL(EU_PID, s_int, w->ppt[w->begtask]);
pid = get_int(fmtmk(N_fmt(YINSP_pidsee_fmt), def)); pid = get_int(fmtmk(N_fmt(YINSP_pidsee_fmt), def));

7
top/top_nls.c
View File

@ -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_warncfg_txt] = _("rcfile has inspect/other-filter error(s), save anyway?");
Norm_nlstab[XTRA_badflds_fmt] = _("unrecognized field name '%s'"); Norm_nlstab[XTRA_badflds_fmt] = _("unrecognized field name '%s'");
Norm_nlstab[XTRA_winsize_txt] = _("even using field names only, window is now too small"); 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_demo01_txt] = _("Open Files");
Norm_nlstab[YINSP_demo02_txt] = _("NUMA Info"); Norm_nlstab[YINSP_demo02_txt] = _("NUMA Info");
Norm_nlstab[YINSP_demo03_txt] = _("Log"); 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" "Then, enhance top with your very own customized 'file' and/or 'pipe' entries.\n"
"\n" "\n"
"Enjoy!\n"); "Enjoy!\n");
Norm_nlstab[YINSP_noents_txt] = _("to enable 'Y' press <Enter> then type 'W' and restart top"); Norm_nlstab[YINSP_noent1_txt] = _("to enable 'Y' press <Enter> then type 'W' and restart top");
#else Norm_nlstab[YINSP_noent2_txt] = _("to enable 'Y' please consult the top man page (press Enter)");
Norm_nlstab[YINSP_noents_txt] = _("to enable 'Y' please consult the top man page (press Enter)");
#endif
Norm_nlstab[YINSP_failed_fmt] = _("Selection failed with: %s\n"); 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_pidbad_fmt] = _("unable to inspect, pid %d not found");
Norm_nlstab[YINSP_pidsee_fmt] = _("inspect at PID [default pid = %d]"); Norm_nlstab[YINSP_pidsee_fmt] = _("inspect at PID [default pid = %d]");

6
top/top_nls.h
View File

@ -86,12 +86,10 @@ enum norm_nls {
XTRA_badflds_fmt, XTRA_fixwide_fmt, XTRA_modebad_txt, XTRA_size2up_txt, XTRA_badflds_fmt, XTRA_fixwide_fmt, XTRA_modebad_txt, XTRA_size2up_txt,
XTRA_vforest_fmt, XTRA_warncfg_txt, XTRA_warnold_txt, XTRA_winsize_txt, XTRA_vforest_fmt, XTRA_warncfg_txt, XTRA_warnold_txt, XTRA_winsize_txt,
X_RESTRICTED_txt, X_SEMAPHORES_fmt, X_THREADINGS_fmt, 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_demo01_txt, YINSP_demo02_txt, YINSP_demo03_txt, YINSP_deqfmt_txt,
YINSP_deqtyp_txt, YINSP_dstory_txt, YINSP_deqtyp_txt, YINSP_dstory_txt,
#endif YINSP_failed_fmt, YINSP_noent1_txt, YINSP_noent2_txt, YINSP_pidbad_fmt,
YINSP_failed_fmt, YINSP_noents_txt, YINSP_pidbad_fmt, YINSP_pidsee_fmt, YINSP_pidsee_fmt, YINSP_status_fmt, YINSP_waitin_txt, YINSP_workin_txt,
YINSP_status_fmt, YINSP_waitin_txt, YINSP_workin_txt,
norm_MAX norm_MAX
}; };