From 9311c246f79b13dd704a191139e621b41be1106a Mon Sep 17 00:00:00 2001 From: Leonetienne Date: Sat, 19 Mar 2022 15:03:06 +0100 Subject: [PATCH] If minutes are 0, o' clock is printed instead --- main.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/main.cpp b/main.cpp index b1199b1..04b15b5 100644 --- a/main.cpp +++ b/main.cpp @@ -68,13 +68,17 @@ static const std::vector daynths = { }; int main() { - const std::string weekday = Eval("date +'\%A'"); - const std::string month = Eval("date +'\%B'"); - const std::string year = spell(std::stoi(Eval("date +'\%Y'"))); - const std::string day = daynths[std::stoi(Eval("date +'\%d'")) - 1]; - const std::string hour = spell(std::stoi(Eval("date +'\%H'"))); - const std::string minute = spell(std::stoi(Eval("date +'\%M'"))); - const std::string seconds = spell(std::stoi(Eval("date +'\%S'"))); + std::string weekday = Eval("date +'\%A'"); + std::string month = Eval("date +'\%B'"); + std::string year = spell(std::stoi(Eval("date +'\%Y'"))); + std::string day = daynths[std::stoi(Eval("date +'\%d'")) - 1]; + std::string hour = spell(std::stoi(Eval("date +'\%H'"))); + std::string minute = spell(std::stoi(Eval("date +'\%M'"))); + std::string seconds = spell(std::stoi(Eval("date +'\%S'"))); + + // Fix minutes being 0 + if (minute == "zero") + minute = "o' clock"; std::stringstream ss; ss << "It is "