From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Jan 2009 20:52:18 +0000 (+0100)
Subject: Changed tranation from own to gettext module.
X-Git-Tag: v3.0-alpha1~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62c1bebcfce0f550759bba1f25fdb2fc46fcb2eb;p=ipfire-3.x.git

Changed tranation from own to gettext module.
---

diff --git a/src/pomona/Makefile b/src/pomona/Makefile
index 408c58207..2a89b233a 100644
--- a/src/pomona/Makefile
+++ b/src/pomona/Makefile
@@ -26,7 +26,7 @@ all: lang-names subdirs
 
 lang-names: lang-table
 	PYTHONPATH="./src/:." LANG=en_US.UTF-8 \
-		python scripts/getlangnames.py > lang-names.tmp
+		./scripts/getlangnames.py > lang-names.tmp
 	mv lang-names.tmp lang-names
 
 install: all
diff --git a/src/pomona/autopart.py b/src/pomona/autopart.py
index b8dcdd63f..40a1f0f81 100644
--- a/src/pomona/autopart.py
+++ b/src/pomona/autopart.py
@@ -24,7 +24,9 @@ import partRequests
 from constants import *
 from partErrors import *
 
-from pyfire.translate import _, N_
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
+N_ = lambda x: x
 
 log = logging.getLogger("pomona")
 
diff --git a/src/pomona/backend.py b/src/pomona/backend.py
index 7afe5424f..bb3f810d9 100644
--- a/src/pomona/backend.py
+++ b/src/pomona/backend.py
@@ -21,7 +21,9 @@ import logging
 from constants import *
 
 import packages
-from pyfire.translate import _
+
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 from flags import flags
 log = logging.getLogger("pomona")
diff --git a/src/pomona/bootloader.py b/src/pomona/bootloader.py
index 51970d53d..142f2f225 100644
--- a/src/pomona/bootloader.py
+++ b/src/pomona/bootloader.py
@@ -28,7 +28,8 @@ from copy import copy
 from flags import flags
 from constants import *
 
-from pyfire.translate import _
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 import logging
 log = logging.getLogger("pomona")
diff --git a/src/pomona/console.py b/src/pomona/console.py
index d58022065..ed0bc59fd 100644
--- a/src/pomona/console.py
+++ b/src/pomona/console.py
@@ -9,10 +9,9 @@ import pyfire.executil as executil
 from pyfire.config import ConfigFile
 import keyboard_models
 
-def N_(str):
-    return str
-
+import gettext
 _ = lambda x: gettext.ldgettext("pomona", x)
+N_ = lambda x: x
 
 # Converts a single language into a "language search path". For example,
 # de_DE.utf8@euro would become "de_DE.utf8@eueo de_DE.utf8 de_DE de"
diff --git a/src/pomona/constants.py b/src/pomona/constants.py
index 0710d6579..3fded0188 100644
--- a/src/pomona/constants.py
+++ b/src/pomona/constants.py
@@ -1,6 +1,8 @@
 #!/usr/bin/python
 
-from console import _, N_
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
+N_ = lambda x: x
 
 version = "VERSION"
 name = "NAME v%s" % version
diff --git a/src/pomona/exception.py b/src/pomona/exception.py
index ad45525bf..3a018a8b8 100644
--- a/src/pomona/exception.py
+++ b/src/pomona/exception.py
@@ -3,9 +3,11 @@ import bdb
 import os, sys, signal, types
 from cPickle import Pickler
 from string import joinfields
-from pyfire.translate import _
 import traceback
 
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
+
 import logging
 log = logging.getLogger("pomona")
 
diff --git a/src/pomona/fsset.py b/src/pomona/fsset.py
index 0e2c2577b..221922731 100644
--- a/src/pomona/fsset.py
+++ b/src/pomona/fsset.py
@@ -31,7 +31,9 @@ import types
 import math
 from flags import flags
 
-from console import _, N_
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
+N_ = lambda x: x
 
 import logging
 log = logging.getLogger("pomona")
diff --git a/src/pomona/keyboard_models.py b/src/pomona/keyboard_models.py
index 35d189d7d..76c0e416a 100644
--- a/src/pomona/keyboard_models.py
+++ b/src/pomona/keyboard_models.py
@@ -23,7 +23,9 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-from pyfire.translate import _, N_
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
+N_ = lambda x: x
 
 def gkn(str):
     idx = str.find("|")
diff --git a/src/pomona/network.py b/src/pomona/network.py
index 3a9ff0fd0..5f5cce14a 100644
--- a/src/pomona/network.py
+++ b/src/pomona/network.py
@@ -4,7 +4,9 @@ import socket
 import string
 
 import pyfire.net
-from pyfire.translate import _
+
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 def networkDeviceCheck(pomona):
     devs = pomona.id.network.available()
diff --git a/src/pomona/packages.py b/src/pomona/packages.py
index 8865c5384..97fd52c77 100644
--- a/src/pomona/packages.py
+++ b/src/pomona/packages.py
@@ -25,7 +25,8 @@ import shutil
 from flags import flags
 from constants import *
 
-from pyfire.translate import _
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 import logging
 log = logging.getLogger("pomona")
diff --git a/src/pomona/pakfireinstall.py b/src/pomona/pakfireinstall.py
index 8d02dd60c..f300ace1a 100644
--- a/src/pomona/pakfireinstall.py
+++ b/src/pomona/pakfireinstall.py
@@ -24,7 +24,9 @@ import urlgrabber.grabber
 from urlgrabber.grabber import URLGrabber, URLGrabError
 from backend import PomonaBackend
 from constants import *
-from pyfire.translate import _
+
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 import logging
 log = logging.getLogger("pomona")
diff --git a/src/pomona/partIntfHelpers.py b/src/pomona/partIntfHelpers.py
index fd0d06971..80d6ded09 100644
--- a/src/pomona/partIntfHelpers.py
+++ b/src/pomona/partIntfHelpers.py
@@ -24,7 +24,9 @@ import partedUtils
 import parted
 import fsset
 import partRequests
-from pyfire.translate import _
+
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 def sanityCheckMountPoint(mntpt, fstype, preexisting, format):
     """Sanity check that the mountpoint is valid.
diff --git a/src/pomona/partRequests.py b/src/pomona/partRequests.py
index cf049f7f0..437e9ec47 100644
--- a/src/pomona/partRequests.py
+++ b/src/pomona/partRequests.py
@@ -23,12 +23,14 @@ import string
 import os, sys, math
 
 from constants import *
-from pyfire.translate import _
 
 import fsset
 import partedUtils
 import partIntfHelpers
 
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
+
 import logging
 log = logging.getLogger("pomona")
 
diff --git a/src/pomona/partedUtils.py b/src/pomona/partedUtils.py
index 4d5ee1652..c1f142ce2 100644
--- a/src/pomona/partedUtils.py
+++ b/src/pomona/partedUtils.py
@@ -28,7 +28,8 @@ from flags import flags
 from partErrors import *
 from constants import *
 
-from pyfire.translate import _
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 import logging
 log = logging.getLogger("pomona")
diff --git a/src/pomona/partitioning.py b/src/pomona/partitioning.py
index a991c3bd2..5c730071f 100644
--- a/src/pomona/partitioning.py
+++ b/src/pomona/partitioning.py
@@ -23,7 +23,8 @@ from constants import *
 from flags import flags
 from partErrors import *
 
-from pyfire.translate import _
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 def partitionObjectsInitialize(pomona):
     # read in drive info
diff --git a/src/pomona/partitions.py b/src/pomona/partitions.py
index 939345d9d..3a822790a 100644
--- a/src/pomona/partitions.py
+++ b/src/pomona/partitions.py
@@ -29,8 +29,8 @@ import fsset
 import partedUtils
 import partRequests
 
-import pyfire
-from pyfire.translate import _
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 import logging
 log = logging.getLogger("pomona")
diff --git a/src/pomona/scripts/getlangnames.py b/src/pomona/scripts/getlangnames.py
old mode 100644
new mode 100755
index 011d8c282..865245e2e
--- a/src/pomona/scripts/getlangnames.py
+++ b/src/pomona/scripts/getlangnames.py
@@ -2,11 +2,11 @@
 
 import os
 import sys
-sys.path.append("..")
 
-import gettext
+sys.path.append("..")
 import console
 
+import gettext
 _ = lambda x: gettext.ldgettext("pomona", x)
 
 console = console.Console("/etc/sysconfig/console")
diff --git a/src/pomona/tui.py b/src/pomona/tui.py
index 803292056..f9019ce6d 100644
--- a/src/pomona/tui.py
+++ b/src/pomona/tui.py
@@ -7,9 +7,12 @@ import signal
 import time
 import inutil
 import imputil
-from pyfire.translate import _, cat, N_
 from constants import *
 
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
+N_ = lambda x: x
+
 import logging
 log = logging.getLogger("pomona")
 
diff --git a/src/pomona/tui_bootloader.py b/src/pomona/tui_bootloader.py
index e3561b2fb..d41d09c55 100644
--- a/src/pomona/tui_bootloader.py
+++ b/src/pomona/tui_bootloader.py
@@ -13,12 +13,14 @@
 
 from snack import *
 from constants import *
-from pyfire.translate import _
 from flags import flags
 import string
 import inutil
 import bootloader
 
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
+
 class BootloaderChoiceWindow:
     def __call__(self, screen, pomona):
         # XXX need more text here
diff --git a/src/pomona/tui_complete.py b/src/pomona/tui_complete.py
index 3532a0e86..7b100792f 100644
--- a/src/pomona/tui_complete.py
+++ b/src/pomona/tui_complete.py
@@ -13,9 +13,11 @@
 
 from snack import *
 from constants import *
-from pyfire.translate import _
 from constants import *
 
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
+
 class FinishedWindow:
     def __call__ (self, screen, pomona):
         bootstr = ""
diff --git a/src/pomona/tui_confirm.py b/src/pomona/tui_confirm.py
index b5c9b30de..dc27beb64 100644
--- a/src/pomona/tui_confirm.py
+++ b/src/pomona/tui_confirm.py
@@ -14,7 +14,9 @@ import sys
 
 from snack import *
 from constants import *
-from pyfire.translate import _
+
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 class BeginInstallWindow:
     def __call__ (self, screen, pomona):
diff --git a/src/pomona/tui_keyboard.py b/src/pomona/tui_keyboard.py
index 82df2fa9b..ddd05df27 100644
--- a/src/pomona/tui_keyboard.py
+++ b/src/pomona/tui_keyboard.py
@@ -16,7 +16,8 @@ from snack import *
 from constants import *
 from flags import flags
 
-from console import _
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 import logging
 log = logging.getLogger("pomona")
diff --git a/src/pomona/tui_language.py b/src/pomona/tui_language.py
index c71859acf..3b6880f18 100644
--- a/src/pomona/tui_language.py
+++ b/src/pomona/tui_language.py
@@ -14,7 +14,8 @@
 from snack import *
 from constants import *
 
-from console import _
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 import logging
 log = logging.getLogger("pomona")
diff --git a/src/pomona/tui_network.py b/src/pomona/tui_network.py
index 7e3308c36..f543e9464 100644
--- a/src/pomona/tui_network.py
+++ b/src/pomona/tui_network.py
@@ -28,7 +28,8 @@ import socket
 from snack import *
 from constants import *
 
-from pyfire.translate import _
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 import logging
 log = logging.getLogger("pomona")
diff --git a/src/pomona/tui_partition.py b/src/pomona/tui_partition.py
index 32cd938c5..66c986502 100644
--- a/src/pomona/tui_partition.py
+++ b/src/pomona/tui_partition.py
@@ -28,7 +28,8 @@ from autopart import *
 from snack import *
 from constants import *
 
-from pyfire.translate import _
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 import logging
 log = logging.getLogger("pomona")
diff --git a/src/pomona/tui_progress.py b/src/pomona/tui_progress.py
index 2928e3604..c74b909ba 100644
--- a/src/pomona/tui_progress.py
+++ b/src/pomona/tui_progress.py
@@ -12,7 +12,9 @@
 #
 from constants import *
 from snack import *
-from pyfire.translate import _
+
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 import logging
 log = logging.getLogger("pomona")
diff --git a/src/pomona/tui_timezone.py b/src/pomona/tui_timezone.py
index 32fe602ec..54c4a2317 100644
--- a/src/pomona/tui_timezone.py
+++ b/src/pomona/tui_timezone.py
@@ -18,7 +18,9 @@ import os
 from time import *
 from snack import *
 from constants import *
-from pyfire.translate import _
+
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 class TimezoneWindow:
     def getTimezoneList(self):
diff --git a/src/pomona/tui_userauth.py b/src/pomona/tui_userauth.py
index 0b783d69a..772c41288 100644
--- a/src/pomona/tui_userauth.py
+++ b/src/pomona/tui_userauth.py
@@ -13,7 +13,9 @@
 
 from snack import *
 from constants import *
-from pyfire.translate import _
+
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 def has_bad_chars(pw):
     allowed = string.digits + string.ascii_letters + string.punctuation + " "
diff --git a/src/pomona/tui_welcome.py b/src/pomona/tui_welcome.py
index e6e51977f..19c8b2848 100644
--- a/src/pomona/tui_welcome.py
+++ b/src/pomona/tui_welcome.py
@@ -3,7 +3,9 @@ import os
 from snack import *
 
 from constants import *
-from console import _
+
+import gettext
+_ = lambda x: gettext.ldgettext("pomona", x)
 
 class WelcomeWindow:
     def __call__(self, screen, infire):