From 6aca0dc9476034466d04949ffe870075932edb96 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Wed, 2 Feb 2022 22:58:31 +0100 Subject: [PATCH] Replace `f.e.` with `e.g.` See --- app/src/main/assets/map_theme/jawg/global.yaml | 8 ++++---- .../streetcomplete/data/osm/edits/ElementEditsSource.kt | 2 +- .../data/osm/edits/upload/ElementEditsUploader.kt | 2 +- .../data/osmnotes/edits/NoteEditsUploader.kt | 2 +- .../streetcomplete/osm/cycleway/CyclewayParser.kt | 4 ++-- .../de/westnordost/streetcomplete/quests/QuestModule.kt | 8 ++++---- .../streetcomplete/quests/crossing/AddCrossing.kt | 2 +- app/src/main/res/raw/changelog.yml | 2 +- buildSrc/src/main/java/Utils.kt | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/assets/map_theme/jawg/global.yaml b/app/src/main/assets/map_theme/jawg/global.yaml index 01230f2f088..88541f1a1fa 100644 --- a/app/src/main/assets/map_theme/jawg/global.yaml +++ b/app/src/main/assets/map_theme/jawg/global.yaml @@ -56,7 +56,7 @@ global: function() { var userLang = global.language; if (userLang) { - // Preference #1: Take name in own language (f.e. name:en used in Egypt a lot) + // Preference #1: Take name in own language (e.g. name:en used in Egypt a lot) var nameInUserLang = feature['name_'+userLang]; if (nameInUserLang) return nameInUserLang; @@ -82,7 +82,7 @@ global: // Preference #2 and #3 are not available in JawgMaps - // Preference #2: Take international name (f.e. used in Greece a lot) + // Preference #2: Take international name (e.g. used in Greece a lot) //var internationalName = feature["int_name"]; //if (internationalName) return internationalName; @@ -103,10 +103,10 @@ global: if (nameInLatinScript) return nameInLatinScript; } - // Preference #6: Take name of any other language whose script is the same as the user's script (f.e. French signs in Laos) + // Preference #6: Take name of any other language whose script is the same as the user's script (e.g. French signs in Laos) // ... not implementable without a mapping of language code to script - // Preference #7: Take name of any other language whose script is in Latin (cause it's kind of "international") script (f.e. French signs in Laos) + // Preference #7: Take name of any other language whose script is in Latin (cause it's kind of "international") script (e.g. French signs in Laos) // ... not implementable without a mapping of language code to script } } diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/ElementEditsSource.kt b/app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/ElementEditsSource.kt index a3fe2ca1c09..1f2dfd48dd1 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/ElementEditsSource.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/ElementEditsSource.kt @@ -6,7 +6,7 @@ interface ElementEditsSource { fun onAddedEdit(edit: ElementEdit) fun onSyncedEdit(edit: ElementEdit) // may be several because deleting one element edit leads to the deletion of all edits that - // are based on that edit. F.e. splitting a way, then editing the newly created way segments + // are based on that edit. E.g. splitting a way, then editing the newly created way segments fun onDeletedEdits(edits: List) } diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/upload/ElementEditsUploader.kt b/app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/upload/ElementEditsUploader.kt index 4c1639f5355..22353ce2b92 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/upload/ElementEditsUploader.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/upload/ElementEditsUploader.kt @@ -41,7 +41,7 @@ class ElementEditsUploader @Inject constructor( val edit = elementEditsController.getOldestUnsynced() ?: break val idProvider = elementEditsController.getIdProvider(edit.id) /* the sync of local change -> API and its response should not be cancellable because - * otherwise an inconsistency in the data would occur. F.e. no "star" for an uploaded + * otherwise an inconsistency in the data would occur. E.g. no "star" for an uploaded * change, a change could be uploaded twice etc */ withContext(scope.coroutineContext) { uploadEdit(edit, idProvider) } } diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/osmnotes/edits/NoteEditsUploader.kt b/app/src/main/java/de/westnordost/streetcomplete/data/osmnotes/edits/NoteEditsUploader.kt index 1274247f23b..4270d75017a 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/data/osmnotes/edits/NoteEditsUploader.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/data/osmnotes/edits/NoteEditsUploader.kt @@ -56,7 +56,7 @@ class NoteEditsUploader @Inject constructor( while (true) { val edit = noteEditsController.getOldestUnsynced() ?: break /* the sync of local change -> API and its response should not be cancellable because - * otherwise an inconsistency in the data would occur. F.e. a note could be uploaded + * otherwise an inconsistency in the data would occur. E.g. a note could be uploaded * twice */ withContext(scope.coroutineContext) { uploadEdit(edit) } } diff --git a/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayParser.kt b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayParser.kt index cb38b07ad04..721e9f06700 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayParser.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/osm/cycleway/CyclewayParser.kt @@ -47,8 +47,8 @@ fun createCyclewaySides(tags: Map, isLeftHandTraffic: Boolean): var right: Cycleway? /* For oneways, the naked "cycleway"-keys should be interpreted differently: - * F.e. a cycleway=lane in a oneway=yes probably means that only in the flow direction, there - * is a lane. F.e. cycleway=opposite_lane means that there is a lane in opposite traffic flow + * E.g. a cycleway=lane in a oneway=yes probably means that only in the flow direction, there + * is a lane. E.g. cycleway=opposite_lane means that there is a lane in opposite traffic flow * direction. * Whether there is anything each in the other direction, is not defined, so we have to treat * it that way. */ diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/QuestModule.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/QuestModule.kt index 2b50ec3f544..a002addfc34 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/QuestModule.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/QuestModule.kt @@ -149,19 +149,19 @@ import javax.inject.Singleton /* The quest types are primarily sorted by how easy they can be solved: 1. quests that are solvable from a distance or while passing by (fast) - 2. quests that require to be right in front of it (f.e. because it is small, you need to + 2. quests that require to be right in front of it (e.g. because it is small, you need to look for it or read text) - 3. quests that require some exploration or walking around to check (f.e. walking down the + 3. quests that require some exploration or walking around to check (e.g. walking down the whole road to find the cycleway is the same along the whole way) 4. quests that require to go inside, i.e. deviate from your walking route by a lot just to solve the quest - 5. quests that come in heaps (are spammy) come last: F.e. building type etc. + 5. quests that come in heaps (are spammy) come last: E.g. building type etc. The ordering within this primary sort order shall be whatever is faster so solve first: a. Yes/No quests, easy selections first, b. number and text inputs later, - c. complex inputs (opening hours, ...) last. Quests that f.e. often require the way to be + c. complex inputs (opening hours, ...) last. Quests that e.g. often require the way to be split up first are in effect also slow to answer The order can be watered down somewhat if it means that quests that usually apply to the diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt index 1f7c97313e7..7e52450cf65 100644 --- a/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt +++ b/app/src/main/java/de/westnordost/streetcomplete/quests/crossing/AddCrossing.kt @@ -62,7 +62,7 @@ class AddCrossing : OsmElementQuestType { /* require all roads at a shared node to either have no sidewalk tagging or all of them to * have sidewalk tagging: If the sidewalk tagging changes at that point, it may be an * indicator that this is the transition point between separate sidewalk mapping and - * sidewalk mapping on road-way. F.e.: + * sidewalk mapping on road-way. E.g.: * https://www.openstreetmap.org/node/1839120490 */ val anySidewalk = setOf("both", "left", "right") diff --git a/app/src/main/res/raw/changelog.yml b/app/src/main/res/raw/changelog.yml index 7cae10a7fef..6a0f9c67152 100644 --- a/app/src/main/res/raw/changelog.yml +++ b/app/src/main/res/raw/changelog.yml @@ -295,7 +295,7 @@ v33.2: |
  • Allow answering that a place does not exist when asking whether it offers Kosher food (#3073), by @peternewman
  • For pubs that definitely serve food, also ask whether they have vegetarian and vegan food (#3097, #3099), by @peternewman
  • Don't ask whether a place offers vegetarian food if it only offers vegan food (#3072, #3081), by @starsep
    • -
  • Don't ask for the existence of things that are seasonal, f.e. loungers that can only be found in the park during summer (#3089), by @matkoniecz
    • +
  • Don't ask for the existence of things that are seasonal, e.g. loungers that can only be found in the park during summer (#3089), by @matkoniecz
  • Periodically ask if a drinking fountain still exists (#3102)
  • Clean tags from previous vacant shop when answering that there is a new shop now (#3045), by @TurnrDev
  • Improve illustration in building levels quest (#3092)
    • diff --git a/buildSrc/src/main/java/Utils.kt b/buildSrc/src/main/java/Utils.kt index 513d07b4891..59a31ba9607 100644 --- a/buildSrc/src/main/java/Utils.kt +++ b/buildSrc/src/main/java/Utils.kt @@ -1,6 +1,6 @@ import java.util.Locale -// Java (and thus also Android) uses some old iso (language) codes. F.e. id -> in etc. +// Java (and thus also Android) uses some old iso (language) codes. E.g. id -> in etc. // so the localized files also need to use the old iso codes fun bcp47LanguageTagToJavaLanguageTag(bcp47: String): String { val locale = Locale.forLanguageTag(bcp47)