From 9483387a23b7dc01f33d95efcbc80e78e4b7479b Mon Sep 17 00:00:00 2001
From: Mark Sapiro <msapiro@value.net>
Date: Thu, 4 Nov 2010 10:13:29 -0700
Subject: - Fixed a missing format character in the Spanish translation.   Bug
 #670988.

- Fixed the host name in the From: address of the owner notification from
  bin/add_members.  Bug #666181.
---
 NEWS                               | 12 ++++++++++++
 bin/add_members                    |  7 +++++--
 messages/es/LC_MESSAGES/mailman.po |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 3f8926ea..4ae3fbc4 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,18 @@ Copyright (C) 1998-2010 by the Free Software Foundation, Inc.
 
 Here is a history of user visible changes to Mailman.
 
+2.1.15 (xx-xxx-xxxx)
+
+  i18n
+
+    - Fixed a missing format character in the Spanish translation.
+      Bug #670988.
+
+  Bug Fixes and other patches
+
+    - Fixed the host name in the From: address of the owner notification from
+      bin/add_members.  Bug #666181.
+
 2.1.14 (20-Sep-2010)
 
   Security
diff --git a/bin/add_members b/bin/add_members
index 03f0af3a..77f11aff 100755
--- a/bin/add_members
+++ b/bin/add_members
@@ -1,6 +1,6 @@
 #! @PYTHON@
 #
-# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2010 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -244,7 +244,10 @@ def main():
             realname = mlist.real_name
             subject = _('%(realname)s subscription notification')
             msg = Message.UserNotification(
-                mlist.owner, Utils.get_site_email(), subject, s.getvalue(),
+                mlist.owner,
+                Utils.get_site_email(mlist.host_name),
+                subject,
+                s.getvalue(),
                 mlist.preferred_language)
             msg.send(mlist)
 
diff --git a/messages/es/LC_MESSAGES/mailman.po b/messages/es/LC_MESSAGES/mailman.po
index 6854a029..0df1f1a5 100644
--- a/messages/es/LC_MESSAGES/mailman.po
+++ b/messages/es/LC_MESSAGES/mailman.po
@@ -9194,7 +9194,7 @@ msgstr "    comprobando gid y modo de %(path)s"
 #: bin/check_perms:122
 msgid "%(path)s bad group (has: %(groupname)s, expected %(MAILMAN_GROUP)s)"
 msgstr ""
-"%(path) tiene un grupo incorrecto (tiene: %(groupname)s, se esperaba que "
+"%(path)s tiene un grupo incorrecto (tiene: %(groupname)s, se esperaba que "
 "tuviera %(MAILMAN_GROUP)s)"
 
 #: bin/check_perms:151
-- 
cgit v1.2.3