[Debian-l10n-commits] poedit branch upstream updated. upstream/1.8.3-1-g897a22f
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Fri Aug 7 08:13:30 UTC 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "poedit".
The branch, upstream has been updated
via 897a22f928f4d8047cec919a858f0f8c301bf65a (commit)
from 260f18b88082699dfc4f091dbff901b929a637b1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
NEWS | 6 ++++++
configure | 22 +++++++++++-----------
configure.ac | 4 ++--
docs/poedit.1 | 4 ++--
src/catalog.cpp | 34 +++++++++++++++++++++-------------
src/edframe.cpp | 1 +
src/language.cpp | 2 +-
src/prefsdlg.cpp | 2 +-
src/sidebar.cpp | 4 +++-
src/version.h | 4 ++--
src/welcomescreen.cpp | 8 ++++----
11 files changed, 54 insertions(+), 37 deletions(-)
diff --git a/NEWS b/NEWS
index 86842be..f271937 100644
--- a/NEWS
+++ b/NEWS
@@ -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 --git a/configure b/configure
index 1b0a8d2..1ff1787 100755
--- a/configure
+++ b/configure
@@ -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 <help at poedit.net>.
#
@@ -560,8 +560,8 @@ MAKEFLAGS=
# 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='help at poedit.net'
PACKAGE_URL=''
@@ -1331,7 +1331,7 @@ if test "$ac_init_help" = "long"; then
# 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 @@ fi
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 @@ fi
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 @@ cat >config.log <<_ACEOF
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_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
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 @@ fi
# Define the identity of the package.
PACKAGE='poedit'
- VERSION='1.8.3'
+ VERSION='1.8.4'
cat >>confdefs.h <<_ACEOF
@@ -7270,7 +7270,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# 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 @@ _ACEOF
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 --git a/configure.ac b/configure.ac
index d2fa392..24d2aa3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([poedit], [1.8.3], [help at poedit.net])
-PACKAGE_SHORT_VERSION=1.8.3
+AC_INIT([poedit], [1.8.4], [help at poedit.net])
+PACKAGE_SHORT_VERSION=1.8.4
AC_SUBST(PACKAGE_SHORT_VERSION)
AC_CONFIG_AUX_DIR([admin])
diff --git a/docs/poedit.1 b/docs/poedit.1
index 26e7b03..ba1b91a 100644
--- a/docs/poedit.1
+++ b/docs/poedit.1
@@ -2,12 +2,12 @@
.\" Title: poedit
.\" Author: Vaclav Slavik <vaclav at slavik.io>
.\" 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 --git a/src/catalog.cpp b/src/catalog.cpp
index 795803e..d28f428 100644
--- a/src/catalog.cpp
+++ b/src/catalog.cpp
@@ -1151,6 +1151,9 @@ void Catalog::CreateNewHeader()
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 @@ bool Catalog::Save(const wxString& po_file, bool save_mo,
// 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 @@ bool Catalog::Save(const wxString& po_file, bool save_mo,
}
- // 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 @@ static unsigned GetCountFromPluralFormsHeader(const Catalog::HeaderData& header)
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 --git a/src/edframe.cpp b/src/edframe.cpp
index 3a8e930..9c51ec4 100644
--- a/src/edframe.cpp
+++ b/src/edframe.cpp
@@ -1620,6 +1620,7 @@ bool PoeditFrame::UpdateCatalog(const wxString& pot_file)
}
m_modified = succ || m_modified;
+ UpdateStatusBar();
if (!succ)
{
diff --git a/src/language.cpp b/src/language.cpp
index 01e5a32..65430c1 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -501,7 +501,7 @@ Language Language::TryDetectFromText(const char *buffer, size_t len, Language pr
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 --git a/src/prefsdlg.cpp b/src/prefsdlg.cpp
index 73c163d..b5b3db7 100644
--- a/src/prefsdlg.cpp
+++ b/src/prefsdlg.cpp
@@ -280,7 +280,7 @@ public:
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 --git a/src/sidebar.cpp b/src/sidebar.cpp
index 3e2ceb9..8480bd3 100644
--- a/src/sidebar.cpp
+++ b/src/sidebar.cpp
@@ -632,7 +632,9 @@ void SuggestionsSidebarBlock::Update(const CatalogItemPtr& item)
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 --git a/src/version.h b/src/version.h
index bed2631..65878e4 100644
--- a/src/version.h
+++ b/src/version.h
@@ -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 --git a/src/welcomescreen.cpp b/src/welcomescreen.cpp
index bb0ed03..675fa06 100644
--- a/src/welcomescreen.cpp
+++ b/src/welcomescreen.cpp
@@ -165,10 +165,10 @@ WelcomeScreenBase::WelcomeScreenBase(wxWindow *parent)
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());
-----------------------------------------------------------------------
hooks/post-receive
--
poedit
More information about the Debian-l10n-commits
mailing list