Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed loading of files in charsets other than UTF-8 (#1562780)

  • Loading branch information...
commit d2543e5619cf934d4cfa222c9a7c9c6b7465c383 1 parent 1186d11
@vslavik authored
Showing with 5 additions and 2 deletions.
  1. +1 −0  NEWS
  2. +4 −2 src/catalog.cpp
View
1  NEWS
@@ -1,6 +1,7 @@
- fixed failure to load correct catalogs without error message
- fixed loading of X-Poedit-Language header (#1567018)
+- fixed loading of files in charsets other than UTF-8 (#1562780)
Version 1.3.5
View
6 src/catalog.cpp
@@ -957,7 +957,8 @@ bool Catalog::Load(const wxString& po_file)
m_data = new wxHashTable(wxKEY_STRING);
- if (!f.Open(po_file)) return false;
+ if (!f.Open(po_file, wxConvISO8859_1))
+ return false;
CharsetInfoFinder charsetFinder(&f, &wxConvISO8859_1);
charsetFinder.Parse();
@@ -965,7 +966,8 @@ bool Catalog::Load(const wxString& po_file)
f.Close();
wxCSConv encConv(m_header.Charset);
- if (!f.Open(po_file, encConv)) return false;
+ if (!f.Open(po_file, encConv))
+ return false;
#if wxUSE_UNICODE
if (!VerifyFileCharset(f, po_file, m_header.Charset))
Please sign in to comment.
Something went wrong with that request. Please try again.