[PATCH] `PresetListEntry` should use `trc` instead of `tr` for `display_value`

[taylor.smock]

The originating problem comes from comment:8:ticket:22588 (Hufkratzer):

I have tested this in the latest available build 18645 and found that in the preset for sport=equestrian the string "Horse Riding Arena" isn't translated, although there have been translations entered in launchpad.
[...snip...]

From comment:15:ticket:22588 (taylor.smock):

I've done a bit of debugging.
It looks like we are mapping _:riding\nHorse Riding Arena to Cancha para equitación during i18n load.

The call tree for tr starts in PresetListEntry#getDisplayValue. I think the problem here is that we are calling tr(display_value) instead of trc(cms == null ? null : cms.values_context, display_value). The latter gives us the expected translation of Cancha para equitación while the former just returns Horse Riding Arena.

A patch for that is relatively trivial, but I don't know what the fallout would be (are there some values that depend upon the context not being set?).

src/org/openstreetmap/josm/gui/tagging/presets/items/PresetListEntry.java

@@ -130 +130 @@
                 cachedDisplayValue = Utils.firstNonNull(value, " ");
             } else {
                 cachedDisplayValue = Utils.firstNonNull(
-                    locale_display_value, tr(display_value), trc(cms == null ? null : cms.values_context, value), " ");
+                    locale_display_value, trc(cms == null ? null : cms.values_context, display_value),
+                        trc(cms == null ? null : cms.values_context, value), " ");
             }
         }
         return cachedDisplayValue;

The entries in the preset leisure list have other translation locations, as follows:

• Horse Riding Arena: None (not translated elsewhere)
• Horse Riding Centre: source:trunk/resources/data/defaultpresets.xml#L4065​
• Sports Centre: source:trunk/resources/data/defaultpresets.xml#L5162​
• Stadium: source:trunk/resources/data/defaultpresets.xml#L5154​
• Racetrack: source:trunk/resources/data/defaultpresets.xml#L5189​

This is probably why they all have translations -- the gettext code doesn't need the context for them, since they have been translated without context.

[stoecker]

That's clearly simply a bug. If values_context is given, it should also be used for display value otherwise it translates the wrong string. We have no different context for values and display values. That's also how the i18n-extractor sees this.

[taylor.smock]

Yes, it is clearly a bug.

I was planning on applying a patch for this early in the 23.02 cycle (as in this Thursday/Friday). I do think that the fix could be done right now, but I had been planning on doing the 23.01 release today, and I have been trying to not do any non-essential (AKA "JOSM is crashing") fixes for at least 3 days prior to and after the release day.

[taylor.smock]

In 18648/josm:

Fix #22693: PresetListEntry should use trc instead of tr for display_value

[skyper]

As the translation of display_value is fixed proper sorting might be the next target, see #22001.