From f516c1edfb07c26fcfee7c8c94afb4957cd7ff0a Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Tue, 28 Jan 2025 16:03:41 +1300
Subject: [PATCH] Fix message references for inches and feet

No user-visible effect.
---
 src/commands.c |  2 +-
 src/gfxcore.cc | 12 ++++++------
 src/mainfrm.cc | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/commands.c b/src/commands.c
index 7230683a..636c6162 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -483,7 +483,7 @@ const real factor_tab[] = {
 
 const int units_to_msgno[] = {
     /*m*/424,
-    /*'*/428,
+    /*′*/428,
     -1, /* yards */
     /*°*/344, /* quadrants */
     /*°*/344,
diff --git a/src/gfxcore.cc b/src/gfxcore.cc
index 481e5192..90546141 100644
--- a/src/gfxcore.cc
+++ b/src/gfxcore.cc
@@ -1121,7 +1121,7 @@ void GfxCore::DrawDepthKey()
     }
 
     double z_min = m_Parent->GetDepthMin() + m_Parent->GetOffset().GetZ();
-    wxString units = wmsg(m_Metric ? /*m*/424: /*'*/428);
+    wxString units = wmsg(m_Metric ? /*m*/424: /*′*/428);
     for (int band = 0; band < num_bands; ++band) {
 	double z = z_min;
 	if (band)
@@ -1213,7 +1213,7 @@ void GfxCore::DrawLengthKey()
     // Use fixed colours for each length so it's directly visually comparable
     // between surveys.
     int num_bands = GetNumColourBands();
-    wxString units = wmsg(m_Metric ? /*m*/424: /*'*/428);
+    wxString units = wmsg(m_Metric ? /*m*/424: /*′*/428);
     for (int band = 0; band < num_bands; ++band) {
 	double len = pow(10, LOG_LEN_MAX * band / (num_bands - 1));
 	if (!m_Metric) {
@@ -1391,19 +1391,19 @@ void GfxCore::DrawScaleBar()
 	    }
 	} else if (size_snap >= 1.0) {
 	    /* TRANSLATORS: abbreviation for "feet" (unit of length), used e.g.
-	     * as: 10'
+	     * as: 10′
 	     *
 	     * If there should be a space between the number and this, include
 	     * one in the translation. */
-	    units = /*'*/428;
+	    units = /*′*/428;
 	} else {
 	    size_snap *= 12.0;
 	    /* TRANSLATORS: abbreviation for "inches" (unit of length), used
-	     * e.g. as: 6"
+	     * e.g. as: 6″
 	     *
 	     * If there should be a space between the number and this, include
 	     * one in the translation. */
-	    units = /*\"*/429;
+	    units = /*″*/429;
 	}
     }
     if (size_snap >= 1.0) {
diff --git a/src/mainfrm.cc b/src/mainfrm.cc
index 2613cce2..6713155d 100644
--- a/src/mainfrm.cc
+++ b/src/mainfrm.cc
@@ -1708,7 +1708,7 @@ void MainFrm::SetCoords(const Vector3 &v)
 	x /= METRES_PER_FOOT;
 	y /= METRES_PER_FOOT;
 	z /= METRES_PER_FOOT;
-	units = /*'*/428;
+	units = /*′*/428;
     }
     /* TRANSLATORS: show coordinates (N = North or Northing, E = East or
      * Easting) */
@@ -1768,7 +1768,7 @@ void MainFrm::SetCoords(double x, double y, const LabelInfo * there)
 	    units = /*m*/424;
 	} else {
 	    dh /= METRES_PER_FOOT;
-	    units = /*'*/428;
+	    units = /*′*/428;
 	}
 	/* TRANSLATORS: "H" is short for "Horizontal", "Brg" for "Bearing" (as
 	 * in Compass bearing) */
@@ -1788,7 +1788,7 @@ void MainFrm::SetAltitude(double z, const LabelInfo * there)
 	units = /*m*/424;
     } else {
 	alt /= METRES_PER_FOOT;
-	units = /*'*/428;
+	units = /*′*/428;
     }
     coords_text.Printf(wxT("%s %.2f%s"), wmsg(/*Altitude*/335).c_str(),
 		       alt, wmsg(units).c_str());
@@ -1839,7 +1839,7 @@ void MainFrm::ShowInfo(const LabelInfo *here, const LabelInfo *there)
 	x /= METRES_PER_FOOT;
 	y /= METRES_PER_FOOT;
 	z /= METRES_PER_FOOT;
-	units = /*'*/428;
+	units = /*′*/428;
     }
     s.Printf(wmsg(/*%.2f E, %.2f N*/338), x, y);
     s += wxString::Format(wxT(", %s %.2f%s"), wmsg(/*Altitude*/335).c_str(),
@@ -1872,7 +1872,7 @@ void MainFrm::ShowInfo(const LabelInfo *here, const LabelInfo *there)
 	    d_horiz /= METRES_PER_FOOT;
 	    dr /= METRES_PER_FOOT;
 	    dz /= METRES_PER_FOOT;
-	    units = /*'*/428;
+	    units = /*′*/428;
 	}
 	wxString len_unit = wmsg(units);
 	/* TRANSLATORS: "H" is short for "Horizontal", "V" for "Vertical" */
-- 
2.11.4.GIT