fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

custom.c: Fix sidebar configuration help text

Browse Source 
* Use a format string instead of the TOSTRING() macro.
* Remove "xgettext:no-c-format" hack and use "%%" instead.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2012-12-22 16:53:44 +01:00
parent 2ea91e1a8a
commit efa3589f78
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/custom.c
View File

@ -231,7 +231,7 @@ void custom_layout_config(void)
switch (ch) { switch (ch) {
case KEY_GENERIC_HELP: case KEY_GENERIC_HELP:
help_wins_init(&hwin, 0, 0, (notify_bar())? row - 3 : row - 2, col); help_wins_init(&hwin, 0, 0, (notify_bar())? row - 3 : row - 2, col);
mvwaddstr(hwin.pad.p, 1, 0, help_text); mvwprintw(hwin.pad.p, 1, 0, help_text, SBARMINWIDTH);
hwin.total_lines = 7; hwin.total_lines = 7;
wins_scrollwin_display(&hwin); wins_scrollwin_display(&hwin);
wgetch(hwin.win.p); wgetch(hwin.win.p);
@ -295,13 +295,12 @@ void custom_sidebar_config(void)
}; };
const char *help_text = const char *help_text =
_ _
/* xgettext:no-c-format */
("This configuration screen is used to change the width of the side bar.\n" ("This configuration screen is used to change the width of the side bar.\n"
"The side bar is the part of the screen which contains two panels:\n" "The side bar is the part of the screen which contains two panels:\n"
"the calendar and, depending on the chosen layout, either the todo list\n" "the calendar and, depending on the chosen layout, either the todo list\n"
"or the appointment list.\n\n" "or the appointment list.\n\n"
"The side bar width can be up to 50% of the total screen width, but\n" "The side bar width can be up to 50%% of the total screen width, but\n"
"can't be smaller than " TOSTRING(SBARMINWIDTH) " characters wide.\n\n"); "can't be smaller than %d characters wide.\n\n");
int ch, bindings_size; int ch, bindings_size;
bindings_size = sizeof(bindings) / sizeof(bindings[0]); bindings_size = sizeof(bindings) / sizeof(bindings[0]);