Changed tranation from own to gettext module.

diff --git a/src/pomona/Makefile b/src/pomona/Makefile
index 408c58207c56e405b5dcf04ebd7dc1ee4b8a956a..2a89b233a9c1d1a7203f05487902d64c078c4848 100644 (file)
--- 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 b8dcdd63f7d566f1f357220e4802bb99f6e1654e..40a1f0f8133a5136af9b81063d051f69d025a47b 100644 (file)
--- 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 7afe5424f4a3afc9f9c0f3bd7bdf0ec81b332109..bb3f810d90dfce85854912a87fdda476a0023b22 100644 (file)
--- 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 51970d53da866d82ba9b5cad59864a9db667c822..142f2f225a01dc29b4878b5d7203b789854f8771 100644 (file)
--- 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 d5802206559bce61a579292b0fcf836348acb3b2..ed0bc59fde76974310fb8895c96b26a3681243d3 100644 (file)
--- 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 0710d65792091866d467ad63473de73436169557..3fded0188d26a5a6020b4ce72a7f1ebadaf0c053 100644 (file)
--- 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 ad45525bfc921e43e5a90390a3c243c9d088e847..3a018a8b8004576d40d3d02e063cd7475aff2d77 100644 (file)
--- 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 0e2c2577b3d0c6e6e4ebf67662bfb6aba9990c3b..2219227311bc2c02cf05022b7d94a230c86457ba 100644 (file)
--- 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 35d189d7d42751dfd8fe17f725244d8c231fe9a5..76c0e416a33091176413af2ed81f8628ff973838 100644 (file)
--- 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 3a9ff0fd008844243e43333de73813117f9de015..5f5cce14aef39c3196e393ed3b30d1a4869f8d4a 100644 (file)
--- 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 8865c5384a4cb88158ce8628b8db89a39f253390..97fd52c77381e08414435837ec288f8360b2787d 100644 (file)
--- 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 8d02dd60cfe99367a42d163fe95a24b44568c1fa..f300ace1a629bf61a53eb0f1e67b171628a05ac3 100644 (file)
--- 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 fd0d06971f31b0f343c0b14e7c3f709fc07135fe..80d6ded09dab916ed7a2576eebf8a75a94aac0b0 100644 (file)
--- 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 cf049f7f0955f3c9737ed452d0d31cdea47e530c..437e9ec4751a496781b043f7d1e1a89d6b98b581 100644 (file)
--- 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 4d5ee16527b1bc53788a8edbd31e3c0940ad6867..c1f142ce27417feecced603d57cb9e81c0317bd1 100644 (file)
--- 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 a991c3bd219a80c7df9b9b4ce32afd01cc74473a..5c730071fb34edc0a59f27c7432dc731c911fbf8 100644 (file)
--- 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 939345d9d981a91aecb5ea9e05c5cc0c11a4776d..3a822790ad2329331d6d82dfb91963ef973f6069 100644 (file)
--- 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 (file)
new mode 100755 (executable)
index 011d8c2..865245e
--- 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 803292056b6dfcea4d3dd999290ed6dd4126ddc5..f9019ce6d7b3cde45f42dccd4f4943b5d5f8f738 100644 (file)
--- 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 e3561b2fb38d1823ce28e2e798256a501b570022..d41d09c55c534e7a8becc90d98a9d2ae04c77860 100644 (file)
--- 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 3532a0e867f370d624d0f5eaedf42ddc42473fd3..7b100792fc1614de43be5694601e1850d4102be0 100644 (file)
--- 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 b5c9b30de1d26d59db6c8cb69d48595ae8998b6b..dc27beb641a6affdb8f8fc05b41a3801b59f4d4e 100644 (file)
--- 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 82df2fa9be2b7f534c7acaa4642ad3e7992f6c1a..ddd05df27616404c0709b16b256b9afbc354054b 100644 (file)
--- 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 c71859acf8d8ce4a63ad4b2ab6243237987d20ff..3b6880f18fb7a784fd7bc178027bedf9b760abcb 100644 (file)
--- 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 7e3308c36186b26f0df791f662e1e2ff171e9d92..f543e9464e2601f7b221db703ca7259baa9fa2dd 100644 (file)
--- 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 32cd938c5bcd3c09fcfeb32dd2c9d0a465941bcf..66c986502e97129d0e7c1de43dd87cd3bc5382b2 100644 (file)
--- 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 2928e3604753b231c4da6d553bf78f2132669858..c74b909ba1c225bed251090e74ff07b49f2d4fa5 100644 (file)
--- 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 32fe602ecbf11598f4c730e31146d986b63595ca..54c4a231794400b8bdd672129c2d98ff8623ddd1 100644 (file)
--- 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 0b783d69a0b2940933adc0518fe18768a9c7231b..772c41288e8b9efa22a5eaa9d03cafc16c0cadc9 100644 (file)
--- 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 e6e51977f5fdc2a471c5733c9594b164796f377f..19c8b28488312c37ee5a75875f38ea88e17c4c55 100644 (file)
--- 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):