diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml index 3124b420d..b62fb8862 100644 --- a/Habitica/res/values-fr/strings.xml +++ b/Habitica/res/values-fr/strings.xml @@ -220,6 +220,7 @@ Quêtes Familiers Montures + Vous avez trouvé %d objets pour la quête Vous avez trouvé une pièce d\'équipement rare dans l\'Armoire : %s! Génial ! Vous farfouillez dans l\'Armoire et trouvez une %1$s %2$s. Qu\'est-ce que ça fait là ? Vous luttez contre l\'Armoire et gagnez de l\'expérience. Prends ça ! diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml index ecd26f5fd..543bd4c0e 100644 --- a/Habitica/res/values-pl/strings.xml +++ b/Habitica/res/values-pl/strings.xml @@ -213,6 +213,7 @@ Misje Zwierzaki Wierzchowce + Znalazłeś %d przedmiot(y/ów) z zadania Znalazłeś element rzadkiego Ekwipunku w Skrzyni: %s! Super! Przeszukujesz Skrzynię i znajdujesz %1$s %2$s. Co to tam robi? Mocujesz się ze Skrzynią i zyskujesz Doświadczenie. A masz! diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index eca3d05e5..14a90d4ad 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -271,6 +271,7 @@ Pets Mounts + You\'ve found %d quest items You found %s in the Armoire You rummage in the Armoire and find %1$s %2$s. What\'s that doing in here? You wrestle with the Armoire and gain Experience. Take that! diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt index 0e218f350..a0e0dfaa8 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.kt @@ -1,8 +1,11 @@ package com.habitrpg.android.habitica.interactors +import android.content.Context import android.os.Handler +import android.provider.Settings.Global.getString import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity +import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.executors.PostExecutionThread import com.habitrpg.android.habitica.executors.ThreadExecutor import com.habitrpg.android.habitica.helpers.SoundManager @@ -23,7 +26,7 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut if (data?.questItemsFound ?: 0 > 0 && requestValues.showQuestItems) { if (snackbarText.isNotEmpty()) snackbarText.append('\n') - snackbarText.append("+${data!!.questItemsFound} quest items") + snackbarText.append(requestValues.context.getString(R.string.quest_items_found, data!!.questItemsFound)) } if (snackbarText.isNotEmpty()) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt index 0ade30c86..ee3efc790 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/OldQuestProgressView.kt @@ -117,7 +117,7 @@ class OldQuestProgressView : LinearLayout { bossHealthView.pendingValue = value bossHealthView.description = String.format("%.01f dmg pending", value) bossHealthView.descriptionIconView.visibility = View.VISIBLE - collectedItemsNumberView.text = "+$collectedItems items found" + collectedItemsNumberView.text = context.getString(R.string.quest_items_found, collectedItems) } else { bossHealthView.pendingValue = 0.0 bossHealthView.description = "" diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt index 69e89ae88..ad5b081a3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt @@ -189,7 +189,8 @@ class QuestProgressView : LinearLayout { fun configure(user: User) { pendingDamageTextView.text = String.format("%.01f dmg pending", (user.party?.quest?.progress?.up ?: 0F) ) - collectedItemsNumber.text = "+${user.party?.quest?.progress?.collectedItems ?: 0} items found" + val collectedItems = user.party?.quest?.progress?.collectedItems ?: 0 + collectedItemsNumber.text = context.getString(R.string.quest_items_found, collectedItems) } private fun setupRageStrikeViews() {