[Checkins] SVN: lovely.recipe/trunk/ - do not use -U for msgmerge because it doesn't work on MAC and verion 0.17

[Juergen Kartnaller]

Log message for revision 99165:
   - do not use -U for msgmerge because it doesn't work on MAC and verion 0.17
     of msgmerge.
  

Changed:
  U   lovely.recipe/trunk/CHANGES.txt
  U   lovely.recipe/trunk/setup.py
  U   lovely.recipe/trunk/src/lovely/recipe/i18n/i18nmergeall.py

-=-
Modified: lovely.recipe/trunk/CHANGES.txt
===================================================================
--- lovely.recipe/trunk/CHANGES.txt	2009-04-14 13:17:11 UTC (rev 99164)
+++ lovely.recipe/trunk/CHANGES.txt	2009-04-14 13:27:18 UTC (rev 99165)
@@ -2,6 +2,12 @@
 Changes for lovely.recipe
 =========================
 
+2009/04/14 1.0.0b3
+==================
+
+ - do not use -U for msgmerge because it doesn't work on MAC and verion 0.17
+   of msgmerge.
+
 2009/04/03 1.0.0b2
 ==================
 

Modified: lovely.recipe/trunk/setup.py
===================================================================
--- lovely.recipe/trunk/setup.py	2009-04-14 13:17:11 UTC (rev 99164)
+++ lovely.recipe/trunk/setup.py	2009-04-14 13:27:18 UTC (rev 99165)
@@ -15,7 +15,7 @@
 setup (
     name='lovely.recipe',
     description = "set of helper recipies for zc.buildout",
-    version='1.0.0b2',
+    version='1.0.0b3',
     author = "Lovely Systems",
     author_email = "office at lovelysystems.com",
     license = "ZPL 2.1",
@@ -27,6 +27,7 @@
     namespace_packages = ['lovely', 'lovely.recipe'],
     extras_require = dict(zope=[
                         'zope.app.locales',
+                        'zope.error',
                         'zc.zope3recipes',
                         'zc.zodbrecipes',
                         'zope.app.locales>=3.4.5',

Modified: lovely.recipe/trunk/src/lovely/recipe/i18n/i18nmergeall.py
===================================================================
--- lovely.recipe/trunk/src/lovely/recipe/i18n/i18nmergeall.py	2009-04-14 13:17:11 UTC (rev 99164)
+++ lovely.recipe/trunk/src/lovely/recipe/i18n/i18nmergeall.py	2009-04-14 13:27:18 UTC (rev 99165)
@@ -59,7 +59,8 @@
                 pot_path = os.path.join(path, domain_file+'t')
                 domain = domain_file.split('.')[0]
                 print 'Merging language "%s", domain "%s"' %(language, domain)
-                os.system('msgmerge -U %s %s' %(domain_path, pot_path))
+                os.system('msgmerge %s %s -o %s' %(
+                                        domain_path, pot_path, domain_path))
 
 
 def main(argv=sys.argv):