Hello community, here is the log from the commit of package poedit for openSUSE:Factory checked in at 2015-08-25 07:20:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poedit (Old) and /work/SRC/openSUSE:Factory/.poedit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poedit" Changes: -------- --- /work/SRC/openSUSE:Factory/poedit/poedit.changes 2015-07-23 15:23:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poedit.new/poedit.changes 2015-08-25 08:55:17.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 24 00:39:59 UTC 2015 - [email protected] + +- poedit 1.8.4: + * Fix bug in handling POTs with plural forms introduced in 1.8.3. + +------------------------------------------------------------------- Old: ---- poedit-1.8.3.tar.gz New: ---- poedit-1.8.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poedit.spec ++++++ --- /var/tmp/diff_new_pack.qO9IGi/_old 2015-08-25 08:55:17.000000000 +0200 +++ /var/tmp/diff_new_pack.qO9IGi/_new 2015-08-25 08:55:17.000000000 +0200 @@ -20,7 +20,7 @@ %bcond_without language_detection %bcond_without crowdin_integration Name: poedit -Version: 1.8.3 +Version: 1.8.4 Release: 0 Summary: Cross-platform Gettext Catalogs Editing Tool License: MIT ++++++ poedit-1.8.3.tar.gz -> poedit-1.8.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-1.8.3/NEWS new/poedit-1.8.4/NEWS --- old/poedit-1.8.3/NEWS 2015-07-22 17:03:08.000000000 +0200 +++ new/poedit-1.8.4/NEWS 2015-08-03 12:49:10.000000000 +0200 @@ -1,4 +1,10 @@ +Version 1.8.4 +------------- + +- Fixed bug in handling POTs with plural forms introduced in 1.8.3. + + Version 1.8.3 ------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-1.8.3/configure new/poedit-1.8.4/configure --- old/poedit-1.8.3/configure 2015-07-22 17:04:13.000000000 +0200 +++ new/poedit-1.8.4/configure 2015-08-03 12:50:03.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for poedit 1.8.3. +# Generated by GNU Autoconf 2.68 for poedit 1.8.4. # # Report bugs to <[email protected]>. # @@ -560,8 +560,8 @@ # Identity of this package. PACKAGE_NAME='poedit' PACKAGE_TARNAME='poedit' -PACKAGE_VERSION='1.8.3' -PACKAGE_STRING='poedit 1.8.3' +PACKAGE_VERSION='1.8.4' +PACKAGE_STRING='poedit 1.8.4' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1331,7 +1331,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures poedit 1.8.3 to adapt to many kinds of systems. +\`configure' configures poedit 1.8.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1401,7 +1401,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of poedit 1.8.3:";; + short | recursive ) echo "Configuration of poedit 1.8.4:";; esac cat <<\_ACEOF @@ -1529,7 +1529,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -poedit configure 1.8.3 +poedit configure 1.8.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1936,7 +1936,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by poedit $as_me 1.8.3, which was +It was created by poedit $as_me 1.8.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2284,7 +2284,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -PACKAGE_SHORT_VERSION=1.8.3 +PACKAGE_SHORT_VERSION=1.8.4 ac_aux_dir= @@ -2828,7 +2828,7 @@ # Define the identity of the package. PACKAGE='poedit' - VERSION='1.8.3' + VERSION='1.8.4' cat >>confdefs.h <<_ACEOF @@ -7270,7 +7270,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by poedit $as_me 1.8.3, which was +This file was extended by poedit $as_me 1.8.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7327,7 +7327,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -poedit config.status 1.8.3 +poedit config.status 1.8.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-1.8.3/configure.ac new/poedit-1.8.4/configure.ac --- old/poedit-1.8.3/configure.ac 2015-07-22 17:03:08.000000000 +0200 +++ new/poedit-1.8.4/configure.ac 2015-08-03 12:49:10.000000000 +0200 @@ -2,8 +2,8 @@ AC_PREREQ(2.59) -AC_INIT([poedit], [1.8.3], [[email protected]]) -PACKAGE_SHORT_VERSION=1.8.3 +AC_INIT([poedit], [1.8.4], [[email protected]]) +PACKAGE_SHORT_VERSION=1.8.4 AC_SUBST(PACKAGE_SHORT_VERSION) AC_CONFIG_AUX_DIR([admin]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-1.8.3/docs/poedit.1 new/poedit-1.8.4/docs/poedit.1 --- old/poedit-1.8.3/docs/poedit.1 2015-07-22 17:04:15.000000000 +0200 +++ new/poedit-1.8.4/docs/poedit.1 2015-08-03 12:50:05.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: poedit .\" Author: Vaclav Slavik <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 07/22/2015 +.\" Date: 08/03/2015 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "POEDIT" "1" "07/22/2015" "\ \&" "\ \&" +.TH "POEDIT" "1" "08/03/2015" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-1.8.3/src/catalog.cpp new/poedit-1.8.4/src/catalog.cpp --- old/poedit-1.8.3/src/catalog.cpp 2015-07-22 17:03:15.000000000 +0200 +++ new/poedit-1.8.4/src/catalog.cpp 2015-08-03 12:49:16.000000000 +0200 @@ -1151,6 +1151,9 @@ dt.RevisionDate = dt.CreationDate; dt.Lang = Language(); + if (m_fileType == Type::POT) + dt.SetHeader("Plural-Forms", "nplurals=INTEGER; plural=EXPRESSION;"); // default invalid value + dt.Project = wxEmptyString; dt.Team = wxEmptyString; dt.TeamEmail = wxEmptyString; @@ -1570,8 +1573,18 @@ // do anything about. wxLogNull null; msgcat_ok = ExecuteGettext(msgcatCmd) && - wxFileExists(po_file_temp2) && - wxRenameFile(po_file_temp2, po_file, /*overwrite=*/true); + wxFileExists(po_file_temp2); + + // msgcat always outputs Unix line endings, so we need to reformat the file + if (msgcat_ok && outputCrlf == wxTextFileType_Dos) + { + wxTextFile finalFile(po_file_temp2); + if (finalFile.Open()) + finalFile.Write(outputCrlf); + } + + if (!wxRenameFile(po_file_temp2, po_file, /*overwrite=*/true)) + msgcat_ok = false; } if ( msgcat_ok ) @@ -1597,15 +1610,6 @@ } - // msgcat always outputs Unix line endings, so we need to reformat the file - if (outputCrlf == wxTextFileType_Dos) - { - wxTextFile finalFile(po_file); - if (finalFile.Open()) - finalFile.Write(outputCrlf); - } - - /* If the user wants it, compile .mo file right now: */ if (m_fileType == Type::PO && save_mo && wxConfig::Get()->Read("compile_mo", (long)true)) @@ -2390,13 +2394,17 @@ form = form.BeforeFirst(_T(';')); if (form.BeforeFirst(_T('=')) == "nplurals") { + wxString vals = form.AfterFirst('='); + if (vals == "INTEGER") // POT default + return 2; long val; - if (form.AfterFirst(_T('=')).ToLong(&val)) + if (vals.ToLong(&val)) return (unsigned)val; } } - return 0; + // fallback value for plural forms count should be 2, as in English: + return 2; } unsigned Catalog::GetPluralFormsCount() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-1.8.3/src/edframe.cpp new/poedit-1.8.4/src/edframe.cpp --- old/poedit-1.8.3/src/edframe.cpp 2015-07-22 17:03:15.000000000 +0200 +++ new/poedit-1.8.4/src/edframe.cpp 2015-08-03 12:49:16.000000000 +0200 @@ -1620,6 +1620,7 @@ } m_modified = succ || m_modified; + UpdateStatusBar(); if (!succ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-1.8.3/src/language.cpp new/poedit-1.8.4/src/language.cpp --- old/poedit-1.8.3/src/language.cpp 2015-07-22 17:03:15.000000000 +0200 +++ new/poedit-1.8.4/src/language.cpp 2015-08-03 12:49:16.000000000 +0200 @@ -501,7 +501,7 @@ auto lang = CLD2::ExtDetectLanguageSummary( buffer, (int)len, - /*is_plain_text=*/false, // may have embedded HTML markup + /*is_plain_text=*/true, // any embedded HTML markup should be insignificant &hints, /*flags=*/0, language3, percent3, normalized_score3, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-1.8.3/src/prefsdlg.cpp new/poedit-1.8.4/src/prefsdlg.cpp --- old/poedit-1.8.3/src/prefsdlg.cpp 2015-07-22 17:03:15.000000000 +0200 +++ new/poedit-1.8.4/src/prefsdlg.cpp 2015-08-03 12:49:16.000000000 +0200 @@ -280,7 +280,7 @@ m_useFontText->SetValue(cfg.ReadBool("custom_font_text_use", false)); #if defined(__WXOSX__) - #define DEFAULT_FONT "Helvetica" + #define DEFAULT_FONT "Helvetica Neue" #elif defined(__WXMSW__) #define DEFAULT_FONT "Arial" #elif defined(__WXGTK__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-1.8.3/src/sidebar.cpp new/poedit-1.8.4/src/sidebar.cpp --- old/poedit-1.8.3/src/sidebar.cpp 2015-07-22 17:03:15.000000000 +0200 +++ new/poedit-1.8.4/src/sidebar.cpp 2015-08-03 12:49:16.000000000 +0200 @@ -632,7 +632,9 @@ ClearMessage(); ClearSuggestions(); - if (m_parent->GetCurrentSourceLanguage() == m_parent->GetCurrentLanguage()) + auto srclang = m_parent->GetCurrentSourceLanguage(); + auto lang = m_parent->GetCurrentLanguage(); + if (!srclang.IsValid() || !lang.IsValid() || srclang == lang) { OnQueriesFinished(); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-1.8.3/src/version.h new/poedit-1.8.4/src/version.h --- old/poedit-1.8.3/src/version.h 2015-07-22 17:03:15.000000000 +0200 +++ new/poedit-1.8.4/src/version.h 2015-08-03 12:49:16.000000000 +0200 @@ -26,7 +26,7 @@ #ifndef _VERSION_H_ #define _VERSION_H_ -#define POEDIT_VERSION "1.8.3" -#define POEDIT_VERSION_WIN 1,8,3 +#define POEDIT_VERSION "1.8.4" +#define POEDIT_VERSION_WIN 1,8,4 #endif // _VERSION_H_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poedit-1.8.3/src/welcomescreen.cpp new/poedit-1.8.4/src/welcomescreen.cpp --- old/poedit-1.8.3/src/welcomescreen.cpp 2015-07-22 17:03:15.000000000 +0200 +++ new/poedit-1.8.4/src/welcomescreen.cpp 2015-08-03 12:49:16.000000000 +0200 @@ -165,10 +165,10 @@ SetBackgroundColour(wxColour("#fffcf5")); #if defined(__WXOSX__) - #define HEADER_FACE "Helvetica Neue" - m_fntHeader = wxFont(wxFontInfo(30).FaceName(HEADER_FACE).Light()); - m_fntNorm = wxFont(wxFontInfo(13).FaceName(HEADER_FACE).Light()); - m_fntSub = wxFont(wxFontInfo(11).FaceName(HEADER_FACE).Light()); + auto guiface = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFaceName(); + m_fntHeader = wxFont(wxFontInfo(30).FaceName(guiface).Light()); + m_fntNorm = wxFont(wxFontInfo(13).FaceName(guiface).Light()); + m_fntSub = wxFont(wxFontInfo(11).FaceName(guiface).Light()); #elif defined(__WXMSW__) #define HEADER_FACE "Segoe UI" m_fntHeader = wxFont(wxFontInfo(20).FaceName("Segoe UI Light").AntiAliased());
