Merge pull request #4352 from osmandapp/fix_custom_map_poi_translating

alex-osm · web-flow · commit a48891356fd7 · 2025-02-04T17:16:56.000+03:00
fix_custom_map_poi_translating
diff --git a/Sources/Controllers/TargetMenu/POI/OAPOIViewController.mm b/Sources/Controllers/TargetMenu/POI/OAPOIViewController.mm
@@ -589,18 +589,14 @@ - (void) buildRows:(NSMutableArray<OARowInfo *> *)rows
                 }
                 [list addObject:poiType];
             }
-            else if ([convertedKey hasPrefix:US_MAPS_RECREATION_AREA])
+            else
             {
-                NSString *translatedUsMapsKey = [_poiHelper getTranslation:convertedKey];
-                if (translatedUsMapsKey.length > 0)
-                    textPrefix = translatedUsMapsKey;
+                NSString *translatedKey = [_poiHelper getTranslation:convertedKey];
+                if (translatedKey.length > 0)
+                    textPrefix = translatedKey;
                 else
                     textPrefix = [OAUtilities capitalizeFirstLetter:convertedKey];
             }
-            else
-            {
-                textPrefix = convertedKey.capitalizedString;
-            }
         }
 
         NSArray<NSString *> *formattedPrefixAndText = [self getFormattedPrefixAndText:convertedKey prefix:textPrefix value:vl amenity:self.poi];

Original file line number	Diff line number	Diff line change
`@@ -589,18 +589,14 @@ - (void) buildRows:(NSMutableArray<OARowInfo > )rows`
`589`	`589`	`}`
`590`	`590`	`[list addObject:poiType];`
`591`	`591`	`}`
`592`		`- else if ([convertedKey hasPrefix:US_MAPS_RECREATION_AREA])`
	`592`	`+ else`
`593`	`593`	`{`
`594`		`- NSString *translatedUsMapsKey = [_poiHelper getTranslation:convertedKey];`
`595`		`- if (translatedUsMapsKey.length > 0)`
`596`		`- textPrefix = translatedUsMapsKey;`
	`594`	`+ NSString *translatedKey = [_poiHelper getTranslation:convertedKey];`
	`595`	`+ if (translatedKey.length > 0)`
	`596`	`+ textPrefix = translatedKey;`
`597`	`597`	`else`
`598`	`598`	`textPrefix = [OAUtilities capitalizeFirstLetter:convertedKey];`
`599`	`599`	`}`
`600`		`- else`
`601`		`- {`
`602`		`- textPrefix = convertedKey.capitalizedString;`
`603`		`- }`
`604`	`600`	`}`
`605`	`601`
`606`	`602`	`NSArray<NSString > formattedPrefixAndText = [self getFormattedPrefixAndText:convertedKey prefix:textPrefix value:vl amenity:self.poi];`