mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use STR_E_NOTFOUND message where required. 

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2015-11-26 20:55:31 +03:00
parent b6500f1dcc
commit c5714eee34
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/search.h
View File

@ -128,6 +128,12 @@ typedef struct mc_search_type_str_struct
/*** global variables defined in .c file *********************************************************/
/* Error messages */
extern const char *STR_E_NOTFOUND;
extern const char *STR_E_UNKNOWN_TYPE;
extern const char *STR_E_RPL_NOT_EQ_TO_FOUND;
extern const char *STR_E_RPL_INVALID_TOKEN;
/*** declarations of public functions ************************************************************/
mc_search_t *mc_search_new (const gchar * original, const gchar * original_charset);

5
lib/search/internal.h
View File

@ -34,11 +34,6 @@ typedef struct mc_search_cond_struct
/*** global variables defined in .c file *********************************************************/
extern const char *STR_E_NOTFOUND;
extern const char *STR_E_UNKNOWN_TYPE;
extern const char *STR_E_RPL_NOT_EQ_TO_FOUND;
extern const char *STR_E_RPL_INVALID_TOKEN;
/*** declarations of public functions ************************************************************/
/* search/lib.c : */

2
src/diffviewer/search.c
View File

@ -229,7 +229,7 @@ mcdiffview_do_search (WDiff * dview)
if (!present_result)
{
dview->search.last_found_line = -1;
query_dialog (_("Search"), _("Search string not found"), D_NORMAL, 1, _("&Dismiss"));
query_dialog (_("Search"), _(STR_E_NOTFOUND), D_NORMAL, 1, _("&Dismiss"));
}
}

10
src/editor/editcmd.c
View File

@ -829,7 +829,7 @@ editcmd_find (edit_search_status_msg_t * esm, gsize * len)
if (!eval_marks (edit, &start_mark, &end_mark))
{
edit->search->error = MC_SEARCH_E_NOTFOUND;
edit->search->error_str = g_strdup (_("Search string not found"));
edit->search->error_str = g_strdup (_(STR_E_NOTFOUND));
return FALSE;
}
@ -850,7 +850,7 @@ editcmd_find (edit_search_status_msg_t * esm, gsize * len)
if (start_mark >= end_mark)
{
edit->search->error = MC_SEARCH_E_NOTFOUND;
edit->search->error_str = g_strdup (_("Search string not found"));
edit->search->error_str = g_strdup (_(STR_E_NOTFOUND));
return FALSE;
}
}
@ -892,7 +892,7 @@ editcmd_find (edit_search_status_msg_t * esm, gsize * len)
else
search_start--;
}
edit->search->error_str = g_strdup (_("Search string not found"));
edit->search->error_str = g_strdup (_(STR_E_NOTFOUND));
}
else
{
@ -989,7 +989,7 @@ edit_do_search (WEdit * edit)
}
if (found == 0)
edit_error_dialog (_("Search"), _("Search string not found"));
edit_error_dialog (_("Search"), _(STR_E_NOTFOUND));
else
edit_cursor_move (edit, edit->search_start - edit->buffer.curs1);
}
@ -2718,7 +2718,7 @@ edit_replace_cmd (WEdit * edit, int again)
edit_render_keypress (edit);
if (times_replaced == 0)
query_dialog (_("Replace"), _("Search string not found"), D_NORMAL, 1, _("&OK"));
query_dialog (_("Replace"), _(STR_E_NOTFOUND), D_NORMAL, 1, _("&OK"));
break;
}
}

2
src/viewer/search.c
View File

@ -146,7 +146,7 @@ mcview_find (mcview_search_status_msg_t * ssm, off_t search_start, off_t search_
search_start--;
}
view->search->error_str = g_strdup (_("Search string not found"));
view->search->error_str = g_strdup (_(STR_E_NOTFOUND));
return FALSE;
}
view->search_nroff_seq->index = search_start;