.

1 files changed, 17 insertions, 9 deletions

diff --git a/SugarMoonActivity.py b/SugarMoonActivity.py
index 4f9210a..6637606 100644
--- a/SugarMoonActivity.py
+++ b/SugarMoonActivity.py
@@ -268,18 +268,26 @@ class MoonActivity(activity.Activity):
 		self.luna_hoy.data_model.update_moon_calculations(ahora)
 
 		information = ""
-		information += _("Today's Moon Information\n\n")
+		information += "%s:\n\n" % (_("Today's Moon Information"))
 		information += "%s\n\n" % (MG.get_date_time())
-		information += _("Phase:\n%s\n\n") % (self.luna_hoy.data_model.moon_phase_name(self.luna_hoy.data_model.phase_of_moon))
-		information += _("Julian Date:\n%.2f (astronomical)\n\n") % (self.luna_hoy.data_model.julian_date)
+		information += "%s:\n%s\n\n" % (_("Phase"), self.luna_hoy.data_model.moon_phase_name(self.luna_hoy.data_model.phase_of_moon))
+		information += "%s:\n%.2f (%s)\n\n" % (_("Julian Date"), self.luna_hoy.data_model.julian_date, _("astronomical"))
 
-		tiempo = {'days':self.luna_hoy.data_model.days_old,
-		'hours':self.luna_hoy.data_model.hours_old, 'minutes':self.luna_hoy.data_model.minutes_old}
-		information += _("Age:\n%(days).0f days, %(hours).0f hours, %(minutes).0f minutes\n\n") % tiempo
+		information += "%s:\n" % (_("Age"))
+		dias = self.luna_hoy.data_model.days_old
+		horas = self.luna_hoy.data_model.hours_old
+		minutos = self.luna_hoy.data_model.minutes_old
+		information += "%i %s, %i %s, %i %s.\n\n" % (dias, _("days"), horas, _("hours"), minutos, _("minutes"))
 
-		lunacion = {'phase':self.luna_hoy.data_model.phase_of_moon * 100, 'lunation':self.luna_hoy.data_model.lunation}
-		information += _("Lunation:\n%(phase).2f%% through lunation %(lunation)d\n\n") % lunacion
-		information += _("Surface Visibility:\n%.0f%% (estimated)\n\n") % (self.luna_hoy.data_model.percent_of_full_moon * 100)
+		phase = self.luna_hoy.data_model.phase_of_moon * 100
+		lunation = self.luna_hoy.data_model.lunation
+		information += "%s:\n" % (_("Lunation"))
+		information += "%.2f%s %s %d.\n\n" % (phase, "%", _("through lunation"), lunation)
+
+		information += "%s:\n" % (_("Surface Visibility"))
+		information += "%.0f%s (%s)\n\n" % (self.luna_hoy.data_model.percent_of_full_moon * 100, "%", _("estimated"))
+
+		#information += _("Surface Visibility:\n%.0f%% (estimated)\n\n") % (self.luna_hoy.data_model.percent_of_full_moon * 100)
 
 		selen = {'deg':self.luna_hoy.data_model.selenographic_deg, 'westOrEast':self.luna_hoy.data_model.west_or_east,
 		'riseOrSet':self.luna_hoy.data_model.rise_or_set}