# 
# patch "ChangeLog"
#  from [a9f9266ea788765181a2b5654e22b825bb5985c3]
#    to [ba4742a19ae65715b2ca0f37673f23939ff1276a]
# 
# patch "sanity.hh"
#  from [cb85ef0c3537ccd48478de3c93975cfeb8ebe518]
#    to [12ebe8387e78b3b1b569eef15cd79394c669a32f]
# 
========================================================================
--- ChangeLog	a9f9266ea788765181a2b5654e22b825bb5985c3
+++ ChangeLog	ba4742a19ae65715b2ca0f37673f23939ff1276a
@@ -1,3 +1,8 @@
+2005-08-22  Nathaniel Smith  <address@hidden>
+
+	* sanity.hh (FP): New macro.  Usage:
+	FP("frobbed %i bar", "frobbed %s bars", num_bars) % num_bars
+
 2005-08-20  Matthew Gregan  <address@hidden>
 
 	* revision.hh: Delete doubled line of text in comment.
========================================================================
--- sanity.hh	cb85ef0c3537ccd48478de3c93975cfeb8ebe518
+++ sanity.hh	12ebe8387e78b3b1b569eef15cd79394c669a32f
@@ -84,9 +84,12 @@
 
 extern sanity global_sanity;
 
-// F is for when you want to build a boost formatter
+// F is for when you want to build a boost formatter for display
 #define F(str) boost::format(gettext(str))
 
+// FP is for when you want to build a boost formatter for displaying a plural
+#define FP(str1, strn, count) boost::format(ngettext(str1, strn, count))
+
 // L is for logging, you can log all you want
 #define L(fmt) global_sanity.log(fmt, __FILE__, __LINE__)