Skip to content

Commit

Permalink
Change wording
Browse files Browse the repository at this point in the history
  • Loading branch information
bubelov committed May 3, 2024
1 parent 8e546f7 commit 39cb4b9
Show file tree
Hide file tree
Showing 35 changed files with 44 additions and 2 deletions.
12 changes: 10 additions & 2 deletions app/src/main/kotlin/sync/SyncNotificationController.kt
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,28 @@ class SyncNotificationController(
endLongitude = element.lon,
)

val localRadiusMeters = 100_000f

val distanceThresholdMeters = if (conf.showAllNewElements) {
100_000_000f
} else {
100_000f
localRadiusMeters
}

if (distanceMeters > distanceThresholdMeters) {
return
}

val contentText = if (distanceMeters > localRadiusMeters) {
context.getString(R.string.new_merchant_accepts_bitcoins)
} else {
context.getString(R.string.new_local_merchant_accepts_bitcoins)
}

val builder = NotificationCompat.Builder(context, NEW_MERCHANTS_CHANNEL_ID)
.setSmallIcon(R.drawable.add_location)
.setContentTitle(element.name(context.resources))
.setContentText(context.getString(R.string.new_local_merchant_accepts_bitcoins))
.setContentText(contentText)
.setPriority(NotificationCompat.PRIORITY_DEFAULT)

NotificationManagerCompat.from(context)
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-af/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="other">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="zero">%d changes</item>
<item quantity="one">%d change</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d промяна</item>
<item quantity="other">%d промени</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="other">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="many">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d změn</item>
<item quantity="few">%d změn</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="other">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d Änderung</item>
<item quantity="other">%d Änderungen</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d αλλαγή</item>
<item quantity="other">%d αλλαγές</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d cambio</item>
<item quantity="many">%d cambios</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="other">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="other">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d modification</item>
<item quantity="many">%d modifications</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="other">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="other">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="many">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-iw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">שינויים %d</item>
<item quantity="two">שינויים %d</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="other">%d changes</item>
</plurals>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="other">%d changes</item>
</plurals>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="other">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-no/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="other">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="few">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d mudança</item>
<item quantity="many">%d mudanças</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ro/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="few">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d правка</item>
<item quantity="few">%d правок</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-sr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="few">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-sv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="one">%d change</item>
<item quantity="other">%d changes</item>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-th/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<string name="companion_warning">You\'ll need a companion app (%1$s) in order to make a payment. This app doesn\'t require you to fill any personal data, to the best of our knowledge. Please let us know if it\'s not the case and we\'ll remove this place.</string>
<string name="percentage_of_verified_places">Percentage of verified places</string>
<string name="days_since_verified">Days since verified</string>
<string name="new_merchant_accepts_bitcoins">New merchant accepts bitcoins</string>
<plurals name="d_changes">
<item quantity="other">%d การเปลี่ยนแปลง</item>
</plurals>
Expand Down
Loading

0 comments on commit 39cb4b9

Please sign in to comment.