Update radius display and re-generate translations

- For spheres, just display radius (same as previously) - For spheroids, display equatorial and polar radii - For ellipsoids, display triaxial dimensions
CelestiaProject · Nov 18, 2024 · d640353 · d640353
1 parent 161f0b8
commit d640353
Show file tree

Hide file tree

Showing 30 changed files with 26,070 additions and 18,281 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
@@ -459,7 +459,7 @@ displayStarInfo(const util::NumberFormatter& formatter,
 
             if (float solarRadii = star.getRadius() / 6.96e5f; solarRadii > 0.01f)
             {
-                overlay.print(_("Radius: {} Rsun  ({})\n"),
+                overlay.print(_("Radius: {} Rsun ({})\n"),
                               formatter.format(star.getRadius() / 696000.0f, 2, SigDigitNum),
                               DistanceKmToStr(formatter, star.getRadius(), 3, hudSettings.measurementSystem));
             }
@@ -537,23 +537,32 @@ displayPlanetInfo(const util::NumberFormatter& formatter,
     {
         return;
     }
-    else if (body.isEllipsoid() && !body.isSphere()) // show mean radius along with triaxial semi-axes
+    else if (body.isEllipsoid()) // show mean radius along with triaxial semi-axes
     {
         Eigen::Vector3f semiAxes = body.getSemiAxes();
-        double radiusMean = cbrt(semiAxes.prod());
-        double axis0 = semiAxes.x();
-        double axis1 = semiAxes.z();
-        double axis2 = semiAxes.y(); // polar semi-axis
-        overlay.print(_("Radius: {} ({} " UTF8_MULTIPLICATION_SIGN " {} " UTF8_MULTIPLICATION_SIGN " {})\n"),
-                      DistanceKmToStr(formatter, radiusMean, 5, hudSettings.measurementSystem),
-                      DistanceKmToStr(formatter, axis0, 5, hudSettings.measurementSystem),
-                      DistanceKmToStr(formatter, axis1, 5, hudSettings.measurementSystem),
-                      DistanceKmToStr(formatter, axis2, 5, hudSettings.measurementSystem));
+        if (semiAxes.x() == semiAxes.z())
+        {
+            if (semiAxes.x() == semiAxes.y())
+            {
+                overlay.print(_("Radius: {}\n"), DistanceKmToStr(formatter, body.getRadius(), 5, hudSettings.measurementSystem));
+            }
+            else
+            {
+                overlay.print(_("Equatorial radius: {}\n"), DistanceKmToStr(formatter, semiAxes.x(), 5, hudSettings.measurementSystem));
+                overlay.print(_("Polar radius: {}\n"), DistanceKmToStr(formatter, semiAxes.y(), 5, hudSettings.measurementSystem));
+            }
+        }
+        else
+        {
+            overlay.print(_("Radii: {} × {} × {}\n"),
+                          DistanceKmToStr(formatter, semiAxes.x(), 5, hudSettings.measurementSystem),
+                          DistanceKmToStr(formatter, semiAxes.z(), 5, hudSettings.measurementSystem),
+                          DistanceKmToStr(formatter, semiAxes.y(), 5, hudSettings.measurementSystem));
+        }
     }
     else
     {
-        overlay.print(_("Radius: {}\n"),
-                      DistanceKmToStr(formatter, body.getRadius(), 5, hudSettings.measurementSystem));
+        overlay.print(_("Radius: {}\n"), DistanceKmToStr(formatter, body.getRadius(), 5, hudSettings.measurementSystem));
     }
 
     displayApparentDiameter(overlay, body.getRadius(), distanceKm, loc);