Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clarify wording of the crossing quest #5936

Merged
merged 7 commits into from
Oct 3, 2024
Merged

Clarify wording of the crossing quest #5936

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e616a3f
Clarify wording of the crossing quest
schra Oct 1, 2024
3e2091c
scale images correctly
schra Oct 2, 2024
4a5d603
undo changes in translation strings.xml
schra Oct 2, 2024
1d5d518
fix images looking weird because of '-colorspace RGB'
schra Oct 2, 2024
fb335e8
apply suggested wordings
schra Oct 3, 2024
a3b25d5
also bump string name in kotlin code
schra Oct 3, 2024
e9b9b93
revert bumping string
schra Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ class AddCrossing : OsmElementQuestType<CrossingAnswer> {
override val icon = R.drawable.ic_quest_pedestrian
override val achievements = listOf(PEDESTRIAN)

override val hint = R.string.quest_crossing_hint
override val hintImages = listOf(
R.drawable.informal_crossing,
)

override fun getTitle(tags: Map<String, String>) = R.string.quest_crossing_title2

override fun getHighlightedElements(element: Element, getMapData: () -> MapDataWithGeometry) =
Expand Down Expand Up @@ -70,7 +75,7 @@ class AddCrossing : OsmElementQuestType<CrossingAnswer> {
override fun applyAnswerTo(answer: CrossingAnswer, tags: Tags, geometry: ElementGeometry, timestampEdited: Long) {
when (answer) {
YES -> tags["highway"] = "crossing"
NO -> tags["crossing"] = "informal"
INFORMAL -> tags["crossing"] = "informal"
PROHIBITED -> tags["crossing"] = "no"
}
}
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossingForm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ class AddCrossingForm : AListQuestForm<CrossingAnswer>() {

override val items = listOf(
TextItem(YES, R.string.quest_crossing_yes),
TextItem(NO, R.string.quest_crossing_no),
TextItem(INFORMAL, R.string.quest_crossing_no),
TextItem(PROHIBITED, R.string.quest_crossing_prohibited),
)

/*
PROHIBITED is not possible for sidewalks or crossings (=separately mapped sidewalk
infrastructure) because if the crossing does not exist, it would require to also
Expand All @@ -26,8 +25,8 @@ class AddCrossingForm : AListQuestForm<CrossingAnswer>() {
See https://github.com/streetcomplete/StreetComplete/pull/2999#discussion_r681516203
and https://github.com/streetcomplete/StreetComplete/issues/5160

NO on the other hand would be okay because crossing=informal would not require deleting
the crossing ways (I would say... it is in edge case...)
INFORMAL on the other hand would be okay because crossing=informal would not require
deleting the crossing ways (I would say... it is in edge case...)
*/
override fun onClickOk() {
if (checkedItem?.value == PROHIBITED && isOnSidewalkOrCrossing()) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/de/westnordost/streetcomplete/quests/crossing/CrossingAnswer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ package de.westnordost.streetcomplete.quests.crossing

enum class CrossingAnswer {
YES,
NO,
INFORMAL,
PROHIBITED
}
2 changes: 2 additions & 0 deletions app/src/main/res/authors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,3 +319,5 @@ tourism_information_termina... CC-BY 4.0 https://wiki.openstreetmap.org/
vibrating_button_illustrati... CC-BY 4.0 Tobias Zwick
vibrating_button_i... (MCC234) CC0 CJ Malone
vibrating_button_i... (MCC505) CC0 https://commons.wikimedia.org/wiki/File:An_Australian_pedestrian_crossing_button.jpg (James Cridland)

informal_crossing.jpg CC-SA 2.0 https://wiki.openstreetmap.org/wiki/File:West_Highland_Way_crossing_road_-_geograph.org.uk_-_3986498_(cropped).jpg
Binary file added app/src/main/res/drawable-hdpi/informal_crossing.jpg
View file
Open in desktop
westnordost marked this conversation as resolved.
Show resolved Hide resolved
westnordost marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/informal_crossing.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xhdpi/informal_crossing.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxhdpi/informal_crossing.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,9 +998,10 @@ A level counts as a roof level when its windows are in the roof. Subsequently, r
<string name="quest_crossing_kerb_height_title">What’s the height of the curbs at this crossing?</string>

<string name="quest_crossing_title2">Is there a crossing here?</string>
<string name="quest_crossing_yes">Yes (e.g. the curb is lowered here or there are markings)</string>
<string name="quest_crossing_no">No, but crossing is possible</string>
<string name="quest_crossing_yes2">Yes, intended as crossing</string>
<string name="quest_crossing_no2">Not intended as crossing, still possible to cross (e.g. informal trails)</string>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it correct to change the "name" field because I want to force the translations to also change their wording?

Is it correct to remove the old translation strings?

Copy link
Member

@westnordost westnordost Oct 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm well, if the wording changes substantially, then yes. But in this case, IMO, it doesn't change substantially, it is just a clarification, so the name should not be changed.

When the source translation changes, existing translations of this string are shown as "fuzzy" in POEditor (the crowd translation platform), it is also possible to filter showing only fuzzy strings.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see e9b9b93

<string name="quest_crossing_prohibited">No, crossing is prohibited or impossible</string>
<string name="quest_crossing_hint">Informal crossings usually look like this:</string>

<string name="quest_cycleway_title2">"Is there a bicycle lane or path here? What type?"</string>
<string name="quest_cycleway_resurvey_title">"Is this still the cycling situation here?"</string>
Expand Down