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.

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

show name + location above quest title, simplify quest titles #3870

Merged
merged 12 commits into from
Mar 13, 2022

Conversation

westnordost
Copy link
Member

@westnordost westnordost commented Mar 12, 2022

See #3862

Screenshot_20220312-171402_StreetComplete Dev
Screenshot_20220312-171124_StreetComplete Dev
Screenshot_20220312-171350_StreetComplete Dev

Also, reorder all the remaining strings for better overview etc and add comments for certain strings (because IIRC they are displayed in POEditor and can be very useful for translators)

Also, reorder all the remaining strings for better overview etc
@matkoniecz

This comment was marked as resolved.

westnordost and others added 2 commits March 13, 2022 00:52
Co-authored-by: Mateusz Konieczny <matkoniecz@gmail.com>
westnordost and others added 3 commits March 13, 2022 13:28
Co-authored-by: Flo Edelmann <florian-edelmann@online.de>
Copy link
Member

@FloEdelmann FloEdelmann left a comment

Choose a reason for hiding this comment

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

I really like the consistency of the label being shown in (nearly?) all quests and always showing relevant context information!

FloEdelmann and others added 3 commits March 13, 2022 14:05
also, for RTL support, it's better to use strings with placeholders than a string builder
Comment on lines 36 to 39
override fun getTitle(tags: Map<String, String>) = R.string.quest_address_street_title

override fun getTitleArgs(tags: Map<String, String>, featureName: Lazy<String?>): Array<String> =
override fun getTitleArgs(tags: Map<String, String>): Array<String> =
arrayOfNotNull(tags["addr:streetnumber"] ?: tags["addr:housenumber"] ?: tags["addr:housename"])
Copy link
Member

Choose a reason for hiding this comment

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

Is it deliberate that this question (What street does (house) […] belong to?) is not simplified?

Is it because the tag priority here (addr:streetnumber > addr:housenumber > addr:housename) is different from the logic in Resources.getHouseNumberLabel?

Copy link
Member Author

Choose a reason for hiding this comment

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

AddAddressStreet is asked not only for buildings. So it would be difficult to refer to the "thing" without saying housenumber. Or do you have an idea how to word it?

Copy link
Member

Choose a reason for hiding this comment

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

Why not leave it out completely?

What street does this belong to?
house number 27

Copy link
Member Author

Choose a reason for hiding this comment

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

This what? Are you sure that it is possible even in English to word it like that?

Copy link
Member

Choose a reason for hiding this comment

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

I see no problems with that (but I might be wrong of course).

We have basically the same thing with "Is this still here?" and that seems to be a common expression: https://www.google.com/search?q=%22Is+this+still+here%3F%22

Copy link
Member Author

Choose a reason for hiding this comment

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

@1ec5 suggested "What street is this on?", so I'll just use that

Copy link
Collaborator

Choose a reason for hiding this comment

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

I'd never got round to opening an issue, but it always used to but me when I was asked What street does (house) […] belong to? for a railway station or an office, so this is a great improvement!

@westnordost
Copy link
Member Author

westnordost commented Mar 13, 2022

Overview of the changed strings, compiled by @FloEdelmann:

@@ AddAcceptsCash @@
- Does […] accept cash payment?
+ Is cash payment accepted here?

@@ AddAirConditioning @@
- Does this place […] have air conditioning?
+ Is this place air conditioned?

@@ AddBabyChangingTable @@
- Does this restroom have a baby changing table?
+ Does this place have a baby changing table?

@@ AddBenchStatusOnBusStop @@
- Is there a bench at this bus stop?
+ Is there a bench at this stop?

@@ AddBinStatusOnBusStop @@
- Is there a waste basket at this bus stop?
+ Is there a waste basket at this stop?

@@ AddBusStopLit @@
- Is this bus stop lit?
+ Is this stop lit?

@@ AddBusStopName @@
- What is the name of this bus stop?
+ What’s the name of this stop?

@@ AddBusStopRef @@
- What is the reference number of this bus stop?
+ What’s the reference number of this stop?

@@ AddBusStopShelter @@
- Is there a shelter at this bus stop?
+ Is there a shelter at this stop?

@@ AddChargingStationCapacity @@
- How many cars can be charged at this charging station at the same time?
+ How many cars can be charged here at the same time?

@@ AddDrinkingWater @@
- Is the water potable here? […]
+ Is the water potable here?

@@ AddFuelSelfService @@
- Can you pump gas yourself at this fuel station?
+ Can you pump gas yourself here?

@@ AddGeneralFee @@
- Do you need to pay to enter […]?
+ Do you need to pay to enter here?

@@ AddHalal @@
- Does […] offer Halal products?
+ Are halal products offered here?

@@ AddInformationToTourism @@
- What type of tourist information is […]?
+ What type of tourist information is this?

@@ AddInternetAccess @@
- What kind of Internet connection does […] offer?
+ What kind of internet connection does this place offer?

@@ AddKosher @@
- Does […] offer kosher products?
+ Are kosher products offered here?

@@ AddLevel @@
- On which level number is […] located?
+ On which level number is this place located?

@@ AddOpeningHours @@
- What are the opening hours of […]?
+ What are the opening hours here?

@@ AddPathSmoothness @@
- What is the surface quality of this path here?
+ What’s the surface quality here?

@@ AddPathSurface @@
- What surface does this path have here?
+ What’s the surface here?

@@ AddPitchLit @@
- Is this sport field lit?
+ Is it lit here?

@@ AddPitchSurface @@
- What surface does this sport field have?
+ What’s the surface here?

@@ AddPlaceName @@
- What is the name of this place? […]
+ What’s the name of this place?

@@ AddPowerPolesMaterial @@
- What is the material of this power or utility pole?
+ What’s this pole made of?

@@ AddRoadName @@
- What is the name of this road?
+ What’s the name of this street?

@@ AddRoadSurface @@
- What surface does the road […] have here?
+ What surface does this piece of road have?

@@ AddSummitRegister @@
- Is there a summit register at […]?
+ Is there a summit register here?

@@ AddTactilePavingBusStop @@
- Does this bus stop have tactile paving?
+ Does this stop have tactile paving?

@@ AddToiletAvailability @@
- Does […] have a restroom?
+ Is there any restroom here?

@@ AddVegan @@
- Does […] have vegan meals on the menu?
+ Any vegan items on the menu here?

@@ AddVegetarian @@
- Does […] have vegetarian meals on the menu?
+ Any vegetarian items on the menu here?

@@ AddWayLit @@
- Is this stretch of way lit?
+ Is it lit here?

@@ AddWheelchairAccessBusiness @@
- Is this location wheelchair accessible?
+ Is this place wheelchair accessible?

@@ AddWheelchairAccessOutside @@
- Is […] wheelchair accessible?
+ Is this place wheelchair accessible?

@@ AddWheelchairAccessPublicTransport @@
- Is this place wheelchair accessible?
+ Is this place wheelchair accessible?

@@ AddWheelchairAccessToilets @@
- Is this restroom wheelchair accessible?
+ Is this place wheelchair accessible?

@@ AddWheelchairAccessToiletsPart @@
- Is the restroom at […] wheelchair accessible?
+ Is the restroom at this place wheelchair accessible?

@@ CheckExistence @@
- Is this still here? […]
+ Is this still here?

@@ CheckOpeningHoursSigned @@
- Are the opening hours signed for […]?
+ Are the opening hours here signed?

@@ AddAddressStreet @@
- What street does (house) […] belong to?
+ What street is this on?

@@ AddBoardType @@
- What is the topic of this information board?
+ What’s the topic of this information board?

@@ AddBridgeStructure @@
- What is the structure of this bridge?
+ What’s the structure of this bridge?

@@ AddHousenumber @@
- What is the house number of this building?
+ What’s the house number of this building?

@@ AddKerbHeight @@
- What is the height of this curb?
+ What’s the height of this curb?

@@ AddMaxHeight @@
- What is the height limit here?
+ What’s the height limit here?

@@ AddMaxPhysicalHeight @@
- What is the height limit here?
+ What’s the height limit here?

@@ AddMaxSpeed @@
- What is the speed limit for this street?
+ What’s the speed limit for this street?

@@ AddMaxWeight @@
- What is the weight limit here?
+ What’s the weight limit here?

@@ AddOrchardProduce @@
- What is being cultivated here?
+ What’s being cultivated here?

@@ AddPostboxRef @@
- What is the reference number of this postbox?
+ What’s the reference number of this postbox?

@@ AddPostboxRoyalCypher @@
- What is the royal cypher on this postbox?
+ What’s the royal cypher on this postbox?

@@ AddRoadSmoothness @@
- What is the surface quality of this road here?
+ What’s the surface quality of this road here?

@@ AddTracktype @@
- What is the surface firmness of this track?
+ What’s the surface firmness of this track?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants