sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-31 19:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'LunarGem-develop' into develop

Browse source
This commit is contained in:
Phillip Thelen 2017-11-01 14:46:21 +01:00
commit 788d9045f7
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/res/values/strings.xml
View file

@ -396,6 +396,8 @@
<string name="seasonalShop">Seasonal Shop</string>
<string name="empty_inbox">You don\'t have any Inbox messages. You can send a user a new message from their public chat messages!</string>
<string name="party_invite">Unlock by inviting friends</string>
<string name="login_incentive">Unlock by logging into Habitica regularly</string>
<string name="create_account">Unlock by creating an account</string>
<string name="no_gold">Not enough Gold</string>
<string name="no_potion">You don\'t need to buy an health potion</string>
<string name="successful_purchase" >Purchased %1$s</string>

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.kt
View file

@ -12,6 +12,8 @@ open class ShopItemUnlockCondition : RealmObject() {
fun readableUnlockConditionId(): Int = when (this.condition) {
"party invite" -> R.string.party_invite
"login incentive" -> R.string.login_incentive
"create account" -> R.string.create_account
else -> R.string.empty
}
}