Remove UTF8 multiplication and degree symbol macros

- Switch to using prime and double prime for minutes/seconds - Regenerate translations
CelestiaProject · Nov 21, 2024 · ffc07db · ffc07db
1 parent bd70127
commit ffc07db
Show file tree

Hide file tree

Showing 33 changed files with 3,205 additions and 3,223 deletions.
diff --git a/po/ar.po b/po/ar.po
diff --git a/po/be.po b/po/be.po
diff --git a/po/bg.po b/po/bg.po
diff --git a/po/celestia.pot b/po/celestia.pot
diff --git a/po/de.po b/po/de.po
diff --git a/po/el.po b/po/el.po
diff --git a/po/es.po b/po/es.po
diff --git a/po/fr.po b/po/fr.po
diff --git a/po/gl.po b/po/gl.po
diff --git a/po/hu.po b/po/hu.po
diff --git a/po/it.po b/po/it.po
diff --git a/po/ja.po b/po/ja.po
diff --git a/po/ka.po b/po/ka.po
diff --git a/po/ko.po b/po/ko.po
diff --git a/po/lt.po b/po/lt.po
diff --git a/po/lv.po b/po/lv.po
diff --git a/po/nb.po b/po/nb.po
diff --git a/po/nl.po b/po/nl.po
diff --git a/po/pl.po b/po/pl.po
diff --git a/po/pt.po b/po/pt.po
diff --git a/po/pt_BR.po b/po/pt_BR.po
diff --git a/po/ro.po b/po/ro.po
diff --git a/po/ru.po b/po/ru.po
diff --git a/po/sk.po b/po/sk.po
diff --git a/po/sv.po b/po/sv.po
diff --git a/po/tr.po b/po/tr.po
diff --git a/po/uk.po b/po/uk.po
diff --git a/po/zh_CN.po b/po/zh_CN.po
diff --git a/po/zh_TW.po b/po/zh_TW.po
diff --git a/src/celestia/hud.cpp b/src/celestia/hud.cpp
@@ -261,16 +261,16 @@ angleToStr(double angle, const std::locale& loc)
 
     if (degrees > 0)
     {
-        return fmt::format(loc, "{}" UTF8_DEGREE_SIGN "{:02d}' {:.1f}\"",
+        return fmt::format(loc, "{}° {:02d}′ {:.1f}″",
                            degrees, std::abs(minutes), std::abs(seconds));
     }
 
     if (minutes > 0)
     {
-        return fmt::format(loc, "{:02d}' {:.1f}\"", std::abs(minutes), std::abs(seconds));
+        return fmt::format(loc, "{:02d}′ {:.1f}″", std::abs(minutes), std::abs(seconds));
     }
 
-    return fmt::format(loc, "{:.2f}\"", std::abs(seconds));
+    return fmt::format(loc, "{:.2f}″", std::abs(seconds));
 }
 
 void
@@ -295,9 +295,8 @@ displayDeclination(Overlay& overlay, double angle, const std::locale& loc)
     double seconds;
     astro::decimalToDegMinSec(angle, degrees, minutes, seconds);
 
-    overlay.print(loc, _("Dec: {:+d}{} {:02d}' {:.1f}\"\n"),
-                  std::abs(degrees), UTF8_DEGREE_SIGN,
-                  std::abs(minutes), std::abs(seconds));
+    overlay.print(loc, _("Dec: {:+d}° {:02d}′ {:.1f}″\n"),
+                  std::abs(degrees), std::abs(minutes), std::abs(seconds));
 }
 
 void
@@ -608,7 +607,7 @@ displayPlanetInfo(const util::NumberFormatter& formatter,
             sunVec.normalize();
             double cosPhaseAngle = std::clamp(sunVec.dot(viewVec.normalized()), -1.0, 1.0);
             double phaseAngle = acos(cosPhaseAngle);
-            overlay.print(loc, _("Phase angle: {:.1f}{}\n"), math::radToDeg(phaseAngle), UTF8_DEGREE_SIGN);
+            overlay.print(loc, _("Phase angle: {:.1f}°\n"), math::radToDeg(phaseAngle));
         }
     }
 

diff --git a/src/celestia/qt/qtinfopanel.cpp b/src/celestia/qt/qtinfopanel.cpp
@@ -48,8 +48,6 @@ namespace celestia::qt
 namespace
 {
 
-const QString DegreeSign = QString::fromUtf8(UTF8_DEGREE_SIGN);
-
 astro::KeplerElements
 CalculateOsculatingElements(const celestia::ephem::Orbit& orbit,
                             double t,
@@ -319,26 +317,21 @@ void InfoPanel::buildSolarSystemBodyPage(const Body* body,
 
     stream << QString(_("<b>Semi-major axis:</b> %L1 %2")).arg(sma).arg(units) << "<br>\n";
     stream << QString(_("<b>Eccentricity:</b> %L1")).arg(elements.eccentricity) << "<br>\n";
-    stream << QString(_("<b>Inclination:</b> %L1%2")).arg(math::radToDeg(elements.inclination))
-                                                     .arg(DegreeSign) << "<br>\n";
+    stream << QString(_("<b>Inclination:</b> %L1°")).arg(math::radToDeg(elements.inclination)) << "<br>\n";
     stream << QString(_("<b>Pericenter distance:</b> %L1 %2")).arg(sma * (1 - elements.eccentricity)).arg(units) << "<br>\n";
     if (elements.eccentricity < 1.0)
         stream << QString(_("<b>Apocenter distance:</b> %L1 %2")).arg(sma * (1 + elements.eccentricity)).arg(units) << "<br>\n";
 
-    stream << QString(_("<b>Ascending node:</b> %L1%2")).arg(math::radToDeg(elements.longAscendingNode))
-                                                        .arg(DegreeSign) << "<br>\n";
-    stream << QString(_("<b>Argument of periapsis:</b> %L1%2")).arg(math::radToDeg(elements.argPericenter))
-                                                               .arg(DegreeSign) << "<br>\n";
-    stream << QString(_("<b>Mean anomaly:</b> %L1%2")).arg(math::radToDeg(elements.meanAnomaly))
-                                                      .arg(DegreeSign) << "<br>\n";
+    stream << QString(_("<b>Ascending node:</b> %L1°")).arg(math::radToDeg(elements.longAscendingNode)) << "<br>\n";
+    stream << QString(_("<b>Argument of periapsis:</b> %L1°")).arg(math::radToDeg(elements.argPericenter)) << "<br>\n";
+    stream << QString(_("<b>Mean anomaly:</b> %L1°")).arg(math::radToDeg(elements.meanAnomaly)) << "<br>\n";
     if (elements.eccentricity < 1.0)
     {
         stream << QString(_("<b>Period (calculated):</b> %L1 %2")).arg(elements.period).arg(_("days")) << "<br>\n";
     }
     else
     {
-        stream << QString(_("<b>Mean motion (calculated):</b> %L1%2/day")).arg(360.0 / elements.period)
-                                                                          .arg(DegreeSign) << "<br>\n";
+        stream << QString(_("<b>Mean motion (calculated):</b> %L1°/day")).arg(360.0 / elements.period) << "<br>\n";
     }
 }
 
@@ -365,8 +358,7 @@ InfoPanel::buildStarPage(const Star* star, const Universe* universe, double tdb,
 
     int degrees = 0;
     astro::decimalToDegMinSec(math::radToDeg(sph.y()), degrees, minutes, seconds);
-    stream << QString(_("<b>Dec:</b> %L1%2 %L3' %L4\"")).arg(degrees).arg(DegreeSign)
-                                                        .arg(abs(minutes)).arg(abs(seconds)) << "<br>\n";
+    stream << QString(_("<b>Dec:</b> %L1° %L2′ %L3″")).arg(degrees).arg(abs(minutes)).arg(abs(seconds)) << "<br>\n";
 }
 
 
@@ -388,20 +380,17 @@ void InfoPanel::buildDSOPage(const DeepSkyObject* dso,
 
     int degrees = 0;
     astro::decimalToDegMinSec(math::radToDeg(sph.y()), degrees, minutes, seconds);
-    stream << QString(_("<b>Dec:</b> %L1%2 %L3' %L4\"")).arg(degrees).arg(DegreeSign)
-                                                        .arg(abs(minutes)).arg(abs(seconds)) << "<br>\n";
+    stream << QString(_("<b>Dec:</b> %L1° %L2′ %L3″")).arg(degrees).arg(abs(minutes)).arg(abs(seconds)) << "<br>\n";
 
     Eigen::Vector3d galPos = astro::equatorialToGalactic(eqPos);
     sph = rectToSpherical(galPos);
 
     astro::decimalToDegMinSec(math::radToDeg(sph.x()), degrees, minutes, seconds);
     // TRANSLATORS: Galactic longitude
-    stream << QString(_("<b>L:</b> %L1%2 %L3' %L4\"")).arg(degrees).arg(DegreeSign)
-                                                      .arg(abs(minutes)).arg(abs(seconds)) << "<br>\n";
+    stream << QString(_("<b>L:</b> %L1° %L2′ %L3″")).arg(degrees).arg(abs(minutes)).arg(abs(seconds)) << "<br>\n";
     astro::decimalToDegMinSec(math::radToDeg(sph.y()), degrees, minutes, seconds);
     // TRANSLATORS: Galactic latitude
-    stream << QString(_("<b>B:</b> %L1%2 %L3' %L4\"")).arg(degrees).arg(DegreeSign)
-                                                      .arg(abs(minutes)).arg(abs(seconds)) << "<br>\n";
+    stream << QString(_("<b>B:</b> %L1° %L2′ %L3″")).arg(degrees).arg(abs(minutes)).arg(abs(seconds)) << "<br>\n";
 }
 
 

diff --git a/src/celrender/skygridrenderer.cpp b/src/celrender/skygridrenderer.cpp
@@ -18,6 +18,7 @@
 #include <cmath>
 #include <iterator>
 #include <string>
+#include <string_view>
 #include <utility>
 
 #include <Eigen/Geometry>
@@ -32,6 +33,8 @@
 #include <celutil/color.h>
 #include "linerenderer.h"
 
+using namespace std::string_view_literals;
+
 namespace celestia::render
 {
 
@@ -233,15 +236,15 @@ latitudeLabel(int latitude, int latitudeStep)
     if (latitudeStep % DEG == 0)
         return result;
 
-    fmt::format_to(std::back_inserter(result), " {:02}'", (latitude / MIN) % 60);
+    fmt::format_to(std::back_inserter(result), " {:02}′", (latitude / MIN) % 60);
     if (latitudeStep % MIN == 0)
         return result;
 
     fmt::format_to(std::back_inserter(result), " {:02}", (latitude / SEC) % 60);
     if (latitudeStep % SEC != 0)
         fmt::format_to(std::back_inserter(result), ".{:03}", latitude % SEC);
 
-    result.push_back('"');
+    result.append("″"sv);
     return result;
 }
 
@@ -254,17 +257,17 @@ longitudeLabel(int longitude, int longitudeStep,
 {
     int totalUnits = HOUR_MIN_SEC_TOTAL;
     int baseUnit = HR;
-    const char* baseUnitSymbol = "h";
-    char minuteSymbol = 'm';
-    char secondSymbol = 's';
+    std::string_view baseUnitSymbol = "°"sv;
+    std::string_view minuteSymbol = "m"sv;
+    std::string_view secondSymbol = "s"sv;
 
     if (longitudeUnits == engine::SkyGrid::LongitudeDegrees)
     {
         totalUnits = DEG_MIN_SEC_TOTAL * 2;
         baseUnit = DEG;
-        baseUnitSymbol = "°";
-        minuteSymbol = '\'';
-        secondSymbol = '"';
+        baseUnitSymbol = "°"sv;
+        minuteSymbol = "′"sv;
+        secondSymbol = "″"sv;
     }
 
     // Produce a sexigesimal string
@@ -289,7 +292,7 @@ longitudeLabel(int longitude, int longitudeStep,
     if (longitudeStep % SEC != 0)
         fmt::format_to(std::back_inserter(result), ".{:03}", longitude % SEC);
 
-    result.push_back(secondSymbol);
+    result.append(secondSymbol);
     return result;
 }
 

diff --git a/src/celutil/utf8.h b/src/celutil/utf8.h
@@ -15,9 +15,7 @@
 #include <string>
 #include <string_view>
 
-#define UTF8_DEGREE_SIGN         "\302\260"
-#define UTF8_MULTIPLICATION_SIGN "\303\227"
-#define UTF8_REPLACEMENT_CHAR    "\357\277\275"
+#define UTF8_REPLACEMENT_CHAR "\357\277\275"
 
 bool UTF8Decode(std::string_view str, std::int32_t &ch);
 bool UTF8Decode(std::string_view str, std::int32_t &pos, std::int32_t &ch);