fix: fix some issues introduced in #162 (#177)

_kosmorro/dumper.py

@@ -433,7 +433,6 @@ class _LatexDumper(Dumper):
         latex = []
 
         for event in self.events:
-            print(event)
             latex.append(
                 r"\event{%s}{%s}"
                 % (event.start_time.strftime(TIME_FORMAT), strings.from_event(event))

_kosmorro/i18n/strings.py

@@ -7,25 +7,13 @@ from kosmorrolib import EventType, MoonPhaseType, ObjectIdentifier, Event
 
 def from_event(event: Event) -> str:
     return {
-        EventType.OPPOSITION: _("%s is in opposition")
-        % (from_object(event.objects[0].identifier)),
-        EventType.CONJUNCTION: _("%s and %s are in conjunction")
-        % (
-            from_object(event.objects[0].identifier),
-            from_object(event.objects[1].identifier),
-        ),
-        EventType.OCCULTATION: _("%s occults %s")
-        % (
-            from_object(event.objects[0].identifier),
-            from_object(event.objects[1].identifier),
-        ),
-        EventType.MAXIMAL_ELONGATION: _("%s's largest elongation")
-        % (from_object(event.objects[0].identifier)),
-        EventType.MOON_PERIGEE: _("%s is at its perigee")
-        % (from_object(event.objects[0].identifier)),
-        EventType.MOON_APOGEE: _("%s is at its apogee")
-        % (from_object(event.objects[0].identifier)),
-    }.get(event.event_type)
+        EventType.OPPOSITION: _("%s is in opposition"),
+        EventType.CONJUNCTION: _("%s and %s are in conjunction"),
+        EventType.OCCULTATION: _("%s occults %s"),
+        EventType.MAXIMAL_ELONGATION: _("%s's largest elongation"),
+        EventType.MOON_PERIGEE: _("%s is at its perigee"),
+        EventType.MOON_APOGEE: _("%s is at its apogee"),
+    }.get(event.event_type) % tuple([from_object(o.identifier) for o in event.objects])
 
 
 def from_moon_phase(moon_phase: MoonPhaseType) -> str:

_kosmorro/locales/messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kosmorro 0.9.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-08 17:53+0200\n"
+"POT-Creation-Date: 2021-05-12 12:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -96,7 +96,7 @@ msgstr ""
 msgid "Expected events"
 msgstr ""
 
-#: _kosmorro/dumper.py:518
+#: _kosmorro/dumper.py:517
 #, python-format
 msgid ""
 "An error occured during the compilation of the PDF.\n"
@@ -108,110 +108,110 @@ msgstr ""
 msgid "The date must be between {minimum_date} and {maximum_date}"
 msgstr ""
 
-#: _kosmorro/main.py:61
+#: _kosmorro/main.py:62
 msgid ""
 "Save the planet and paper!\n"
 "Consider printing you PDF document only if really necessary, and use the "
 "other side of the sheet."
 msgstr ""
 
-#: _kosmorro/main.py:70
+#: _kosmorro/main.py:71
 msgid ""
 "PDF output will not contain the ephemerides, because you didn't provide "
 "the observation coordinate."
 msgstr ""
 
-#: _kosmorro/main.py:115
+#: _kosmorro/main.py:116
 msgid "Could not save the output in \"{path}\": {error}"
 msgstr ""
 
-#: _kosmorro/main.py:129
+#: _kosmorro/main.py:130
 msgid "Selected output format needs an output file (--output)."
 msgstr ""
 
-#: _kosmorro/main.py:157
+#: _kosmorro/main.py:158
 msgid "Moon phase can only be displayed between {min_date} and {max_date}"
 msgstr ""
 
-#: _kosmorro/main.py:194
+#: _kosmorro/main.py:195
 msgid "Running on Python {python_version} with Kosmorrolib v{kosmorrolib_version}"
 msgstr ""
 
-#: _kosmorro/main.py:204
+#: _kosmorro/main.py:205
 msgid "Do you really want to clear Kosmorro's cache? [yN] "
 msgstr ""
 
-#: _kosmorro/main.py:212
+#: _kosmorro/main.py:213
 msgid "Answer did not match expected options, cache not cleared."
 msgstr ""
 
-#: _kosmorro/main.py:222
+#: _kosmorro/main.py:223
 msgid ""
 "Compute the ephemerides and the events for a given date, at a given "
 "position on Earth."
 msgstr ""
 
-#: _kosmorro/main.py:226
+#: _kosmorro/main.py:227
 msgid ""
 "By default, only the events will be computed for today ({date}).\n"
 "To compute also the ephemerides, latitude and longitude arguments are "
 "needed."
 msgstr ""
 
-#: _kosmorro/main.py:240
+#: _kosmorro/main.py:241
 msgid "Show the program version"
 msgstr ""
 
-#: _kosmorro/main.py:248
+#: _kosmorro/main.py:249
 msgid "Delete all the files Kosmorro stored in the cache."
 msgstr ""
 
-#: _kosmorro/main.py:256
+#: _kosmorro/main.py:257
 msgid "The format under which the information have to be output"
 msgstr ""
 
-#: _kosmorro/main.py:263
+#: _kosmorro/main.py:264
 msgid ""
 "The observer's latitude on Earth. Can also be set in the "
 "KOSMORRO_LATITUDE environment variable."
 msgstr ""
 
-#: _kosmorro/main.py:273
+#: _kosmorro/main.py:274
 msgid ""
 "The observer's longitude on Earth. Can also be set in the "
 "KOSMORRO_LONGITUDE environment variable."
 msgstr ""
 
-#: _kosmorro/main.py:283
+#: _kosmorro/main.py:284
 msgid ""
 "The date for which the ephemerides must be computed (in the YYYY-MM-DD "
 "format), or as an interval in the \"[+-]YyMmDd\" format (with Y, M, and D"
 " numbers). Defaults to the current date ({default_date})"
 msgstr ""
 
-#: _kosmorro/main.py:294
+#: _kosmorro/main.py:295
 msgid ""
 "The timezone to display the hours in (e.g. 2 for UTC+2 or -3 for UTC-3). "
 "Can also be set in the KOSMORRO_TIMEZONE environment variable."
 msgstr ""
 
-#: _kosmorro/main.py:303
+#: _kosmorro/main.py:304
 msgid "Disable the colors in the console."
 msgstr ""
 
-#: _kosmorro/main.py:310
+#: _kosmorro/main.py:311
 msgid ""
 "A file to export the output to. If not given, the standard output is "
 "used. This argument is needed for PDF format."
 msgstr ""
 
-#: _kosmorro/main.py:319
+#: _kosmorro/main.py:320
 msgid ""
 "Do not generate a graph to represent the rise and set times in the PDF "
 "format."
 msgstr ""
 
-#: _kosmorro/main.py:327
+#: _kosmorro/main.py:328
 msgid "Show debugging messages"
 msgstr ""
 
@@ -220,108 +220,108 @@ msgstr ""
 msgid "%s is in opposition"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:12
+#: _kosmorro/i18n/strings.py:11
 #, python-format
 msgid "%s and %s are in conjunction"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:17
+#: _kosmorro/i18n/strings.py:12
 #, python-format
 msgid "%s occults %s"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:22
+#: _kosmorro/i18n/strings.py:13
 #, python-format
 msgid "%s's largest elongation"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:24
+#: _kosmorro/i18n/strings.py:14
 #, python-format
 msgid "%s is at its perigee"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:26
+#: _kosmorro/i18n/strings.py:15
 #, python-format
 msgid "%s is at its apogee"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:33
+#: _kosmorro/i18n/strings.py:21
 msgid "New Moon"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:34
+#: _kosmorro/i18n/strings.py:22
 msgid "Waxing Crescent"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:35
+#: _kosmorro/i18n/strings.py:23
 msgid "First Quarter"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:36
+#: _kosmorro/i18n/strings.py:24
 msgid "Waxing Gibbous"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:37
+#: _kosmorro/i18n/strings.py:25
 msgid "Full Moon"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:38
+#: _kosmorro/i18n/strings.py:26
 msgid "Waning Gibbous"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:39
+#: _kosmorro/i18n/strings.py:27
 msgid "Last Quarter"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:40
+#: _kosmorro/i18n/strings.py:28
 msgid "Waning Crescent"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:41
+#: _kosmorro/i18n/strings.py:29
 msgid "Unknown phase"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:46
+#: _kosmorro/i18n/strings.py:34
 msgid "Sun"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:47
+#: _kosmorro/i18n/strings.py:35
 msgid "Moon"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:48
+#: _kosmorro/i18n/strings.py:36
 msgid "Mercury"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:49
+#: _kosmorro/i18n/strings.py:37
 msgid "Venus"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:50
+#: _kosmorro/i18n/strings.py:38
 msgid "Mars"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:51
+#: _kosmorro/i18n/strings.py:39
 msgid "Jupiter"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:52
+#: _kosmorro/i18n/strings.py:40
 msgid "Saturn"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:53
+#: _kosmorro/i18n/strings.py:41
 msgid "Uranus"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:54
+#: _kosmorro/i18n/strings.py:42
 msgid "Neptune"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:55
+#: _kosmorro/i18n/strings.py:43
 msgid "Pluto"
 msgstr ""
 
-#: _kosmorro/i18n/strings.py:56
+#: _kosmorro/i18n/strings.py:44
 msgid "Unknown object"
 msgstr ""
 

_kosmorro/main.py

@@ -23,13 +23,14 @@ import sys
 
 from kosmorrolib import Position, get_ephemerides, get_events, get_moon_phase
 from kosmorrolib.__version__ import __version__ as kosmorrolib_version
+from kosmorrolib.exceptions import OutOfRangeDateError
 from datetime import date
 from termcolor import colored
 
 from . import dumper, environment, debug
 from .date import parse_date
 from .__version__ import __version__ as kosmorro_version
-from .exceptions import UnavailableFeatureError, OutOfRangeDateError
+from .exceptions import UnavailableFeatureError
 from _kosmorro.i18n.utils import _