Create an i18n submodule.

diff --git a/Makefile b/Makefile
index dbd35ab7d119535c57db526c636c2cc23cdd8b4b..c4ae700977c90365574966afb31c78f82cb0d171 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ dist:
 install:
        -mkdir -pv $(PYTHON_DIR)
        cp -rvf collecty $(PYTHON_DIR)
-       install -v -m 755 colletyd $(DESTDIR)/usr/sbin
+       install -v -m 755 collectyd $(DESTDIR)/usr/sbin
 
        -mkdir -pv $(DESTDIR)/var/rrd
 

diff --git a/collecty/i18n.py b/collecty/i18n.py
new file mode 100644 (file)
index 0000000..75c78fe
--- /dev/null
+++ b/collecty/i18n.py
@@ -0,0 +1,38 @@
+#!/usr/bin/python
+###############################################################################
+#                                                                             #
+# collecty - A system statistics collection daemon for IPFire                 #
+# Copyright (C) 2012 IPFire development team                                  #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+import gettext
+
+TEXTDOMAIN = "collecty"
+
+N_ = lambda x: x
+
+def _(singular, plural=None, n=None):
+       """
+               A function that returnes the translation of a string if available.
+
+               The language is taken from the system environment.
+       """
+       if not plural is None:
+               assert n is not None
+               return gettext.dngettext(TEXTDOMAIN, singular, plural, n)
+
+       return gettext.dgettext(TEXTDOMAIN, singular)

diff --git a/collecty/plugins/__init__.py b/collecty/plugins/__init__.py
index c926ca7945c6f0a32d17eb42413b41c2a0af46c9..fd837114c20cc3639d889ce803190e4a37658b6e 100644 (file)
--- a/collecty/plugins/__init__.py
+++ b/collecty/plugins/__init__.py
@@ -26,8 +26,7 @@ import time
 
 from threading import Thread
 
-import gettext
-_ = lambda x: gettext.ldgettext("collecty", x)
+from ..i18n import _
 
 registered_plugins = []