mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed i18n of file operation dialog titles.

Browse Source 
Also type accuracy.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2009-12-09 22:38:32 +03:00 committed by Slava Zanko
parent b90825fee4
commit 718c91e955
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/file.c
View File

@ -1713,7 +1713,7 @@ panel_operate_generate_prompt (const WPanel *panel, const int operation,
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
static gboolean i18n_flag = FALSE; static gboolean i18n_flag = FALSE;
if (!i18n_flag) { if (!i18n_flag) {
int i; size_t i;
for (i = sizeof (op_names1) / sizeof (op_names1[0]); i--;) for (i = sizeof (op_names1) / sizeof (op_names1[0]); i--;)
op_names1[i] = Q_(op_names1[i]); op_names1[i] = Q_(op_names1[i]);
@ -1818,7 +1818,10 @@ int
panel_operate (void *source_panel, FileOperation operation, panel_operate (void *source_panel, FileOperation operation,
int force_single) int force_single)
{ {
WPanel *panel = source_panel; WPanel *panel = (WPanel *) source_panel;
const gboolean single_entry = force_single || (panel->marked <= 1)
|| (get_current_type () == view_tree);
char *source = NULL; char *source = NULL;
#ifdef WITH_FULL_PATHS #ifdef WITH_FULL_PATHS
char *source_with_path = NULL; char *source_with_path = NULL;
@ -1828,8 +1831,6 @@ panel_operate (void *source_panel, FileOperation operation,
char *dest = NULL; char *dest = NULL;
char *temp = NULL; char *temp = NULL;
char *save_cwd = NULL, *save_dest = NULL; char *save_cwd = NULL, *save_dest = NULL;
int single_entry = (get_current_type () == view_tree)
|| (panel->marked <= 1) || force_single;
struct stat src_stat, dst_stat; struct stat src_stat, dst_stat;
int i; int i;
FileProgressStatus value; FileProgressStatus value;
@ -1841,6 +1842,15 @@ panel_operate (void *source_panel, FileOperation operation,
int dst_result; int dst_result;
int do_bg = 0; /* do background operation? */ int do_bg = 0; /* do background operation? */
#ifdef ENABLE_NLS
static gboolean i18n_flag = FALSE;
if (!i18n_flag) {
for (i = sizeof (op_names1) / sizeof (op_names1[0]); i--;)
op_names[i] = Q_(op_names[i]);
i18n_flag = TRUE;
}
#endif /* ENABLE_NLS */
free_linklist (&linklist); free_linklist (&linklist);
free_linklist (&dest_dirs); free_linklist (&dest_dirs);
@ -1937,7 +1947,7 @@ panel_operate (void *source_panel, FileOperation operation,
if (safe_delete) if (safe_delete)
query_set_sel (1); query_set_sel (1);
i = query_dialog (Q_(op_names[operation]), fmd_buf, D_ERROR, 2, i = query_dialog (op_names[operation], fmd_buf, D_ERROR, 2,
_("&Yes"), _("&No")); _("&Yes"), _("&No"));
if (i != 0) { if (i != 0) {

11
src/filegui.c
View File

@ -877,10 +877,6 @@ file_mask_dialog (FileOpContext *ctx, FileOperation operation,
char *def_text_secure; char *def_text_secure;
int val; int val;
#ifdef ENABLE_NLS
static gboolean i18n = FALSE;
#endif /* !ENABLE_NLS */
QuickWidget fmd_widgets[] = QuickWidget fmd_widgets[] =
{ {
/* 0 */ QUICK_BUTTON (42, 64, 10, FMDY, N_("&Cancel"), B_CANCEL, NULL), /* 0 */ QUICK_BUTTON (42, 64, 10, FMDY, N_("&Cancel"), B_CANCEL, NULL),
@ -916,13 +912,6 @@ file_mask_dialog (FileOpContext *ctx, FileOperation operation,
g_return_val_if_fail (ctx != NULL, NULL); g_return_val_if_fail (ctx != NULL, NULL);
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
if (!i18n) {
for (i = sizeof (op_names) / sizeof (op_names[0]); i--;)
op_names[i] = Q_(op_names[i]);
i18n = TRUE;
}
/* buttons */ /* buttons */
for (i = 0; i <= 2 - OFFSET; i++) for (i = 0; i <= 2 - OFFSET; i++)
fmd_widgets[i].u.button.text = _(fmd_widgets[i].u.button.text); fmd_widgets[i].u.button.text = _(fmd_widgets[i].u.button.text);