Merge branch 'master' into jgrpp
# Conflicts: # src/airport_gui.cpp # src/build_vehicle_gui.cpp # src/direction_type.h # src/gfx_type.h # src/group_gui.cpp # src/misc_gui.cpp # src/rail_gui.cpp # src/road_gui.cpp # src/signs_gui.cpp # src/slope_func.h # src/smallmap_gui.cpp # src/terraform_gui.cpp # src/toolbar_gui.cpp # src/town_gui.cpp # src/town_type.h # src/vehicle_type.h # src/widget_type.h
This commit is contained in:
@@ -497,7 +497,7 @@ static void MakeFinnishTownName(StringBuilder builder, uint32_t seed)
|
||||
if (view.find_first_of("aouAOU") != std::string_view::npos) {
|
||||
builder += "la";
|
||||
} else {
|
||||
builder += u8"l\u00e4";
|
||||
builder += "l\u00e4";
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user