From: Richard Heck <rgheck@lyx.org>
Date: Mon, 18 Jul 2016 02:31:54 +0000 (-0400)
Subject: Fix thinko that led 2-authors citations to be displayed with "et al."
X-Git-Tag: 2.2.2~118
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e98334098bac6d01260c2f417826a83f943cb24b;p=features.git

Fix thinko that led 2-authors citations to be displayed with "et al."

(cherry picked from commit d5633f17e56b73b308921a7c466bffa20e3e27b8)
---

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index f2bf332a26..1d3b6fd07d 100644
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -299,8 +299,7 @@ docstring const BibTeXInfo::getAbbreviatedAuthor(bool jurabib_style) const
 	if (authors.size() == 2 && authors[1] != "others")
 		retval = bformat(from_ascii("%1$s and %2$s"),
 			familyName(authors[0]), familyName(authors[1]));
-
-	if (authors.size() >= 2)
+	else if (authors.size() >= 2)
 		retval = bformat(from_ascii("%1$s et al."),
 			familyName(authors[0]));
 
diff --git a/status.22x b/status.22x
index 1d74cf8b79..5afab3f257 100644
--- a/status.22x
+++ b/status.22x
@@ -40,6 +40,10 @@ What's new
 
 * USER INTERFACE
 
+- Fix display of citations with two authors. 
+
+- Fix display of multi-author citations when the GUI language is not English.
+
 
 * INTERNALS