Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed bug in charset validation code

  • Loading branch information...
commit 3aadba1bad97974ffd2ec9e970b65c16e9968f49 1 parent 89da1df
@vslavik authored
Showing with 14 additions and 2 deletions.
  1. +7 −0 poedit/NEWS
  2. +2 −0  poedit/TODO
  3. +5 −2 poedit/src/catalog.cpp
View
7 poedit/NEWS
@@ -1,4 +1,11 @@
+Version 1.1.10
+--------------
+
+- fix to 'fixes to catalog charset handling' from 1.1.9
+-
+
+
Version 1.1.9
-------------
View
2  poedit/TODO
@@ -1,6 +1,8 @@
High priority:
+- move 'Shaded translations list' from Preferences to View menu
+
- make list control customizable: optionally display only "original string" column
(suggested by Mladen Mintakovic)
View
7 poedit/src/catalog.cpp
@@ -444,13 +444,16 @@ static bool CanEncodeToCharset(Catalog& catalog, const wxString& charset)
size_t cnt = catalog.GetCount();
for (size_t i = 0; i < cnt; i++)
{
+ const wxString& orig = catalog[i].GetTranslation();
+ if (orig.IsEmpty())
+ continue;
#if !wxUSE_UNICODE
wxString trans =
- wxString(catalog[i].GetTranslation().wc_str(wxConvUTF8), conv);
+ wxString(orig.wc_str(wxConvUTF8), conv);
if (!trans)
return false;
#else
- if (!catalog[i].GetTranslation().mb_str(conv))
+ if (!orig.mb_str(conv))
return false;
#endif
Please sign in to comment.
Something went wrong with that request. Please try again.