X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.c;h=448132f450a28e5605b85e2e233ed7a2fde6d458;hb=310ae766b208c4dab933b574326013902aaf0328;hp=bde07e4fde9e45288580e6bd00cea188160df046;hpb=baf1c7616dd0a5fa1bafde2045ac2af22d95122a;p=pkg%2Fabook.git diff --git a/ui.c b/ui.c index bde07e4..448132f 100644 --- a/ui.c +++ b/ui.c @@ -18,20 +18,15 @@ #include "ui.h" #include "edit.h" #include "database.h" +#include "gettext.h" #include "list.h" #include "misc.h" #include "options.h" #include "filter.h" +#include "xmalloc.h" #ifdef HAVE_CONFIG_H # include "config.h" #endif -#ifdef HAVE_TERMIOS_H -# include -#else -# ifdef HAVE_LINUX_TERMIOS_H -# include -# endif -#endif #ifdef HAVE_SYS_IOCTL_H # include #endif @@ -147,10 +142,10 @@ init_ui() #endif if( LINES < MIN_LINES || COLS < MIN_COLS ) { clear(); refresh(); endwin(); - fprintf(stderr, "Your terminal size is %dx%d\n", COLS, LINES); - fprintf(stderr, "Terminal is too small. Minium terminal size " + fprintf(stderr, _("Your terminal size is %dx%d\n"), COLS, LINES); + fprintf(stderr, _("Terminal is too small. Minium terminal size " "for abook is " - "%dx%d\n", MIN_COLS, MIN_LINES); + "%dx%d\n"), MIN_COLS, MIN_LINES); return 1; } @@ -180,7 +175,7 @@ close_ui() void -headerline(char *str) +headerline(const char *str) { werase(top); @@ -205,7 +200,7 @@ refresh_screen() clear(); refresh_statusline(); - headerline(MAIN_HELPLINE); + headerline(gettext(MAIN_HELPLINE)); list_headerline(); refresh_list(); @@ -213,7 +208,7 @@ refresh_screen() int -statusline_msg(char *msg) +statusline_msg(const char *msg) { int c; @@ -229,7 +224,7 @@ statusline_msg(char *msg) } void -statusline_addstr(char *str) +statusline_addstr(const char *str) { mvwaddstr(bottom, 1, 0, str); refresh(); @@ -237,7 +232,7 @@ statusline_addstr(char *str) } char * -ui_readline(char *prompt, char *s, int limit, bool use_completion) +ui_readline(char *prompt, char *s, size_t limit, bool use_completion) { int y, x; char *ret; @@ -246,7 +241,7 @@ ui_readline(char *prompt, char *s, int limit, bool use_completion) getyx(bottom, y, x); - ret = abook_readline(bottom, y, x, s, limit, use_completion); + ret = abook_readline(bottom, y, x, s, use_completion); if(ret) strtrim(ret); @@ -258,25 +253,21 @@ int statusline_ask_boolean(char *msg, int def) { int ret; - char *msg2 = strconcat(msg, def ? " (Y/n)?" : " (y/N)?", NULL); + char *msg2 = strconcat(msg, def ? _(" (Y/n)?") : _(" (y/N)?"), NULL); + char ch; statusline_addstr(msg2); free(msg2); - switch(tolower(getch())) { - case 'n': - case 'N': - ret = FALSE; - break; - case 'y': - case 'Y': - ret = TRUE; - break; - default: - ret = def; - break; - } + ch = tolower(getch()); + + if(ch == *(S_("keybinding for no|n"))) + ret = FALSE; + else if(ch == *(S_("keybinding for yes|y"))) + ret = TRUE; + else + ret = def; clear_statusline(); @@ -340,16 +331,16 @@ display_help(int help) helpw = newwin(LINES - 5, COLS - 6, 2, 3); erase(); - headerline("help"); + headerline(_("help")); for(i = 0; tbl[i] != NULL; i++) { - waddstr(helpw, tbl[i]); + waddstr(helpw, gettext(tbl[i])); if( (!((i + 1) % (LINES - 8))) || (tbl[i + 1] == NULL) ) { refresh(); wrefresh(helpw); refresh_statusline(); - if(statusline_msg("Press any key to continue...") + if(statusline_msg(_("Press any key to continue...")) == 'q') break; wclear(helpw); @@ -457,7 +448,7 @@ get_commands() case 'p': ui_print_database(); break; - case 'u': launch_wwwbrowser(list_current_item()); + case 'v': launch_wwwbrowser(list_current_item()); refresh_screen(); break; } @@ -470,7 +461,7 @@ ui_remove_items() if(list_is_empty()) return; - if(statusline_ask_boolean("Remove selected item(s)", TRUE)) + if(statusline_ask_boolean(_("Remove selected item(s)"), TRUE)) remove_selected_items(); clear_statusline(); @@ -480,7 +471,7 @@ ui_remove_items() void ui_clear_database() { - if(statusline_ask_boolean("Clear WHOLE database", FALSE)) { + if(statusline_ask_boolean(_("Clear WHOLE database"), FALSE)) { close_database(); refresh_list(); } @@ -502,12 +493,13 @@ ui_find(int next) char *s; s = ui_readline("/", findstr, MAX_FIELD_LEN - 1, 0); strncpy(findstr, s, MAX_FIELD_LEN); + free(s); refresh_screen(); } if( (item = find_item(findstr, curitem + !!next, search_fields)) < 0 && (item = find_item(findstr, 0, search_fields)) >= 0) - statusline_addstr("Search hit bottom, continuing at top"); + statusline_addstr(_("Search hit bottom, continuing at top")); if(item >= 0) { curitem = item; @@ -530,8 +522,8 @@ void ui_read_database() { if(items > 0) - if(!statusline_ask_boolean("Your current data will be lost - " - "Press 'y' to continue", FALSE)) + if(!statusline_ask_boolean(_("Your current data will be lost - " + "Press 'y' to continue"), FALSE)) return; load_database(datafile); @@ -549,7 +541,7 @@ ui_print_database() if(list_is_empty()) return; - statusline_addstr("Print All/Selected/Cancel (a/s/C)?"); + statusline_addstr(_("Print All/Selected/Cancel (a/s/C)?")); switch(tolower(getch())) { case 'a': @@ -557,7 +549,7 @@ ui_print_database() break; case 's': if( !selected_items() ) { - statusline_msg("No selected items"); + statusline_msg(_("No selected items")); return; } mode = ENUM_SELECTED; @@ -583,7 +575,7 @@ ui_open_datafile() { char *filename; - filename = ask_filename("File to open: "); + filename = ask_filename(_("File to open: ")); if(!filename || ! *filename) { free(filename); @@ -593,7 +585,7 @@ ui_open_datafile() if(opt_get_bool(BOOL_AUTOSAVE)) save_database(); - else if(statusline_ask_boolean("Save current database", FALSE)) + else if(statusline_ask_boolean(_("Save current database"), FALSE)) save_database(); close_database(); @@ -601,11 +593,11 @@ ui_open_datafile() load_database(filename); if(items == 0) { - statusline_msg("Sorry, that specified file appears not to be a valid abook addressbook"); + statusline_msg(_("Sorry, the specified file appears not to be a valid abook addressbook")); load_database(datafile); } else { free(datafile); - datafile = strdup(filename); + datafile = xstrdup(filename); } refresh_screen();