Prepare 41 messages to localization.

svn path=/main/trunk/; revision=13733

6 files changed, 29 insertions, 22 deletions

diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py
index 5e8b11c8b..ad1ee805f 100644
--- a/pym/portage/elog/__init__.py
+++ b/pym/portage/elog/__init__.py
@@ -13,6 +13,7 @@ from portage.exception import PortageException
 from portage.process import atexit_register
 from portage.elog.messages import collect_ebuild_messages, collect_messages
 from portage.elog.filtering import filter_loglevels
+from portage.localization import _
 
 import os
 
@@ -157,8 +158,8 @@ def elog_process(cpv, mysettings, phasefilter=None):
 					_elog_atexit_handlers.append(m.finalize)
 					atexit_register(m.finalize)
 			except (ImportError, AttributeError), e:
-				writemsg("!!! Error while importing logging modules " + \
-					"while loading \"mod_%s\":\n" % str(s))
+				writemsg(_("!!! Error while importing logging modules "
+					"while loading \"mod_%s\":\n") % str(s))
 				writemsg("%s\n" % str(e), noiselevel=-1)
 			except PortageException, e:
 				writemsg("%s\n" % str(e), noiselevel=-1)
diff --git a/pym/portage/elog/messages.py b/pym/portage/elog/messages.py
index 4fa73ba5f..9832f2660 100644
--- a/pym/portage/elog/messages.py
+++ b/pym/portage/elog/messages.py
@@ -10,6 +10,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
 )
 
 from portage.const import EBUILD_PHASES
+from portage.localization import _
 
 import os
 import sys
@@ -32,7 +33,7 @@ def collect_ebuild_messages(path):
 	for msgfunction in mylogfiles:
 		filename = os.path.join(path, msgfunction)
 		if msgfunction not in EBUILD_PHASES:
-			writemsg("!!! can't process invalid log file: %s\n" % filename,
+			writemsg(_("!!! can't process invalid log file: %s\n") % filename,
 				noiselevel=-1)
 			continue
 		if not msgfunction in logentries:
@@ -45,8 +46,8 @@ def collect_ebuild_messages(path):
 			try:
 				msgtype, msg = l.split(" ", 1)
 			except ValueError:
-				writemsg("!!! malformed entry in " + \
-					"log file: '%s'\n" % filename, noiselevel=-1)
+				writemsg(_("!!! malformed entry in "
+					"log file: '%s'\n") % filename, noiselevel=-1)
 				continue
 
 			if lastmsgtype is None:
diff --git a/pym/portage/elog/mod_echo.py b/pym/portage/elog/mod_echo.py
index 30d88f005..fa6577dc6 100644
--- a/pym/portage/elog/mod_echo.py
+++ b/pym/portage/elog/mod_echo.py
@@ -5,6 +5,7 @@
 
 from portage.output import EOutput, colorize
 from portage.const import EBUILD_PHASES
+from portage.localization import _
 
 _items = []
 def process(mysettings, key, logentries, fulltext):
@@ -18,12 +19,13 @@ def finalize(mysettings=None):
 	global _items
 	printer = EOutput()
 	for mysettings, key, logentries in _items:
-		root_msg = ""
-		if mysettings["ROOT"] != "/":
-			root_msg = " merged to %s" % mysettings["ROOT"]
 		print
-		printer.einfo("Messages for package %s%s:" % \
-			(colorize("INFORM", key), root_msg))
+		if mysettings["ROOT"] == "/":
+			printer.einfo(_("Messages for package %s:") %
+				colorize("INFORM", key))
+		else:
+			printer.einfo(_("Messages for package %(pkg)s merged to %(root)s:") %
+				{"pkg": colorize("INFORM", key), "root": mysettings["ROOT"]})
 		print
 		for phase in EBUILD_PHASES:
 			if phase not in logentries:
diff --git a/pym/portage/elog/mod_mail.py b/pym/portage/elog/mod_mail.py
index d6383a4eb..841986b96 100644
--- a/pym/portage/elog/mod_mail.py
+++ b/pym/portage/elog/mod_mail.py
@@ -5,6 +5,7 @@
 
 import portage.mail, socket
 from portage.exception import PortageException
+from portage.localization import _
 from portage.util import writemsg
 
 def process(mysettings, key, logentries, fulltext):
@@ -20,17 +21,17 @@ def process(mysettings, key, logentries, fulltext):
 	mysubject = mysubject.replace("${HOST}", socket.getfqdn())
 
 	# look at the phases listed in our logentries to figure out what action was performed
-	action = "merged"
+	action = _("merged")
 	for phase in logentries.keys():
 		# if we found a *rm phase assume that the package was unmerged
 		if phase in ["postrm", "prerm"]:
-			action = "unmerged"
+			action = _("unmerged")
 	# if we think that the package was unmerged, make sure there was no unexpected
 	# phase recorded to avoid misinformation
-	if action == "unmerged":
+	if action == _("unmerged"):
 		for phase in logentries.keys():
 			if phase not in ["postrm", "prerm", "other"]:
-				action = "unknown"
+				action = _("unknown")
 
 	mysubject = mysubject.replace("${ACTION}", action)
 
diff --git a/pym/portage/elog/mod_mail_summary.py b/pym/portage/elog/mod_mail_summary.py
index ed5147313..90a6ed2f8 100644
--- a/pym/portage/elog/mod_mail_summary.py
+++ b/pym/portage/elog/mod_mail_summary.py
@@ -5,14 +5,15 @@
 
 import portage.mail, socket, os, time
 from portage.exception import PortageException
+from portage.localization import _
 from portage.util import writemsg
 from email.MIMEText import MIMEText as TextMessage
 
 _items = {}
 def process(mysettings, key, logentries, fulltext):
 	global _items
-	header = ">>> Messages generated for package %s by process %d on %s:\n\n" % \
-		(key, os.getpid(), time.strftime("%Y%m%d-%H%M%S %Z", time.localtime(time.time())))
+	header = _(">>> Messages generated for package %(pkg)s by process %(pid)d on %(time)s:\n\n") % \
+		{"pkg": key, "pid": os.getpid(), "time": time.strftime("%Y%m%d-%H%M%S %Z", time.localtime(time.time()))}
 	config_root = mysettings["PORTAGE_CONFIGROOT"]
 	mysettings, items = _items.setdefault(config_root, (mysettings, {}))
 	items[key] = header + fulltext
@@ -30,9 +31,9 @@ def _finalize(mysettings, items):
 	if len(items) == 0:
 		return
 	elif len(items) == 1:
-		count = "one package"
+		count = _("one package")
 	else:
-		count = "multiple packages"
+		count = _("multiple packages")
 	if "PORTAGE_ELOG_MAILURI" in mysettings:
 		myrecipient = mysettings["PORTAGE_ELOG_MAILURI"].split()[0]
 	else:
@@ -44,8 +45,8 @@ def _finalize(mysettings, items):
 	mysubject = mysubject.replace("${PACKAGE}", count)
 	mysubject = mysubject.replace("${HOST}", socket.getfqdn())
 
-	mybody = "elog messages for the following packages generated by " + \
-		"process %d on host %s:\n" % (os.getpid(), socket.getfqdn())
+	mybody = _("elog messages for the following packages generated by "
+		"process %(pid)d on host %(host)s:\n") % {"pid": os.getpid(), "host": socket.getfqdn()}
 	for key in items:
 		 mybody += "- %s\n" % key
 
diff --git a/pym/portage/elog/mod_save_summary.py b/pym/portage/elog/mod_save_summary.py
index 3a062dd12..0e12ac451 100644
--- a/pym/portage/elog/mod_save_summary.py
+++ b/pym/portage/elog/mod_save_summary.py
@@ -5,6 +5,7 @@
 
 import os, time
 from portage.data import portage_uid, portage_gid
+from portage.localization import _
 from portage.util import ensure_dirs, apply_permissions
 
 def process(mysettings, key, logentries, fulltext):
@@ -18,8 +19,8 @@ def process(mysettings, key, logentries, fulltext):
 	elogfilename = elogdir+"/summary.log"
 	elogfile = open(elogfilename, "a")
 	apply_permissions(elogfilename, mode=060, mask=0)
-	elogfile.write(">>> Messages generated by process %d on %s for package %s:\n\n" % \
-			(os.getpid(), time.strftime("%Y-%m-%d %H:%M:%S %Z", time.localtime(time.time())), key))
+	elogfile.write(_(">>> Messages generated by process %(pid)d on %(time)s for package %(pkg)s:\n\n") %
+			{"pid": os.getpid(), "time": time.strftime("%Y-%m-%d %H:%M:%S %Z", time.localtime(time.time())), "pkg": key})
 	elogfile.write(fulltext)
 	elogfile.write("\n")
 	elogfile.close()