Merge branch 'master' of github.com:inyokaproject/Inyoka-Legacy

README.rst

@@ -0,0 +1,39 @@
+=============
+Inyoka Legacy
+=============
+
+This is the formerly called “inyoka-ng” project that was set out to be more dynamic and extensible than the original Inyoka Project.
+
+**This represents legacy code that is not actively maintained!**
+
+The application mainly provides:
+
+* A comprehensive component based extension system
+* Example implementations with a Newssystem, Pastebin, Buletin Board and a Calendar.
+* A lot of utilities and reusable components
+
+Authors
+=======
+
+- Florian Apolloner <florian@apolloner.eu>
+- Stefan Betz
+- Georg Brandl
+- Mario Fuest
+- Jens Gottfried
+- Christopher Grebs <cg@webshox.org>
+- Christoph Hack <christoph@tux21b.org>
+- Markus Holtermann <inyoka@markusholtermann.eu> 
+- Daniel Neuhäuser <dasdasich@gmail.com>
+- Armin Ronacher <armin.ronacher@active-4.com>
+- Markus Seidel
+- Marian Sigler
+- Sören Wegener
+- Benjamin Wiegand
+- Nils Winter
+
+Some parts and ideas are taken from existing projects:
+
+- Zine <http://zine.pocoo.org/>
+- Solace <http://opensource.plurk.com/solace/>
+- Django <http://djangoproject.com/>
+- Tipfy <http://www.tipfy.org/>

inyoka/i18n/__init__.py

@@ -99,7 +99,7 @@ def __repr__(self):
 
 
 def find_catalog(path, domain, locale, gettext_lookup=False):
-    """Finds the catalog for the given locale on the path.  Return sthe
+    """Finds the catalog for the given locale on the path.  Return the
     filename of the .mo file if found, otherwise `None` is returned.
     """
     args = [path, str(get_locale(locale)), domain + '.mo']