diff --git a/pisi/actionsapi/kde.py b/pisi/actionsapi/kde.py index 88f24a4c..696339f8 100644 --- a/pisi/actionsapi/kde.py +++ b/pisi/actionsapi/kde.py @@ -29,7 +29,7 @@ class ConfigureError(pisi.actionsapi.Error): def __init__(self, Exception): ctx.ui.error(Exception) if can_access_file('config.log'): - ctx.ui.error('\n!!! Please attach the config.log to your bug report:\n%s/config.log' % os.getcwd()) + ctx.ui.error(_('\n!!! Please attach the config.log to your bug report:\n%s/config.log') % os.getcwd()) class MakeError(pisi.actionsapi.Error): def __init__(self, Exception): @@ -57,20 +57,20 @@ def configure(parameters = ''): %s' % (get.kdeDIR(), get.HOST(), get.qtDIR(), get.qtLIBDIR(), parameters) if system(args): - raise ConfigureError('!!! Configure failed...\n') + raise ConfigureError(_('!!! Configure failed...\n')) else: - raise ConfigureError('!!! No configure script found...\n') + raise ConfigureError(_('!!! No configure script found...\n')) def make(parameters = ''): '''make source with given parameters = "all" || "doc" etc.''' if system('make %s' % parameters): - raise MakeError('!!! Make failed...\n') + raise MakeError(_('!!! Make failed...\n')) def install(parameters = 'install'): if can_access_file('Makefile'): args = 'make DESTDIR=%s destdir=%s %s' % (get.installDIR(), get.installDIR(), parameters) if system(args): - raise InstallError('!!! Install failed...\n') + raise InstallError(_('!!! Install failed...\n')) else: - raise InstallError('!!! No Makefile found...\n') + raise InstallError(_('!!! No Makefile found...\n')) diff --git a/pisi/actionsapi/libtools.py b/pisi/actionsapi/libtools.py index e5eb1174..c16d4c8c 100644 --- a/pisi/actionsapi/libtools.py +++ b/pisi/actionsapi/libtools.py @@ -13,6 +13,10 @@ # Standard Python Modules import os +import gettext +__trans = gettext.translation('pisi', fallback=True) +_ = __trans.ugettext + # Pisi-Core Modules import pisi.context as ctx @@ -31,7 +35,7 @@ def preplib(sourceDirectory = '/usr/lib'): sourceDirectory = get.installDIR() + sourceDirectory if can_access_directory(sourceDirectory): if system('/sbin/ldconfig -n -N %s' % sourceDirectory): - raise RunTimeError('!!! Running ldconfig failed...') + raise RunTimeError(_('!!! Running ldconfig failed...')) def preplib_so(sourceDirectory): pass @@ -42,11 +46,11 @@ def gnuconfig_update(): for file in files: if file in ['config.sub', 'config.guess']: copy('/usr/share/gnuconfig/%s' % file, os.path.join(root, file)) - ctx.ui.info('GNU Config Update Finished.') + ctx.ui.info(_('GNU Config Update Finished.')) def libtoolize(parameters = ''): if system('/usr/bin/libtoolize %s' % parameters): - raise RunTimeError('Running libtoolize failed...') + raise RunTimeError(_('Running libtoolize failed...')) def gen_usr_ldscript(dynamicLib): diff --git a/pisi/actionsapi/perlmodules.py b/pisi/actionsapi/perlmodules.py index dff48848..0963d8d9 100644 --- a/pisi/actionsapi/perlmodules.py +++ b/pisi/actionsapi/perlmodules.py @@ -13,6 +13,10 @@ # standard python modules import os +import gettext +__trans = gettext.translation('pisi', fallback=True) +_ = __trans.ugettext + # Pisi Modules import pisi.context as ctx @@ -44,27 +48,27 @@ def configure(parameters = ''): export('PERL_MM_USE_DEFAULT', '1') if can_access_file('Build.PL'): if system('perl Build.PL installdirs=vendor destdir=%s' % get.installDIR()): - raise CompileError, '!!! Configure failed...\n' + raise CompileError, _('!!! Configure failed...\n') else: if system('perl Makefile.PL %s PREFIX=/usr INSTALLDIRS=vendor DESTDIR=%s' % (parameters, get.installDIR())): - raise CompileError, '!!! Configure failed...\n' + raise CompileError, _('!!! Configure failed...\n') def make(parameters = ''): '''make source with given parameters.''' if can_access_file('Makefile'): if system('make %s' % parameters): - raise MakeError, '!!! Make failed...\n' + raise MakeError, _('!!! Make failed...\n') else: if system('perl Build build'): - raise MakeError, '!!! Make failed...\n' + raise MakeError, _('!!! Make failed...\n') def install(parameters = 'install'): '''install source with given parameters.''' if can_access_file('Makefile'): if system('make %s' % parameters): - raise InstallError, '!!! Install failed...\n' + raise InstallError, _('!!! Install failed...\n') else: if system('perl Build install'): - raise MakeError, '!!! Install failed...\n' + raise MakeError, _('!!! Install failed...\n') # FIXME: fix_local_pod % update_pod diff --git a/pisi/actionsapi/pisitools.py b/pisi/actionsapi/pisitools.py index 95db160c..46b83e03 100644 --- a/pisi/actionsapi/pisitools.py +++ b/pisi/actionsapi/pisitools.py @@ -17,6 +17,10 @@ import sys import fileinput import re +import gettext +__trans = gettext.translation('pisi', fallback=True) +_ = __trans.ugettext + # Pisi Modules import pisi.context as ctx @@ -124,7 +128,7 @@ def doman(*sourceFiles): pageName, pageDirectory = source[:source.rindex('.')], \ source[source.rindex('.')+1:] except ValueError: - ctx.ui.error('\n!!! ActionsAPI [doman]: Wrong man page file...') + ctx.ui.error(_('\n!!! ActionsAPI [doman]: Wrong man page file: %s') % (source)) makedirs(manDIR + '/man%s' % pageDirectory) system('install -m0644 %s %s' % (source, manDIR + '/man%s' % pageDirectory)) @@ -162,7 +166,7 @@ def rename(sourceFile, destinationFile): try: os.rename(get.installDIR() + sourceFile, get.installDIR() + baseDir + "/" + destinationFile) except OSError: - ctx.ui.error('\n!!! ActionsAPI [rename]: No such file or directory: "%s"...' % sourceFile) + ctx.ui.error(_('\n!!! ActionsAPI [rename]: No such file or directory: %s') % (sourceFile)) def dopython(): '''FIXME: What the hell is this?''' @@ -181,7 +185,7 @@ def dosed(sourceFile, findPattern, replacePattern = ''): line = re.sub(findPattern, replacePattern, line) sys.stdout.write(line) else: - raise FileError('File doesn\'t exists or permission denied...') + raise FileError(_('File doesn\'t exists or permission denied: %s') % sourceFile) def dosbin(sourceFile, destinationDirectory = '/usr/sbin'): '''insert a executable file into /sbin or /usr/sbin''' @@ -198,7 +202,7 @@ def dosym(sourceFile, destinationFile): try: os.symlink(sourceFile, get.installDIR() + destinationFile) except OSError: - ctx.ui.error('\n!!! ActionsAPI [dosym]: File exists...') + ctx.ui.error(_('\n!!! ActionsAPI [dosym]: File exists: %s') % (sourceFile)) def insinto(destinationDirectory, sourceFile, destinationFile = ''): '''insert a sourceFile into destinationDirectory as a destinationFile with same uid/guid/permissions''' diff --git a/pisi/actionsapi/pisitoolsfunctions.py b/pisi/actionsapi/pisitoolsfunctions.py index e13cb278..8051a6bd 100644 --- a/pisi/actionsapi/pisitoolsfunctions.py +++ b/pisi/actionsapi/pisitoolsfunctions.py @@ -16,6 +16,10 @@ import os import glob +import gettext +__trans = gettext.translation('pisi', fallback=True) +_ = __trans.ugettext + # Pisi Modules import pisi.context as ctx @@ -39,7 +43,7 @@ def executable_insinto(destinationDirectory, *sourceFiles): '''insert a executable file into destinationDirectory''' if not sourceFiles or not destinationDirectory: - raise ArgumentError('Insufficient arguments...') + raise ArgumentError(_('Insufficient arguments...')) if not can_access_directory(destinationDirectory): makedirs(destinationDirectory) @@ -52,7 +56,7 @@ def readable_insinto(destinationDirectory, *sourceFiles): '''inserts file list into destinationDirectory''' if not sourceFiles or not destinationDirectory: - raise ArgumentError('Insufficient arguments...') + raise ArgumentError(_('Insufficient arguments...')) if not can_access_directory(destinationDirectory): makedirs(destinationDirectory) @@ -65,7 +69,7 @@ def lib_insinto(sourceFile, destinationDirectory, permission = 0644): '''inserts a library fileinto destinationDirectory with given permission''' if not sourceFile or not destinationDirectory: - raise ArgumentError('Insufficient arguments...') + raise ArgumentError(_(' Insufficient arguments...')) if not can_access_directory(destinationDirectory): makedirs(destinationDirectory) diff --git a/pisi/actionsapi/pythonmodules.py b/pisi/actionsapi/pythonmodules.py index 8a8268ba..b7decb85 100644 --- a/pisi/actionsapi/pythonmodules.py +++ b/pisi/actionsapi/pythonmodules.py @@ -13,6 +13,10 @@ # standard python modules import os +import gettext +__trans = gettext.translation('pisi', fallback=True) +_ = __trans.ugettext + # Pisi Modules import pisi.context as ctx @@ -43,12 +47,12 @@ class RunTimeError(pisi.actionsapi.Error): def compile(parameters = ''): '''compile source with given parameters.''' if system('python setup.py build %s' % (get.installDIR(), parameters)): - raise CompileError, '!!! Make failed...\n' + raise CompileError, _('!!! Make failed...\n') def install(parameters = ''): '''does python setup.py install''' if system('python setup.py install --root=%s --no-compile %s' % (get.installDIR(), parameters)): - raise InstallError, '!!! Install failed...\n' + raise InstallError, _('!!! Install failed...\n') DDOCS = 'CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS PKG-INFO \ CONTRIBUTORS LICENSE COPYING* Change* MANIFEST* README*' @@ -60,4 +64,4 @@ def install(parameters = ''): def run(parameters = ''): '''executes parameters with python''' if system('python %s' % (parameters)): - raise RunTimeError, '!!! Running %s failed...\n' % parameters + raise RunTimeError, _('!!! Running %s failed...\n') % parameters diff --git a/pisi/actionsapi/scons.py b/pisi/actionsapi/scons.py index b40843e2..6d6d0803 100644 --- a/pisi/actionsapi/scons.py +++ b/pisi/actionsapi/scons.py @@ -14,6 +14,10 @@ # Pisi Modules import pisi.context as ctx +import gettext +__trans = gettext.translation('pisi', fallback=True) +_ = __trans.ugettext + # ActionsAPI Modules import pisi.actionsapi import pisi.actionsapi.get as get @@ -34,8 +38,8 @@ class InstallError(pisi.actionsapi.Error): def make(parameters = ''): if system("scons %s" % parameters): - raise MakeError('!!! Make failed...\n') + raise MakeError(_('!!! Make failed...\n')) def install(parameters = 'install'): if system("scons prefix=%s/%s %s" % (get.installDIR(), get.defaultprefixDIR(), parameters)): - raise InstallError('!!! Install failed...\n') + raise InstallError(_('!!! Install failed...\n'))