Merge branch 'master' of git://git.assembla.com/fpdb

Conflicts:
	pyfpdb/GuiBulkImport.py

pyfpdb/GuiBulkImport.py

@@ -15,6 +15,9 @@
 #along with this program. If not, see <http://www.gnu.org/licenses/>.
 #In the "official" distribution you can find the license in agpl-3.0.txt.
 
+import L10n
+_ = L10n.get_translation()
+
 #    Standard Library modules
 import os
 import sys
@@ -33,17 +36,6 @@ import fpdb_import
 import Configuration
 import Exceptions
 
-import locale
-(lang, charset) = locale.getdefaultlocale()
-if lang == None or lang[:2] == "en":
-    def _(string): return string
-else:
-    import gettext
-    try:
-        trans = gettext.translation("fpdb", localedir="locale", languages=[lang])
-        trans.install()
-    except IOError:
-        def _(string): return string
 
 class GuiBulkImport():
 

pyfpdb/L10n.py

@@ -0,0 +1,37 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+#Copyright 2010 Steffen Schaumburg
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU Affero General Public License as published by
+#the Free Software Foundation, version 3 of the License.
+#
+#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 Affero General Public License
+#along with this program. If not, see <http://www.gnu.org/licenses/>.
+#In the "official" distribution you can find the license in agpl-3.0.txt.
+
+import locale
+def pass_through(to_translate): return to_translate
+
+lang=locale.getdefaultlocale()[0][0:2]
+if lang=="en":
+    translation=pass_through
+else:
+    import gettext
+    try:
+        trans = gettext.translation("fpdb", localedir="locale", languages=[lang])
+        trans.install()
+        translation=_
+    except IOError:
+        translation=pass_through
+    
+#def translate(to_translate):
+#        return _(to_translate)
+        
+def get_translation():
+    return translation