diff --git a/kosmorro/dumper.py b/kosmorro/dumper.py index 297e7f1..7ee39a3 100644 --- a/kosmorro/dumper.py +++ b/kosmorro/dumper.py @@ -233,11 +233,8 @@ class TextDumper(Dumper): if moon_phase is None: return _("Moon phase is unavailable for this date.") - current_moon_phase = " ".join( - [ - self.style(_("Moon phase:"), "strong"), - strings.from_moon_phase(moon_phase.phase_type), - ] + current_moon_phase = self.style( + strings.from_moon_phase(moon_phase.phase_type), "strong" ) new_moon_phase = _( "{next_moon_phase} on {next_moon_phase_date} at {next_moon_phase_time}" diff --git a/kosmorro/locales/messages.pot b/kosmorro/locales/messages.pot index 8facba1..c211d64 100644 --- a/kosmorro/locales/messages.pot +++ b/kosmorro/locales/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2025-04-15 23:15+0200\n" +"POT-Creation-Date: 2025-04-21 15:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -128,19 +128,19 @@ msgstr "" msgid "Note: All the hours are given in the UTC{offset} timezone." msgstr "" -#: kosmorro/dumper.py:205 kosmorro/dumper.py:336 +#: kosmorro/dumper.py:205 kosmorro/dumper.py:333 msgid "Object" msgstr "" -#: kosmorro/dumper.py:206 kosmorro/dumper.py:337 +#: kosmorro/dumper.py:206 kosmorro/dumper.py:334 msgid "Rise time" msgstr "" -#: kosmorro/dumper.py:207 kosmorro/dumper.py:339 +#: kosmorro/dumper.py:207 kosmorro/dumper.py:336 msgid "Culmination time" msgstr "" -#: kosmorro/dumper.py:208 kosmorro/dumper.py:341 +#: kosmorro/dumper.py:208 kosmorro/dumper.py:338 msgid "Set time" msgstr "" @@ -148,20 +148,16 @@ msgstr "" msgid "Moon phase is unavailable for this date." msgstr "" -#: kosmorro/dumper.py:238 kosmorro/dumper.py:345 -msgid "Moon phase:" -msgstr "" - -#: kosmorro/dumper.py:243 +#: kosmorro/dumper.py:240 #, python-brace-format msgid "{next_moon_phase} on {next_moon_phase_date} at {next_moon_phase_time}" msgstr "" -#: kosmorro/dumper.py:309 +#: kosmorro/dumper.py:306 msgid "Overview of your sky" msgstr "" -#: kosmorro/dumper.py:318 +#: kosmorro/dumper.py:315 #, python-brace-format msgid "" "This document summarizes the ephemerides and the events of {date}. It " @@ -169,21 +165,25 @@ msgid "" "given in {timezone}." msgstr "" -#: kosmorro/dumper.py:328 +#: kosmorro/dumper.py:325 msgid "" "Don't forget to check the weather forecast before you go out with your " "equipment." msgstr "" -#: kosmorro/dumper.py:334 +#: kosmorro/dumper.py:331 msgid "Ephemerides of the day" msgstr "" -#: kosmorro/dumper.py:343 +#: kosmorro/dumper.py:340 msgid "hours" msgstr "" -#: kosmorro/dumper.py:350 +#: kosmorro/dumper.py:342 +msgid "Moon phase:" +msgstr "" + +#: kosmorro/dumper.py:347 msgid "Expected events" msgstr "" diff --git a/tests/dates.py b/tests/dates.py index affee6c..daaa52b 100644 --- a/tests/dates.py +++ b/tests/dates.py @@ -12,7 +12,7 @@ def test_with_date(): result.stdout == """Monday, January 27, 2020 -Moon phase: New Moon +New Moon First Quarter on Sunday, February 2, 2020 at 1:41 AM Expected events: diff --git a/tests/position.py b/tests/position.py index b2137bf..5a81846 100644 --- a/tests/position.py +++ b/tests/position.py @@ -25,7 +25,7 @@ Uranus 10:21 AM 5:25 PM 12:33 AM Neptune 9:01 AM 2:36 PM 8:10 PM Pluto 6:57 AM 11:04 AM 3:11 PM -Moon phase: New Moon +New Moon First Quarter on Sunday, February 2, 2020 at 1:41 AM Expected events: diff --git a/tests/timezone.py b/tests/timezone.py index 47ee0bb..648f182 100644 --- a/tests/timezone.py +++ b/tests/timezone.py @@ -12,7 +12,7 @@ def check_command_return_t_plus_one(result): result.stdout == """Monday, January 27, 2020 -Moon phase: New Moon +New Moon First Quarter on Sunday, February 2, 2020 at 2:41 AM Expected events: @@ -29,7 +29,7 @@ def check_command_return_t_minus_one(result): result.stdout == """Monday, January 27, 2020 -Moon phase: New Moon +New Moon First Quarter on Sunday, February 2, 2020 at 12:41 AM Expected events: diff --git a/tests/utils.py b/tests/utils.py index 4327d0d..96f75e1 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -10,7 +10,7 @@ DEFAULT_ENVIRONMENT = {"PATH": environ["PATH"]} KOSMORRO = ["kosmorro", "--no-color"] CURRENT_MOON_PHASE_PATTERN = re.compile( - r"^Moon phase: (" + r"^(" r"(New Moon)|(Waxing Crescent)|" r"(First Quarter)|(Waxing Gibbous)|" r"(Full Moon)|(Waning Gibbous)|"