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

fix incorrect string identifier

Browse source
This commit is contained in:
Phillip Thelen 2016-08-13 15:00:51 +02:00
parent 43a63794bc
commit abc83a38c2
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -374,7 +374,7 @@ To start, which parts of your life do you want to improve?</string>
<string name="hourglass">hourglass</string>
<string name="hourglasses">hourglasses</string>
<string name="gold_singular">gold</string>
<string name="gems_plural">gold</string>
<string name="gold_plural">gold</string>
<string name="chat_message_copied">Message copied to Clipboard</string>
<string name="copy_chat_message">Copy to clipboard</string>
</resources>

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java
View file

@ -144,7 +144,7 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
if (item.getValue() == 1) {
currencyString = context.getString(R.string.gold_singular);
} else {
currencyString = context.getString(R.string.gems_plural);
currencyString = context.getString(R.string.gold_plural);
}
} else if (item.getCurrency().equals("hourglasses")) {
if (item.getValue() == 1) {

3
Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
View file

@ -317,8 +317,7 @@ public class HabitRPGUser extends BaseModel {
authentication.user_id = id;
flags.user_id = id;
if (contributor != null) { contributor.user_id = id; }
contributor.user_id = id;
invitations.user_id = id;
if (invitations != null) { invitations.user_id = id; }
ArrayList<Task> allTasks = new ArrayList<Task>();