mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: <no translation> behaviour

Browse Source 
Signed-off-by: Ilia Maslakov <il.smind@google.com>
This commit is contained in:
Ilia Maslakov 2009-08-25 07:38:47 +00:00 committed by Slava Zanko
parent 459ef0665f
commit a799ef4329
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/viewer/lib.c
View File

@ -208,28 +208,27 @@ void
mcview_select_encoding (mcview_t * view) mcview_select_encoding (mcview_t * view)
{ {
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
const char *enc = NULL; const char *cp_id = NULL;
if (do_select_codepage ()) {
cp_id = get_codepage_id (source_codepage >= 0 ?
source_codepage : display_codepage);
if (!do_select_codepage ()) if (cp_id != NULL) {
return;
enc = get_codepage_id (source_codepage);
if (enc != NULL) {
GIConv conv; GIConv conv;
conv = str_crt_conv_from (cp_id);
conv = str_crt_conv_from (enc);
if (conv != INVALID_CONV) { if (conv != INVALID_CONV) {
if (view->converter != str_cnv_from_term) if (view->converter != str_cnv_from_term)
str_close_conv (view->converter); str_close_conv (view->converter);
view->converter = conv; view->converter = conv;
} }
} }
if (enc != NULL && str_isutf8 (enc) != 0)
view->utf8 = TRUE;
else
view->utf8 = FALSE;
if (cp_id != NULL)
view->utf8 = (gboolean) str_isutf8 (cp_id);
}
#endif #endif
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */

25
src/viewer/mcviewer.c
View File

@ -279,7 +279,7 @@ mcview_load (mcview_t * view, const char *command, const char *file, int start_l
char *canon_fname; char *canon_fname;
struct stat st; struct stat st;
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
const char *cp_id; const char *cp_id = NULL;
#endif #endif
gboolean retval = FALSE; gboolean retval = FALSE;
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
@ -363,17 +363,22 @@ mcview_load (mcview_t * view, const char *command, const char *file, int start_l
view->dpy_text_column = 0; view->dpy_text_column = 0;
view->converter = str_cnv_from_term; view->converter = str_cnv_from_term;
/* try detect encoding from path */ #ifdef HAVE_CHARSET
if (view->filename != NULL) { cp_id = get_codepage_id (source_codepage >= 0 ?
canon_fname = vfs_canon (view->filename); source_codepage : display_codepage);
enc = vfs_get_encoding (canon_fname);
if (enc != NULL) { if (cp_id != NULL) {
view->converter = str_crt_conv_from (enc); GIConv conv;
if (view->converter == INVALID_CONV) conv = str_crt_conv_from (cp_id);
view->converter = str_cnv_from_term; if (conv != INVALID_CONV) {
if (view->converter != str_cnv_from_term)
str_close_conv (view->converter);
view->converter = conv;
} }
g_free (canon_fname);
} }
if (cp_id != NULL)
view->utf8 = (gboolean) str_isutf8 (cp_id);
#endif
mcview_compute_areas (view); mcview_compute_areas (view);
assert (view->bytes_per_line != 0); assert (view->bytes_per_line != 0);