From 7534bae0c5eeb34a0146e76a81a9312797f6ba5c Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Sun, 25 Apr 2010 00:02:12 +0000
Subject: Merge i18n branch via svn merge --ignore-ancestry -r9030:9150
 $REPOZE_SVN/repoze.bfg/branches/i18n

No foreigners were harmed in the coding of this feature.
---
 repoze/bfg/includes/meta.zcml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'repoze/bfg/includes')

diff --git a/repoze/bfg/includes/meta.zcml b/repoze/bfg/includes/meta.zcml
index 25894df71..5ecebd868 100644
--- a/repoze/bfg/includes/meta.zcml
+++ b/repoze/bfg/includes/meta.zcml
@@ -76,6 +76,18 @@
         handler="repoze.bfg.zcml.aclauthorizationpolicy"
         />
 
+    <meta:directive
+        name="translationdir"
+        schema="repoze.bfg.zcml.ITranslationDirDirective"
+        handler="repoze.bfg.zcml.translationdir"
+        />
+
+    <meta:directive
+        name="localenegotiator"
+        schema="repoze.bfg.zcml.ILocaleNegotiatorDirective"
+        handler="repoze.bfg.zcml.localenegotiator"
+        />
+
     <meta:directive
         name="adapter"
         schema="repoze.bfg.zcml.IAdapterDirective"
-- 
cgit v1.2.3