From: Christopher Lenz <cmlenz@gmail.com>
Date: Fri, 8 Jun 2007 16:22:10 +0000 (+0000)
Subject: Fix for mixed singular/plural messages, follow-up to [70].
X-Git-Tag: 1.0~559
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dee3b4df5e5ed577240c872364bcf5b096668c6f;p=thirdparty%2Fbabel.git

Fix for mixed singular/plural messages, follow-up to [70].
---

diff --git a/babel/messages/catalog.py b/babel/messages/catalog.py
index 959b0eee..d51e8fa8 100644
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -49,7 +49,7 @@ class Message(object):
         if not string and self.pluralizable:
             string = (u'', u'')
         self.string = string
-        self.locations = locations
+        self.locations = list(locations)
         self.flags = set(flags)
         if id and self.python_format:
             self.flags.add('python-format')
@@ -309,6 +309,7 @@ class Catalog(object):
             if message.pluralizable and not current.pluralizable:
                 # The new message adds pluralization
                 current.id = message.id
+                current.string = message.string
             current.locations.extend(message.locations)
             current.flags |= message.flags
             message = current