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.
---
 docs/api/configuration.rst |  4 ++++
 docs/api/i18n.rst          | 31 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 docs/api/i18n.rst

(limited to 'docs/api')

diff --git a/docs/api/configuration.rst b/docs/api/configuration.rst
index e872a91b9..7b411b92d 100644
--- a/docs/api/configuration.rst
+++ b/docs/api/configuration.rst
@@ -32,6 +32,8 @@
 
      .. automethod:: add_subscriber
 
+     .. automethod:: add_translation_dirs
+
      .. automethod:: add_view
 
      .. automethod:: load_zcml(spec)
@@ -46,6 +48,8 @@
 
      .. automethod:: set_notfound_view(view=None, attr=None, renderer=None, wrapper=None)
 
+     .. automethod:: set_locale_negotiator
+
      .. automethod:: testing_securitypolicy
 
      .. automethod:: testing_models
diff --git a/docs/api/i18n.rst b/docs/api/i18n.rst
new file mode 100644
index 000000000..6562bb13b
--- /dev/null
+++ b/docs/api/i18n.rst
@@ -0,0 +1,31 @@
+.. _i18n_module:
+
+:mod:`repoze.bfg.i18n`
+----------------------
+
+.. automodule:: repoze.bfg.i18n
+
+  .. autoclass:: TranslationString
+ 
+  .. autoclass:: TranslationStringFactory
+
+  .. autoclass:: Localizer
+     :members:
+
+     .. attribute:: locale_name
+
+        The locale name for this localizer (e.g. ``en`` or ``en_US``).
+
+  .. autofunction:: get_localizer
+
+  .. autofunction:: negotiate_locale_name
+
+  .. autofunction:: get_locale_name
+
+  .. autofunction:: default_locale_negotiator
+
+See :ref:`i18n_chapter` for more information about using
+:mod:`repoze.bfg` internationalization and localization services
+within an application.
+
+
-- 
cgit v1.2.3