From d072885e6e36885d530717f0c41faed4f64d5a94 Mon Sep 17 00:00:00 2001
From: Daniel Kaparunakis <daniel.kaparunakis@gmail.com>
Date: Mon, 29 Aug 2016 00:04:26 -0500
Subject: [PATCH 1/9] Feature: Add ListPreference for language switcher to
 settings activity

This commit adds the Language entries & language values arrays so
that the list preference can reference them in the settings activity.
It also adds said ListPreference XML element to be used as a language
switcher.
---
 Habitica/res/values/values.xml            | 61 +++++++++++++++++++++++
 Habitica/res/xml/preferences_fragment.xml |  8 +++
 build.gradle                              |  2 +-
 gradle/wrapper/gradle-wrapper.properties  |  6 +--
 4 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/Habitica/res/values/values.xml b/Habitica/res/values/values.xml
index ad1ca667d..d68f5ff87 100644
--- a/Habitica/res/values/values.xml
+++ b/Habitica/res/values/values.xml
@@ -33,4 +33,65 @@
         <item>@string/avatar_size_slim</item>
         <item>@string/avatar_size_broad</item>
     </string-array>
+
+    <string-array name="Language">
+        <item>English</item>
+        <item>Български</item>
+        <item>Čeština</item>
+        <item>Dansk</item>
+        <item>Deutsch</item>
+        <item>Pirate English</item>
+        <item>British English</item>
+        <item>Español</item>
+        <item>Español (América Latina)</item>
+        <item>Français</item>
+        <item>עברית</item>
+        <item>Magyar</item>
+        <item>Bahasa Indonesia</item>
+        <item>Italiano</item>
+        <item>日本語</item>
+        <item>Nederlands</item>
+        <item>Polski</item>
+        <item>Português</item>
+        <item>Português Brasileiro</item>
+        <item>Română</item>
+        <item>Русский</item>
+        <item>Slovenský</item>
+        <item>Srpski</item>
+        <item>Svenska</item>
+        <item>Українська</item>
+        <item>中文（简体）</item>
+        <item>中文（正體）</item>
+    </string-array>
+
+    <string-array name="LanguageValues">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
+        <item>20</item>
+        <item>21</item>
+        <item>22</item>
+        <item>23</item>
+        <item>24</item>
+        <item>25</item>
+        <item>26</item>
+    </string-array>
+
 </resources>
diff --git a/Habitica/res/xml/preferences_fragment.xml b/Habitica/res/xml/preferences_fragment.xml
index 46d5b2e1b..f081d3b80 100644
--- a/Habitica/res/xml/preferences_fragment.xml
+++ b/Habitica/res/xml/preferences_fragment.xml
@@ -54,10 +54,18 @@
             android:key="choose_class"
             android:order="2"/>
 
+        <ListPreference android:title="Language"
+            android:key="language_preference"
+            android:entries="@array/Language"
+            android:entryValues="@array/LanguageValues"
+            android:summary="Change Habitica's language"
+            android:order="3"/>
+
         <Preference android:title="@string/logout"
             android:key="logout"
             android:summary="@string/logout_description"
             android:order="99"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/build.gradle b/build.gradle
index 0e19da6e8..4bb1d4fd4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.1.3'
         classpath 'com.android.databinding:dataBinder:1.0-rc4'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:3.0.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 73e9ac19c..417a6c2b3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Wed Apr 27 08:20:39 CST 2016
+#Tue Aug 23 23:33:03 CDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip
 org.gradle.jvmargs=-Xmx3072M
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

From 624d37ec96b54970e9a8a0cd823f474514e7295a Mon Sep 17 00:00:00 2001
From: Daniel Kaparunakis <daniel.kaparunakis@gmail.com>
Date: Mon, 29 Aug 2016 23:54:15 -0500
Subject: [PATCH 2/9] Feature: Remove unnecessary languages & add values to the
 resource files

This commit removes languages whose translations are not available in
Android from the ListPreference element. It also adds a couple of string
values belonging to the ListPreference element that allow for easy
translation. Finally, it adds some logic to respond to the
SharedPreference change listener.
---
 Habitica/res/values/strings.xml               |  2 ++
 Habitica/res/values/values.xml                | 18 ----------
 Habitica/res/xml/preferences_fragment.xml     |  6 ++--
 .../preferences/AccountDetailsFragment.java   |  6 ++--
 .../preferences/PreferencesFragment.java      | 34 +++++++++++++------
 5 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 0aa13106f..54d846158 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -15,6 +15,8 @@
     <string name="SP_userID_summary">Your User ID</string>
     <string name="SP_APIToken_title">API Token</string>
     <string name="SP_APIToken_summary">Your API Token</string>
+    <string name="Language_title">Language</string>
+    <string name="Language_summary">Change Habitica\'s language</string>
     <string name="PS_contact_title">Contact me</string>
     <string name="unknown_error">An error happened…</string>
     <string name="pref_account_header">Account</string>
diff --git a/Habitica/res/values/values.xml b/Habitica/res/values/values.xml
index d68f5ff87..d25a6ff88 100644
--- a/Habitica/res/values/values.xml
+++ b/Habitica/res/values/values.xml
@@ -37,13 +37,9 @@
     <string-array name="Language">
         <item>English</item>
         <item>Български</item>
-        <item>Čeština</item>
-        <item>Dansk</item>
         <item>Deutsch</item>
-        <item>Pirate English</item>
         <item>British English</item>
         <item>Español</item>
-        <item>Español (América Latina)</item>
         <item>Français</item>
         <item>עברית</item>
         <item>Magyar</item>
@@ -54,12 +50,7 @@
         <item>Polski</item>
         <item>Português</item>
         <item>Português Brasileiro</item>
-        <item>Română</item>
         <item>Русский</item>
-        <item>Slovenský</item>
-        <item>Srpski</item>
-        <item>Svenska</item>
-        <item>Українська</item>
         <item>中文（简体）</item>
         <item>中文（正體）</item>
     </string-array>
@@ -67,13 +58,9 @@
     <string-array name="LanguageValues">
         <item>0</item>
         <item>1</item>
-        <item>2</item>
-        <item>3</item>
         <item>4</item>
-        <item>5</item>
         <item>6</item>
         <item>7</item>
-        <item>8</item>
         <item>9</item>
         <item>10</item>
         <item>11</item>
@@ -84,12 +71,7 @@
         <item>16</item>
         <item>17</item>
         <item>18</item>
-        <item>19</item>
         <item>20</item>
-        <item>21</item>
-        <item>22</item>
-        <item>23</item>
-        <item>24</item>
         <item>25</item>
         <item>26</item>
     </string-array>
diff --git a/Habitica/res/xml/preferences_fragment.xml b/Habitica/res/xml/preferences_fragment.xml
index f081d3b80..b6ed3580b 100644
--- a/Habitica/res/xml/preferences_fragment.xml
+++ b/Habitica/res/xml/preferences_fragment.xml
@@ -54,11 +54,11 @@
             android:key="choose_class"
             android:order="2"/>
 
-        <ListPreference android:title="Language"
-            android:key="language_preference"
+        <ListPreference android:title="@string/Language_title"
+            android:key="language"
             android:entries="@array/Language"
             android:entryValues="@array/LanguageValues"
-            android:summary="Change Habitica's language"
+            android:summary="@string/Language_summary"
             android:order="3"/>
 
         <Preference android:title="@string/logout"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
index c4e6db21f..7d2665707 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
@@ -1,13 +1,13 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences;
 
-import com.habitrpg.android.habitica.R;
-
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.support.v7.preference.Preference;
 import android.widget.Toast;
 
+import com.habitrpg.android.habitica.R;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -22,6 +22,8 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
                 findPreference(key).setSummary(preference.getValue().toString());
             }
         }
+
+
     }
 
     protected List<String> getAccountDetailsPreferences() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
index 72bfc2cf7..47b6a870a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
@@ -1,5 +1,17 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences;
 
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.util.Log;
+
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.NotificationPublisher;
@@ -14,18 +26,8 @@ import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-import android.util.Log;
-
 import java.util.Calendar;
+import java.util.Locale;
 
 import javax.inject.Inject;
 
@@ -197,6 +199,16 @@ public class PreferencesFragment extends BasePreferencesFragment implements
             } else {
                 pushNotificationManager.removePushDeviceUsingStoredToken();
             }
+        } else if (key.equals("language")) {
+            Log.v("test", sharedPreferences.getString(key,"0"));
+            Locale locale = new Locale("es");
+            Locale.setDefault(locale);
+            Configuration configuration = new Configuration();
+            configuration.locale = locale;
+            getActivity().getResources().updateConfiguration(configuration,
+                    getActivity().getResources().getDisplayMetrics());
+
+
         }
     }
 

From 548fa9af6b46260a42d8f559a5ce92796b88c390 Mon Sep 17 00:00:00 2001
From: Daniel Kaparunakis <daniel.kaparunakis@gmail.com>
Date: Thu, 1 Sep 2016 23:05:49 -0500
Subject: [PATCH 3/9] Feature: Complete logic for the SharedPreferences change
 listener

This commit completes the logic of the onSharedPreferencesChanged
listener. It pushes the chosen language to the Habitica web app
so the web app can have the same language as the Android app.
---
 Habitica/res/values-in/strings.sidebar.xml    |  18 +
 Habitica/res/values-in/strings.tutorial.xml   |  14 +
 Habitica/res/values-in/strings.xml            | 322 +++++++++++++++++
 Habitica/res/values-iw/strings.sidebar.xml    |  19 +
 Habitica/res/values-iw/strings.tutorial.xml   |  14 +
 Habitica/res/values-iw/strings.xml            | 328 ++++++++++++++++++
 Habitica/res/values/values.xml                |  36 +-
 .../preferences/PreferencesFragment.java      |  91 ++++-
 8 files changed, 822 insertions(+), 20 deletions(-)
 create mode 100644 Habitica/res/values-in/strings.sidebar.xml
 create mode 100644 Habitica/res/values-in/strings.tutorial.xml
 create mode 100644 Habitica/res/values-in/strings.xml
 create mode 100644 Habitica/res/values-iw/strings.sidebar.xml
 create mode 100644 Habitica/res/values-iw/strings.tutorial.xml
 create mode 100644 Habitica/res/values-iw/strings.xml

diff --git a/Habitica/res/values-in/strings.sidebar.xml b/Habitica/res/values-in/strings.sidebar.xml
new file mode 100644
index 000000000..f6a378ec7
--- /dev/null
+++ b/Habitica/res/values-in/strings.sidebar.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="sidebar.tasks">Tugas</string>
+  <string name="sidebar.skills">Keahlian</string>
+  <string name="sidebar.section.social">Sosial</string>
+  <string name="sidebar.tavern">Kedai</string>
+  <string name="sidebar.party">Teman</string>
+  <string name="sidebar.purchaseGems">Beli Permata</string>
+  <string name="sidebar.guilds">Kelompok</string>
+  <string name="sidebar.challenges">Tantangan</string>
+  <string name="sidebar.section.inventory">Inventori</string>
+  <string name="sidebar.avatar">Avatar</string>
+  <string name="sidebar.equipment">Perlengkapan</string>
+  <string name="sidebar.stable">Istal</string>
+  <string name="sidebar.news">Berita</string>
+  <string name="sidebar.settings">Pengaturan</string>
+  <string name="sidebar.about">Tentang Kami</string>
+</resources>
diff --git a/Habitica/res/values-in/strings.tutorial.xml b/Habitica/res/values-in/strings.tutorial.xml
new file mode 100644
index 000000000..0b28c2cb5
--- /dev/null
+++ b/Habitica/res/values-in/strings.tutorial.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_habits">Lakukan Kebiasaan Baik untuk mendapatkan emas dan pengalaman! Kebiasaan Buruk akan menyakiti avatarmu jika kamu mengetuknya, jadi hindari melakukannya di dunia nyata!</string>
+  <string name="tutorial_dailies">Kalahkan tugas harianmu yang berulang untuk mendapatkan emas dan pengalaman. Bahaya! Keseharian akan menyakiti avatarmu jika kamu tidak menyelesaikannya tepat waktu.</string>
+  <string name="tutorial_todos">Lakukan Tugasmu di dunia nyata, lalu ceklis daftar untuk EMAS dan PENGALAMAN sehingga kamu bisa mendapatkan Hadiah dan membuka fitur baru!</string>
+  <string name="tutorial_rewards">Ini adalah Hadiahmu! Dapatkan emas dengan menyelesaikan Tugas dunia-nyata, Keseharian, dan Daftar Tugas. Kemudian habiskan untuk Hadiah dalam game atau Hadiah dunia nyata kustom!</string>
+  <string name="tutorial_equipment">Perlengkapan yang kamu beli akan muncul di sini. Perlengkapan Bertarung milikmu akan mempengaruhi status, dan Kostum (jika dicentang) hanya mempengaruhi apa yang avatarmu kenakan.</string>
+  <string name="tutorial_items">Dapatkan item dengan menyelesaikan tugas dan meningkatkan level. Ketuk pada item untuk menggunakannya!</string>
+  <string name="tutorial_pets">Seiring kamu menyelesaikan tugas dunia-nyata, kamu sekarang memiliki kesempatan acak untuk menemukan telur dan ramuan. Campurkan mereka untuk menetaskan peliharaan</string>
+  <string name="tutorial_skills">Keahlian adalah kemampuan spesial yang memiliki efek yang kuat! Ketuk pada suatu keahlian untuk menggunakannya. Keahlian akan mengurangi Mana (baris biru), di mana kamu bisa mendapatkannya dengan mengecek aplikasi setiap hari dan dengan menyelesaikan tugas dunia-nyatamu. Periksa FAQ pada menu untuk info lebih lanjut!</string>
+  <string name="tutorial_party">Ini adalah bagian dimana kamu dan teman-temanmu dapat menjaga masing-masing agar tetap bertanggung jawab sekaligus melawan monster-monster dengan tugasmu!</string>
+  <string name="tutorial_tavern">Selamat datang di Kedai Minuman, ruang berbincang publik untuk semua umur! Disini kamu dapat berbincang mengenai produktivitas dan menanyakan pertanyaan. Selamat bersenang-senang!</string>
+  <string name="tutorial_classes">Pilih untuk menjadi Prajurit, Penyihir, Penyembuh, atau Perampok! Setiap kelas memiliki perlengkapan dan kemampuan yang unik. Ketuk (?) untuk mengetahui lebih lanjut!</string>
+</resources>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
new file mode 100644
index 000000000..00852c7b7
--- /dev/null
+++ b/Habitica/res/values-in/strings.xml
@@ -0,0 +1,322 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Habitica</string>
+  <string name="action_refresh">Muat Ulang</string>
+  <string name="XP_default">Pengalaman </string>
+  <string name="HP_default">Kesehatan</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">Pengaturan tidak dapat dimuat dari barkode</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Pengaturan</string>
+  <string name="SP_address_hint">Server kustom anda</string>
+  <string name="SP_userID_title">ID Pengguna</string>
+  <string name="SP_userID_summary">ID Pengguna Anda</string>
+  <string name="SP_APIToken_title">Token API</string>
+  <string name="SP_APIToken_summary">Token API Anda</string>
+  <string name="PS_contact_title">Kontak saya</string>
+  <string name="unknown_error">Terjadi kesalahan...</string>
+  <string name="pref_account_header">Akun</string>
+  <string name="pref_reminder_header">Peringatan Harian</string>
+  <string name="pref_reminder_checkbox">Aktifkan Peringatan</string>
+  <string name="pref_reminder_picker">Atur Waktu Peringatan</string>
+  <!--Adding tasks-->
+  <string name="task_value">Nilai</string>
+  <string name="new_todo">Tugas baru</string>
+  <string name="new_reward">Hadiah baru</string>
+  <string name="new_daily">Keseharian baru</string>
+  <string name="new_habit">Kebiasaan baru</string>
+  <string name="action_edit">Edit</string>
+  <string name="action_delete">Hapus</string>
+  <string name="action_cancel">Batal</string>
+  <string name="login_btn">Masuk</string>
+  <string name="register_btn">Daftar</string>
+  <string name="username">Username</string>
+  <string name="email_username">Email atau Username</string>
+  <string name="password">Kata Sandi</string>
+  <string name="emailAddress">Alamat Email</string>
+  <string name="confirmpassword">Konfirmasi kata sandi</string>
+  <string name="logout">Keluar</string>
+  <string name="logout_description">Keluar dari akun anda</string>
+  <string name="account_details">Detail Akun</string>
+  <string name="LoginActivityName">Selamat Datang</string>
+  <string name="string_revive">Pulihkan</string>
+  <string name="please_connect">Tolong hubungkan aplikasi sebelum menggunakan widget</string>
+  <string name="about.title">Tentang Kami</string>
+  <string name="about.libraries">Pustaka</string>
+  <string name="about.versionhistory">Sejarah Versi</string>
+  <string name="about.habitica_open_source">Habitica tersedia sebagai perangkat lunak open source pada Github</string>
+  <string name="about.rate_our_app">Nilai Aplikasi kami</string>
+  <string name="about.give_us_feedback">Kirimkan kami Feedback!</string>
+  <string name="about.bugreport">Laporkan Gangguan</string>
+  <string name="about.source_code">Kode</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Koneksi Gagal</string>
+  <string name="network_error_no_network_body">Anda tidak terhubung ke internet.</string>
+  <string name="internal_error_api">Terdapat masalah pada server. Cobalah beberapa saat lagi.</string>
+  <string name="authentication_error_title">Autentikasi Gagal</string>
+  <string name="authentication_error_body">Username Anda dan/atau Kata Sandi salah.</string>
+  <string name="login_validation_error_title">Validasi Gagal</string>
+  <string name="login_validation_error_fieldsmissing">Anda harus mengisi semua kolom.</string>
+  <string name="save_changes">Simpan</string>
+  <string name="notes">Catatan</string>
+  <string name="text">Teks</string>
+  <string name="difficulty">Tingkat Kesulitan</string>
+  <string name="tags">Label</string>
+  <string name="trivial">Sangat Mudah</string>
+  <string name="easy">Mudah</string>
+  <string name="medium">Sedang</string>
+  <string name="hard">Susah</string>
+  <string name="start_date">Tanggal Mulai</string>
+  <string name="positive_habit_form">Positif (+)</string>
+  <string name="negative_habit_form">Negatif (-)</string>
+  <string name="checklist">Ceklis</string>
+  <string name="actions">Aksi</string>
+  <string name="attributes">Atribut</string>
+  <string name="physical">Fisik</string>
+  <string name="mental">Mental</string>
+  <string name="social">Sosial</string>
+  <string name="other">Lain-lain</string>
+  <string name="frequency">Frekuensi</string>
+  <string name="frequency_weekly">Pada Hari Tertentu dalam Seminggu</string>
+  <string name="frequency_daily">Setiap X Hari</string>
+  <string name="monday">Senin</string>
+  <string name="tuesday">Selasa</string>
+  <string name="wednesday">Rabu</string>
+  <string name="thursday">Kamis</string>
+  <string name="friday">Jumat</string>
+  <string name="saturday">Sabtu</string>
+  <string name="sunday">Minggu</string>
+  <string name="levelup_header">Kamu mendapatkan level!</string>
+  <string name="levelup_detail">Dengan menyelesaikan tujuan dunia-nyatamu, kamu meningkat ke Level %1$d!</string>
+  <string name="levelup_health">Kamu telah disembuhkan!</string>
+  <string name="levelup_button">Hore!</string>
+  <string name="faint_subtitle">Jangan bersedih!</string>
+  <string name="faint_penalty_body">Kamu kehilangan Level, Emasmu, dan sepotong Perlengkapan, tetapi kamu dapat mendapatkannya kembali dengan kerja keras! Semoga berhasil--kamu pasti bisa.</string>
+  <string name="faint_header">Kamu kehabisan Nyawa!</string>
+  <string name="filter">Filter</string>
+  <string name="profile_image">Gambar Profil</string>
+  <string name="mana_price_button" formatted="false">%d MP</string>
+  <string name="used_skill" formatted="false">Kamu menggunakan %1$s dengan %2$d mana.</string>
+  <string name="new_checklist_item">ceklis item baru</string>
+  <string name="add_checklist_item">Tambahkan</string>
+  <string name="reminder_title">Ingatlah untuk mencentang Keseharianmu!</string>
+  <string name="skill_progress_title">Gunakan Kemampuan</string>
+  <string name="coming_soon">Akan Datang</string>
+  <string name="chat_flag_confirmation">Apakah kamu yakin kamu ingin melaporkan pesan ini sebagai pelanggaran?</string>
+  <string name="flag_confirm">Laporkan Pesan</string>
+  <string name="unlock_lvl_11">Buka pada lvl 11</string>
+  <string name="no_party_message">Kamu tidak memiliki teman. Untuk mencari teman, tolong kunjungi situs.</string>
+  <string name="forgot_pw_btn">Lupa Kata Sandi</string>
+  <string name="forgot_pw_tv">Lupa Kata Sandi? Tolong gunakan Situs mobile</string>
+  <string name="tavern.inn.checkOut">Aktifkan kembali Keseharianmu</string>
+  <string name="tavern.inn.rest">Nonaktifkan Keseharianmu</string>
+  <string name="reward.dialog.buy">Beli</string>
+  <string name="reward.dialog.dismiss">Hilangkan</string>
+  <string name="party">Teman</string>
+  <string name="chat">Obrolan</string>
+  <string name="members">Anggota</string>
+  <string name="habits">Kebiasaan</string>
+  <string name="dailies">Keseharian</string>
+  <string name="todos">Tugas</string>
+  <string name="rewards">Hadiah</string>
+  <string name="taskform.delete.title">Apakah kamu yakin?</string>
+  <string name="taskform.delete.message">Apakah kamu benar-benar ingin menghapus?</string>
+  <string name="yes">Ya</string>
+  <string name="no">Tidak</string>
+  <string name="quest">Misi</string>
+  <string name="avatar_body">Tubuh</string>
+  <string name="avatar_hair">Rambut</string>
+  <string name="avatar_shirt">Baju</string>
+  <string name="avatar_skin">Kulit</string>
+  <string name="avatar_ears">Telinga Hewan</string>
+  <string name="avatar_base">Dasar</string>
+  <string name="avatar_color">Warna</string>
+  <string name="avatar_beard">Janggut</string>
+  <string name="avatar_mustache">Kumis</string>
+  <string name="avatar_flower">Bunga</string>
+  <string name="avatar_bangs">Poni</string>
+  <string name="avatar_nothing">Tidak ada yang digunakan</string>
+  <string name="avatar_size">Ukuran</string>
+  <string name="avatar_size_slim">Kurus</string>
+  <string name="avatar_size_broad">Bidang</string>
+  <string name="avatar_background">Latar Belakang</string>
+  <string name="purchase_customization">Beli Kustomisasi</string>
+  <string name="purchase_set_button" formatted="false">Buka set seharga %d permata</string>
+  <string name="purchase_button">Beli</string>
+  <string name="purchase_set_title" formatted="false">Beli set %s</string>
+  <string name="due_date">Tenggat Waktu</string>
+  <string name="quest.accept">Terima</string>
+  <string name="quest.reject">Tolak</string>
+  <string name="quest.begin">Mulai Misi</string>
+  <string name="quest.cancel">Batalkan Undangan</string>
+  <string name="quest.abort">Batalkan Misi</string>
+  <string name="quest.leave">Tinggalkan Misi</string>
+  <string name="quest.pending">Tunda</string>
+  <string name="quest.accepted">Diterima</string>
+  <string name="quest.rejected">Ditolak</string>
+  <string name="quest.participants">Partisipan</string>
+  <string name="version_info" formatted="false">Versi %s (%d)</string>
+  <string name="sidebar_help">Bantuan &amp; FAQ</string>
+  <string name="complete_tutorial">Aku mengerti!</string>
+  <string name="dismiss_tutorial">Peringatkan aku lagi</string>
+  <string name="intro_1_title">Selamat datang di Habitica</string>
+  <string name="intro_1_description">Bergabunglah dengan lebih dari 1.100.000 orang bersenang-senang dalam menyelesaikan tugas. Buatlah avatar dan catat tugas dunia-nyatamu.</string>
+  <string name="intro_2_title">Kemajuan dalam Permainan = Kemajuan dalam Hidup</string>
+  <string name="intro_2_description">Buka fitur dalam game dengan mencentang tugas harianmu. Dapatkan baju, peliharaan, dan banyak lagi untuk hadiahmu menyelesaikan tujuan!</string>
+  <string name="intro_3_title">Bersosialisasi sambil Mengalahkan Monster</string>
+  <string name="intro_3_description">Tetaplah berusaha meraih tujuan dengan bantuan teman-teman. Dukung satu sama lain dalam hidup dan bertarunglah sekaligus meningkatkan kehidupan bersama-sama!</string>
+  <string name="intro_finish_button">Mulai</string>
+  <string name="previous_button">Sebelumnya</string>
+  <string name="next_button">Berikutnya</string>
+  <string name="skip_button">Lewati</string>
+  <string name="setup_welcome_description">Selamat datang di Habitica, di mana meningkatkan diri dalam permainan akan meningkatkan kehidupan nyata! Seiring kamu menyelesaikan tujuan dunia-nyata, kamu akan membuka perlengkapan, peliharaan, misi, dan banyak lagi.</string>
+  <string name="setup_welcome_title">Selamat Datang</string>
+  <string name="avatar_setup_description">Pertama, kamu butuh avatar di dalam game untuk menggambarkan dirimu! Hal-hal yang kamu lakukan di dunia nyata akan mempengaruhi kesehatan, level pengalaman, dan emas avatarmu.</string>
+  <string name="task_setup_description">Keren! Sekarang mari mengatur tugas-tugasmu jadi kamu dapat mulai mendapatkan pengalaman dan emas.
+
+Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</string>
+  <string name="setup_group_work">Kerja</string>
+  <string name="setup_group_exercise">Latihan Fisik</string>
+  <string name="setup_group_heathWellness">Kesehatan + Kebaikan</string>
+  <string name="setup_group_school">Sekolah</string>
+  <string name="setup_group_teams">Tim</string>
+  <string name="setup_group_chores">Pekerjaan Rumah Tangga</string>
+  <string name="setup_group_creativity">Kreativitas</string>
+  <string name="setup_task_work_1">Proses Email</string>
+  <string name="setup_task_work_2">Tugas paling penting</string>
+  <string name="setup_task_work_3">Proyek Kerja</string>
+  <string name="setup_task_exercise_1">10 menit cardio</string>
+  <string name="setup_task_exercise_2">Pelemasan</string>
+  <string name="setup_task_exercise_3">Atur jadwan latihan</string>
+  <string name="setup_task_healthWellness_1">Makan makanan bergizi / cepat saji</string>
+  <string name="setup_task_healthWellness_2">Gunakan Benang Gigi</string>
+  <string name="setup_task_healthWellness_3">Periksa Jadwal</string>
+  <string name="setup_task_school_1">Belajar/Bermalas-malasan</string>
+  <string name="setup_task_school_2">Mengerjakan PR</string>
+  <string name="setup_task_school_3">Selesaikan tugas</string>
+  <string name="setup_task_teams_1">Periksa tim</string>
+  <string name="setup_task_teams_2">Perbaharui tim mengenai status</string>
+  <string name="setup_task_teams_3">Selesaikan proyek tim</string>
+  <string name="setup_task_chores_1">10 menit bersih-bersih</string>
+  <string name="setup_task_chores_2">Cuci Piring</string>
+  <string name="setup_task_chores_3">Rapikan lemari</string>
+  <string name="setup_task_creativity_1">Belajar menguasai kemampuan</string>
+  <string name="setup_task_creativity_2">Mengerjakan proyek kreatif</string>
+  <string name="setup_task_creativity_3">Menyelesaikan proyek kreatif</string>
+  <string name="gem.purchase.support">Ingin membantu kami menjaga Habitica tetap berjalan? Kamu dapat mendukung pengembang dengan membeli permata!\n\nPermata membuatmu dapat membeli aksesoris menarik untuk akunmu, termasuk: \n\n - Kostum keren untuk avatarmu\n - Latar belakang keren\n - Misi menarik yang memberimu hadiah telur peliharaan unik\n - Kemampuan untuk mengganti kelas sebelum level 100\n\nTerima kasih banyak untuk bantuan kepada Habitca untuk menjadi yang terbaik. Dukunganmu sangat berarti bagi kami!</string>
+  <string name="my_guilds">Perkumpulan Saya</string>
+  <string name="public_guilds">Perkumpulan Publik</string>
+  <string name="guild">Perkumpulan</string>
+  <string name="leave">Tinggalkan</string>
+  <string name="join">Gabung</string>
+  <string name="leader">Ketua</string>
+  <string name="gems">Permata</string>
+  <string name="copy_as_todo">Salin sebagai Tugas</string>
+  <string name="send_pm">Kirim PM</string>
+  <string name="flag">Tandai</string>
+  <string name="delete">Hapus</string>
+  <string name="name">Nama </string>
+  <string name="description">Deskripsi</string>
+  <string name="add_tag">Beri Label</string>
+  <string name="privacy">Privasi</string>
+  <string name="write_message">Tulis Pesan</string>
+  <string name="post">Kirim</string>
+  <string name="todo_due" formatted="false">Tenggat: %s</string>
+  <string name="daily_streak" formatted="false">%d kali berturut-turut</string>
+  <string name="todo_has_duedate">Tugas memiliki Tenggat Waktu</string>
+  <string name="battle_gear">Perlengkapan Bertarung</string>
+  <string name="costume">Kostum</string>
+  <string name="outfit_head">Kepala</string>
+  <string name="outfit_headAccessory">Aksesoris Kepala</string>
+  <string name="outfit_eyewear">Aksesori Mata</string>
+  <string name="outfit_armor">Baju Perang</string>
+  <string name="outfit_back">Punggung</string>
+  <string name="outfit_body">Tubuh</string>
+  <string name="outfit_shield">Perisai</string>
+  <string name="outfit_weapon">Senjata</string>
+  <string name="wear_costume">Gunakan Kostum</string>
+  <string name="equipped">Digunakan</string>
+  <string name="quest_cancel_message">Apakah kamu yakin kamu ingin membatalkan misi ini? Semua undangan yang disetujui akan hilang. Pemilik misi akan mendapatkan gulungan misi kembali.</string>
+  <string name="quest.invitation">Undangan Misi</string>
+  <string name="quest_begin_message">Apakah kamu yakin kamu ingin memulai misi? Setelah aktif, tidak ada anggota kelompok lain yang dapat bergabung.</string>
+  <string name="quest.invitation.text">Kamu telah diundang untuk berpartisipasi dalam misi!</string>
+  <string name="ago_1day">1 hari yang lalu</string>
+  <string name="ago_days" formatted="false">%d hari yang lalu</string>
+  <string name="ago_1Minute">1 menit yang lalu</string>
+  <string name="ago_minutes" formatted="false">%d menit yang lalu</string>
+  <string name="ago_hours" formatted="false">%d jam yang lalu</string>
+  <string name="ago_1hour">1 jam yang lalu</string>
+  <string name="today">Hari Ini</string>
+  <string name="sidebar_items">Item</string>
+  <string name="eggs">Telur</string>
+  <string name="hatching_potions">Ramuan Penetas</string>
+  <string name="food">Makanan</string>
+  <string name="quests">Misi</string>
+  <string name="pets">Peliharaan</string>
+  <string name="mounts">Tunggangan</string>
+  <string name="armoireEquipment" formatted="false">Kamu menemukan perlengkapan langka di dalam Peti Harta Karun: %s! Keren!</string>
+  <string name="armoireFood" formatted="false">Kamu mengacak-acak Peti Harta Karun dan menemukan %2$s %1$s. Kenapa berada di dalam sini, ya?</string>
+  <string name="armoireExp">Kamu bergulat dengan Peti Harta Karun dan mendapatkan Pengalaman. Rasakan itu!</string>
+  <string name="armoireNotesFull" formatted="false">Buka Peti Harta Karun untuk mendapatkan perlengkapan spesial, Pengalaman, atau makanan secara acak! Perlengkapan yang tersisa: %d</string>
+  <string name="armoireLastItem">Kamu menemukan perlengkapan terakhir di dalam Peti Harta Karun.</string>
+  <string name="armoireNotesEmpty">Peti Harta Karun akan memiliki perlengkapan baru pada minggu pertama setiap bulan. Sementara itu, tetaplah klik untuk mendapatkan Pengalaman dan Makanan!</string>
+  <string name="sell" formatted="false">Jual (%s Emas)</string>
+  <string name="hatch_with_potion">Tetaskan dengan ramuan</string>
+  <string name="feed_to_pet">Beri makan peliharaan</string>
+  <string name="hatch_egg">Tetaskan dengan telur</string>
+  <string name="invite_party">Undang teman</string>
+  <string name="dialog_feeding" formatted="false">Beri makan %2$s %1$s dengan:</string>
+  <string name="use_animal">Gunakan</string>
+  <string name="feed">Beri makan</string>
+  <string name="hatch_with" formatted="false">Tetaskan dengan %s</string>
+  <string name="hatched_pet_title" formatted="false">Kamu menetaskan seekor %2$s %1$s!</string>
+  <string name="close">Tutup</string>
+  <string name="share">Bagikan</string>
+  <string name="notification_pet_fed" formatted="false">Kamu memberi makan %2$s %1$s !</string>
+  <string name="notification_purchase" formatted="false">%s telah dibeli</string>
+  <string name="sectionpets">Peliharaan Dasar</string>
+  <string name="sectionpremiumPets">Peliharaan Ramuan Ajaib</string>
+  <string name="sectionquestPets">Peliharaan Misi</string>
+  <string name="sectionspecialPets">Peliharaan Langka</string>
+  <string name="sectionmounts">Tunggangan Dasar</string>
+  <string name="sectionpremiumMounts">Tunggangan Ramuan Ajaib</string>
+  <string name="sectionquestMounts">Tunggangan Misi</string>
+  <string name="sectionspecialMounts">Tunggangan Langka</string>
+  <string name="world_quest">Misi Dunia</string>
+  <string name="inn_description">Beristirahat di dalam Penginapan untuk mencegah Keseharian yang belum selesai menyakitimu semalaman! (Catatan: tidak dapat mencegahmu mendapatkan serangan Bos Monster.)</string>
+  <string name="empty_items" formatted="false">Kamu tidak memiliki %s</string>
+  <string name="user_level" formatted="false">LVL %s</string>
+  <string name="user_level_with_class" formatted="false">LVL %1$s - %2$s</string>
+  <string name="warrior">Prajurit</string>
+  <string name="rogue">Perampok</string>
+  <string name="mage">Penyihir</string>
+  <string name="healer">Penyembuh</string>
+  <string name="warrior_description">Prajurit mendapatkan skor lebih dan \'serangan kritis\' lebih baik, yang akan secara acak memberikan bonus Emas, Pengalaman, dan kesempatan menemukan item saat menyelesaikan tugas. Mereka juga memberikan serangan berat kepada bos monster. Mainkan Perampok jika kamu termotivasi dengan hadiah bergaya jackpot yang sulit diprediksi, atau ingin memberikan serangan besar kepada bos misi!</string>
+  <string name="mage_description">Penyihir belajar dengan cepat, mendapatkan Pengalaman dan Level lebih cepat daripada kelas lainnya. Mereka juga mendapatkan Mana yang besar dengan menggunakan kemampuan spesial. Mainkan penyihir jika kamu menyukai aspek taktis dari permainan Kebiasaan, atau jika kamu begitu termotivasi dengan meningkatkan level dan membuka fitur baru!</string>
+  <string name="rogue_description">Perampok senang mengumpulkan kekayaan, mendapatkan banyak Emas daripada yang lainnya, dan mahir menemukan item acak. Kemampuan Bersembunyi mereka yang terkenal membuat mereka mampu menghindari konsekuensi dari Keseharian yang terlewat. Mainkan Perampok jika kamu termotivasi dengan Hadiah dan Pencapaian, juga mendapatkan banyak barang jarahan dan lencana!</string>
+  <string name="healer_description">Penyembuh tahan terhadap serangan, dan dapat membagi perlindungannya pada sesama. Keseharian yang terlewat dan kebiasaan buruk tidak terlalu banyak mengganggu mereka, dan mereka memiliki cara untuk mengembalikan nyawa dari kesalahan mereka. Mainkan seorang Penyembuh jika kamu senang membantu teman dalam kelompok, atau ide mencurangi kematian dengan kerja keras membuatmu terinspirasi!</string>
+  <string name="select_class">Pilih Profesi</string>
+  <string name="opt_out_class">Matikan Fitur</string>
+  <string name="opt_out_description">Tidak ingin diganggu dengan profesi? Ingin memilih nanti saja? Matikan fitur - kamu akan menjadi seorang Prajurit tanpa kemampuan spesial. Kamu dapat membaca mengenai sistem profesi nanti di wiki dan mengaktifkan fitur profesi kapan saja.</string>
+  <string name="class_confirmation" formatted="false">Apakah kamu yakin ingin menjadi seorang %s?</string>
+  <string name="choose_class">Pilih Kelas</string>
+  <string name="dialog_go_back">Kembali</string>
+  <string name="opt_out_confirmation">Apakah kamu yakin kamu ingin mematikan fitur?</string>
+  <string name="change_class">Ganti profesi</string>
+  <string name="enable_class">Aktifkan Sistem Profesi</string>
+  <string name="changing_class_progress">Ganti Profesi</string>
+  <string name="by_email">Melalui Email</string>
+  <string name="invite_existing_users">Undang Pengguna yang telah ada</string>
+  <string name="send">Kirim</string>
+  <string name="invite">Undang Teman</string>
+  <string name="invite_id_description">Jika kamu memiliki teman yang telah menggunakan Habitica, undang melalui ID Pengguna di sini.</string>
+  <string name="invite_email_description">Jika seorang teman bergabung dengan Habitica melalui emailmu, mereka otomatis akan diundang ke dalam kelompokmu!</string>
+  <string name="add_invites">Tambahkan Undangan</string>
+  <string name="user_id">ID Pengguna</string>
+  <string name="email">Email</string>
+  <string name="invite_users">Undang sebagai Teman</string>
+  <string name="share_using">Bagikan dengan</string>
+  <string name="share_levelup" formatted="false">Saya naik level %s di Habitica dengan meningkatkan kebiasaan kehidupan-nyata saya!</string>
+  <string name="share_hatched" formatted="false">Saya menetaskan peliharaan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya! </string>
+  <string name="share_raised" formatted="false">Saya baru mendapatkan tunggangan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya!</string>
+</resources>
diff --git a/Habitica/res/values-iw/strings.sidebar.xml b/Habitica/res/values-iw/strings.sidebar.xml
new file mode 100644
index 000000000..67a835b31
--- /dev/null
+++ b/Habitica/res/values-iw/strings.sidebar.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="sidebar.tasks">משימות</string>
+  <string name="sidebar.skills">מיומניויות</string>
+  <string name="sidebar.section.social">חברתי</string>
+  <string name="sidebar.inbox">דואר נכנס</string>
+  <string name="sidebar.tavern">פונדק</string>
+  <string name="sidebar.party">חבורה</string>
+  <string name="sidebar.purchaseGems">קנה אבני חן</string>
+  <string name="sidebar.guilds">גילדות</string>
+  <string name="sidebar.challenges">אתגרים</string>
+  <string name="sidebar.section.inventory">מלאי ציוד</string>
+  <string name="sidebar.avatar">דמות</string>
+  <string name="sidebar.equipment">ציוד</string>
+  <string name="sidebar.stable">אורווה</string>
+  <string name="sidebar.news">חדשות</string>
+  <string name="sidebar.settings">הגדרות</string>
+  <string name="sidebar.about">אודות</string>
+</resources>
diff --git a/Habitica/res/values-iw/strings.tutorial.xml b/Habitica/res/values-iw/strings.tutorial.xml
new file mode 100644
index 000000000..129a2757d
--- /dev/null
+++ b/Habitica/res/values-iw/strings.tutorial.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_habits">השלימו הרגלים חיוביים כדי לזכות בזהב וניסיון! הרגלים רעים יפגעו בדמות שלכם אם תלחצו עליהם, אז המנעו מהם בחיים האמיתיים!</string>
+  <string name="tutorial_dailies">הביסו את המטלות היומיות שלכם כדי לזכות בזהב וניסיון. זהירות! מטלות יומיות יפגעו בדמות שלכם אם אתם לא משלימים אותן בזמן.</string>
+  <string name="tutorial_todos">השלימו את המטרות שלכם בחיים האמיתיים, ולאחר מכן סמנו שהושלמו כדי לקבל זהב וניסיון - כך שתוכלו להרוויח פרסים ולאפשר יכולות נוספות במשחק!</string>
+  <string name="tutorial_rewards">אלו הם הפרסים שלכם! הרוויחו זהב על-ידי השלמת הרגלים, מטלות יומיות ומטרות בעולם האמיתי. ואז בזבזו אותו על פרסים במשחק או פרסים שהתאמתם לעצמכם אישית בעולם האמיתי!</string>
+  <string name="tutorial_equipment">כאשר אתם קונים ציוד הוא מופיע כאן. ציוד הקרב שלכם משפיע על תכונות, והתחפושת שלכם (אם מאופשרת) משפיעה על הלבוש של הדמות שלכם.</string>
+  <string name="tutorial_items">הרוויחו חפצים על-ידי השלמת משימות ועלייה בדרגות. לחצו על חפץ כדי להשתמש בו!</string>
+  <string name="tutorial_pets">בזמן שאתם משלימים משימות בעולם האמיתי, יש לכם סיכוי למצוא ביצים ושיקויים. שלבו אותם כדי להבקיע חיות מחמד</string>
+  <string name="tutorial_skills">מיומנויות הן יכולות מיוחדות בעלות השפעה עוצמתית! לחצו על מיומנות כדי להשתמש בה. היא תעלה לכם מאנה (המד הכחול), שתרוויחו על ידי סימון משימות מידי יום ועל ידי השלמת משימות בחיים האמיתיים. בידקו את השאלות הנפוצות בתפריט למידע נוסף!</string>
+  <string name="tutorial_party">זה המקום בו אתם וחבריכם יכולים לישמור על עצמכם מחוייבים למטרות ולהלחם במפלצות עם המשימות שלכם!</string>
+  <string name="tutorial_tavern">ברוכים הבאים לפונדק, צ׳אט פומבי לכל הגילאים! כאן תוכלו לדבר על פרודוקטיביות ולשאול שאלות. תהנו!</string>
+  <string name="tutorial_classes">ביחרו להיות לוחמים, מכשפים, מרפאים או נוכלים! לכל מקצוע ציוד ומיומנויות משלו. לחצו על ה (?) כדי ללמוד עוד!</string>
+</resources>
diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml
new file mode 100644
index 000000000..69da3c49b
--- /dev/null
+++ b/Habitica/res/values-iw/strings.xml
@@ -0,0 +1,328 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">האביטיקה</string>
+  <string name="action_refresh">ריענון</string>
+  <string name="XP_default">ניסיון</string>
+  <string name="HP_default">בריאות</string>
+  <string name="MP_default">מאנה</string>
+  <string name="ERR_pb_barcode">העדפות לא הצליחו להטען מהבר-קוד</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">הגדרות</string>
+  <string name="SP_address_hint">שרת מותאם אישית אליכם</string>
+  <string name="SP_userID_title">מזהה משתמש</string>
+  <string name="SP_userID_summary">מזהה המשתמש שלכם</string>
+  <string name="SP_APIToken_title">מפתח API</string>
+  <string name="SP_APIToken_summary">מפתח ה API שלכם</string>
+  <string name="PS_contact_title">צרו איתי קשר</string>
+  <string name="unknown_error">ארעה תקלה...</string>
+  <string name="pref_account_header">חשבון</string>
+  <string name="pref_reminder_header">תזכורת יומית</string>
+  <string name="pref_reminder_checkbox">הפעל תזכורת</string>
+  <string name="pref_reminder_picker">קבע מועד תזכורת</string>
+  <!--Adding tasks-->
+  <string name="task_value">ערך</string>
+  <string name="new_todo">מטרה חדשה</string>
+  <string name="new_reward">פרס חדש</string>
+  <string name="new_daily">מטלה יומית חדשה</string>
+  <string name="new_habit">הרגל חדש</string>
+  <string name="action_edit">עריכה</string>
+  <string name="action_delete">מחיקה</string>
+  <string name="action_cancel">ביטול</string>
+  <string name="login_btn">התחברות</string>
+  <string name="register_btn">הרשמו</string>
+  <string name="username">שם משתמש</string>
+  <string name="email_username">כתובת מייל או שם משתמש</string>
+  <string name="password">סיסמה</string>
+  <string name="emailAddress">כתובת דואר אלקטרוני</string>
+  <string name="confirmpassword">אמתו סיסמה</string>
+  <string name="logout">התנתקות</string>
+  <string name="logout_description">התנתקו מהחשבון שלכם</string>
+  <string name="account_details">פרטי חשבון</string>
+  <string name="LoginActivityName">ברוכים הבאים</string>
+  <string name="string_revive">קומו לתחייה</string>
+  <string name="please_connect">אנא התחברו דרך האפליקציה לפני שאתם משתמשים בוויג׳ט</string>
+  <string name="about.title">אודות</string>
+  <string name="about.libraries">ספריות</string>
+  <string name="about.versionhistory">היסטוריית גרסאות</string>
+  <string name="about.habitica_open_source">האביטיקה זמינה כתוכנה במקור פתוח בגיטהאב</string>
+  <string name="about.rate_our_app">דרגו את האפליקציה שלנו</string>
+  <string name="about.give_us_feedback">שלחו לנו משוב!</string>
+  <string name="about.bugreport">דווחו על תקלה</string>
+  <string name="about.source_code">קוד מקור</string>
+  <!--Network Errors-->
+  <string name="network_error_title">תקלת התחברות</string>
+  <string name="network_error_no_network_body">אינכם מחוברים לאינטרנט</string>
+  <string name="internal_error_api">נראה שיש בעיה עם השרת. אנא נסו מאוחר יותר.</string>
+  <string name="authentication_error_title">תקלת אימות</string>
+  <string name="authentication_error_body">שם המשתמש שלכם או הסיסמה שגויים.</string>
+  <string name="login_validation_error_title">שגיאת אימות</string>
+  <string name="login_validation_error_fieldsmissing">עליכם למלא את כל השדות.</string>
+  <string name="save_changes">שמור</string>
+  <string name="notes">הערות</string>
+  <string name="text">טקסט</string>
+  <string name="difficulty">רמת קושי</string>
+  <string name="tags">תגיות</string>
+  <string name="trivial">טריוויאלי</string>
+  <string name="easy">קל</string>
+  <string name="medium">בינוני</string>
+  <string name="hard">קשה</string>
+  <string name="start_date">תאריך התחלה</string>
+  <string name="positive_habit_form">חיובי ( + )</string>
+  <string name="negative_habit_form">שלילי ( - )</string>
+  <string name="checklist">רשימה</string>
+  <string name="reminders">תזכורות</string>
+  <string name="actions">פעולות</string>
+  <string name="attributes">תכונות</string>
+  <string name="physical">פיזי</string>
+  <string name="mental">שכלי</string>
+  <string name="social">חברתי</string>
+  <string name="other">אחר</string>
+  <string name="frequency">תדירות</string>
+  <string name="frequency_weekly">בימים מסויימים בשבוע</string>
+  <string name="frequency_daily">כל X ימים</string>
+  <string name="monday">שני</string>
+  <string name="tuesday">שלישי</string>
+  <string name="wednesday">רביעי</string>
+  <string name="thursday">חמישי</string>
+  <string name="friday">שישי</string>
+  <string name="saturday">שבת</string>
+  <string name="sunday">ראשון</string>
+  <string name="levelup_header">עליתם דרגה!</string>
+  <string name="levelup_detail">על-ידי הגשמת היעדים שלכם מהעולם האמיתי, הגעתם לדרגה %1$d!</string>
+  <string name="levelup_health">נרפאתם לחלוטין!</string>
+  <string name="levelup_button">ישש!</string>
+  <string name="faint_subtitle">אל ייאוש!</string>
+  <string name="faint_penalty_body">הפסדתם דרגה, זהב, וחפץ, אך אתם יכולים להשיג אותם שוב עם עבודה קשה! בהצלחה--אתם תצליחו.</string>
+  <string name="faint_header">נגמרה לכם הבריאות!</string>
+  <string name="faint_button">מלאו בריאות ונסו מחדש</string>
+  <string name="filter">מסנן</string>
+  <string name="profile_image">תמונת פרופיל</string>
+  <string name="mana_price_button" formatted="false">%d מאנה</string>
+  <string name="used_skill" formatted="false">השתמשתם ב %1$s בעבור %2$d מאנה.</string>
+  <string name="new_checklist_item">שורה חדשה לרשימה</string>
+  <string name="add_checklist_item">הוסף</string>
+  <string name="reminder_title">זיכרו לסמן את המטלות היומיות!</string>
+  <string name="skill_progress_title">שימוש ביכולת</string>
+  <string name="coming_soon">יגיע בקרוב</string>
+  <string name="chat_flag_confirmation">האם אתם בטוחים שאתם מעוניינים לדווח על ההודעה הזו?</string>
+  <string name="flag_confirm">סמן הודעה</string>
+  <string name="unlock_lvl_11">משתחרר בדרגה 11</string>
+  <string name="no_party_message">אתם לא בחבורה. כדי להצטרף לחבורה, בקרו באתר.</string>
+  <string name="forgot_pw_btn">שכחתי סיסמה</string>
+  <string name="forgot_pw_tv">שחכתם סיסמה? אנא השתמשו בגרסת האתר לניידים.</string>
+  <string name="tavern.inn.checkOut">הפעילו מחדש את המטלות היומיות שלכם</string>
+  <string name="tavern.inn.rest">עצרו את המטלות היומיות שלכם</string>
+  <string name="reward.dialog.buy">קנייה</string>
+  <string name="reward.dialog.dismiss">בטל</string>
+  <string name="party">חבורה</string>
+  <string name="chat">צ׳אט</string>
+  <string name="members">חברים</string>
+  <string name="habits">הרגלים</string>
+  <string name="dailies">מטלות יומיות</string>
+  <string name="todos">מטרות</string>
+  <string name="rewards">פרסים</string>
+  <string name="taskform.delete.title">האם אתם בטוחים?</string>
+  <string name="taskform.delete.message">האם אתם באמת רוצים למחוק?</string>
+  <string name="yes">כן</string>
+  <string name="no">לא</string>
+  <string name="quest">הרפתקאה</string>
+  <string name="avatar_body">גוף</string>
+  <string name="avatar_hair">שיער</string>
+  <string name="avatar_shirt">חולצה</string>
+  <string name="avatar_skin">עור</string>
+  <string name="avatar_ears">אוזני חיות</string>
+  <string name="avatar_base">בסיס</string>
+  <string name="avatar_color">צבע</string>
+  <string name="avatar_beard">זקן</string>
+  <string name="avatar_mustache">שפם</string>
+  <string name="avatar_flower">פרח</string>
+  <string name="avatar_bangs">טלטלים</string>
+  <string name="avatar_nothing">לא קבוע</string>
+  <string name="avatar_size">גודל</string>
+  <string name="avatar_size_slim">רזה</string>
+  <string name="avatar_size_broad">רחב</string>
+  <string name="avatar_background">רקע</string>
+  <string name="purchase_customization">ריכשו התאמה אישית</string>
+  <string name="purchase_set_button" formatted="false">שחררו סט בעבור %d אבני חן</string>
+  <string name="purchase_button">קנייה</string>
+  <string name="purchase_set_title" formatted="false">קנו סט %s</string>
+  <string name="due_date">תאריך יעד</string>
+  <string name="quest.accept">קבלו</string>
+  <string name="quest.reject">דחו</string>
+  <string name="quest.begin">התחילו הרפתקאה</string>
+  <string name="quest.cancel">בטלו הזמנה</string>
+  <string name="quest.abort">הפסיקו את ההרפתקאה</string>
+  <string name="quest.leave">עיזבו הרפתקאה</string>
+  <string name="quest.pending">ממתין</string>
+  <string name="quest.accepted">התקבל</string>
+  <string name="quest.rejected">נדחה</string>
+  <string name="quest.participants">משתתפים</string>
+  <string name="version_info" formatted="false">גרסה %s (%d)</string>
+  <string name="sidebar_help">עזרה ושאלות נפוצות</string>
+  <string name="complete_tutorial">הבנתי!</string>
+  <string name="dismiss_tutorial">הזכר לי שוב</string>
+  <string name="intro_1_title">ברוכים הבאים להאביטיקה</string>
+  <string name="intro_1_description">הצטרפו ללמעלה מ 1,100,000 אנשים שנהנים בזמן שהם גורמים לדברים לקרות. צרו דמות ועיקבו אחר משימותיכם מהעולם האמיתי.</string>
+  <string name="intro_2_title">התקדמות במשחק = התקדמות בחיים</string>
+  <string name="intro_2_description">אפשרו יכולות של המשחק על ידי סימון שהשלמתם משימות בעולם האמיתי. הרוויחו שיריון, חיות מחמד, ועוד - כדי לתגמל את עצמכם על עמידה ביעדים!</string>
+  <string name="intro_3_title">היו חברותיים והילחמו במפלצות</string>
+  <string name="intro_3_description">שימרו על קצב התקדמות עם עזרה מחבריכם. תימכו אחד בשני בחיים ובקרב ככל שאתם משתפרים ביחד!</string>
+  <string name="intro_finish_button">התחילו</string>
+  <string name="previous_button">קודם</string>
+  <string name="next_button">הבא</string>
+  <string name="skip_button">דלגו</string>
+  <string name="setup_welcome_description">ברוכים הבאים להאביטיקה, המקום בו התקדמות במשחק תשפר אתכם בחיים האמיתיים! ככל שאתם משיגים יעדים בעולם האמיתי, תשחררו ציוד, חיות מחמד, הרפתקאות, ועוד.</string>
+  <string name="setup_welcome_title">ברוכים הבאים</string>
+  <string name="avatar_setup_description">ראשית, אתם צריכים דמות במשחק כדי לייצג אתכם! הדברים שאתם עושים בחיים האמיתיים ישפיעו על בריאות הדמות שלכם, הניסיון והזהב שלה.</string>
+  <string name="task_setup_description">נהדר! עכשיו בואו נקבע את המשימות שלכם כדי שתתחילו להרוויח ניסיון וזהב.
+
+כדי להתחיל, איזה חלקים בחייכם תרצו לשפר?</string>
+  <string name="setup_group_work">עבודה</string>
+  <string name="setup_group_exercise">התעמלות</string>
+  <string name="setup_group_heathWellness">בריאות + אורח חיים</string>
+  <string name="setup_group_school">בית-ספר</string>
+  <string name="setup_group_teams">קבוצות</string>
+  <string name="setup_group_chores">מטלות</string>
+  <string name="setup_group_creativity">יצירתיות</string>
+  <string name="setup_task_work_1">לטפל במיילים</string>
+  <string name="setup_task_work_2">המשימה החשובה ביותר</string>
+  <string name="setup_task_work_3">פרוייקט לעבודה</string>
+  <string name="setup_task_exercise_1">10 דקות אירובי</string>
+  <string name="setup_task_exercise_2">מתיחות</string>
+  <string name="setup_task_exercise_3">לקבוע תוכנית אימונים</string>
+  <string name="setup_task_healthWellness_1">אכול בריא / ג׳אנק פוד</string>
+  <string name="setup_task_healthWellness_2">חוט-דנטלי</string>
+  <string name="setup_task_healthWellness_3">קבע בדיקה</string>
+  <string name="setup_task_school_1">לימודים/דחיינות</string>
+  <string name="setup_task_school_2">עשה שיעורי בית</string>
+  <string name="setup_task_school_3">סיים משימה לשיעור</string>
+  <string name="setup_task_teams_1">בדוק מה המצב עם הצוות</string>
+  <string name="setup_task_teams_2">עדכן את הצוות על המצב</string>
+  <string name="setup_task_teams_3">השלם פרוייקט צוותי</string>
+  <string name="setup_task_chores_1">10 דקות ניקיונות</string>
+  <string name="setup_task_chores_2">שטוף כלים</string>
+  <string name="setup_task_chores_3">סדר את הארון</string>
+  <string name="setup_task_creativity_1">לימדו אשף של המלאכה</string>
+  <string name="setup_task_creativity_2">עבוד על פרוייקט יצירתי</string>
+  <string name="setup_task_creativity_3">סיים פרוייקט יצירתי</string>
+  <string name="gem.purchase.support">רוצים לסייע לנו לשמור על האביטיקה באוויר? אתם יכולים לתמוך במפתחים על ידי רכישה של אבני חן!\n\nאבני חן מאפשרות לכם לרכוש תוספות מהנות לחשבון שלכם, כולל: \n\n - תחפושות מגניבות לדמות שלכם\n - רקעים מדהימים\n - הרפתקאות כיפיות שיתגמלו אתכם עם ביצי חיות מחמד\n - היכולת לשנות את מקצוע הדמות שלכם לפני דרגה 100\n\nתודה רבה על העזרה שלכם להפוך את האביטיקה להכי טובה שהיא יכולה להיות. התמיכה שלכם היא מאוד משמעותית מבחינתנו!</string>
+  <string name="my_guilds">הגילדות שלי</string>
+  <string name="public_guilds">גילדות פומביות</string>
+  <string name="guild">גילדה</string>
+  <string name="leave">עיזבו</string>
+  <string name="join">הצטרפו</string>
+  <string name="leader">מנהיג</string>
+  <string name="gems">אבני חן</string>
+  <string name="copy_as_todo">העתקה כמשימה</string>
+  <string name="send_pm">שילחו הודעה פרטית</string>
+  <string name="flag">דיווח</string>
+  <string name="delete">מחיקה</string>
+  <string name="name">שם</string>
+  <string name="description">תיאור</string>
+  <string name="add_tag">הוסיפו תגית</string>
+  <string name="privacy">פרטיות</string>
+  <string name="write_message">כיתבו הודעה</string>
+  <string name="post">שליחה</string>
+  <string name="todo_due" formatted="false">חל: %s</string>
+  <string name="daily_streak" formatted="false">רצף נוכחי: %d</string>
+  <string name="todo_has_duedate">למשימה יש תאריך יעד</string>
+  <string name="battle_gear">ציוד קרב</string>
+  <string name="costume">תחפושת</string>
+  <string name="outfit_head">ראש</string>
+  <string name="outfit_headAccessory">אביזר ראש</string>
+  <string name="outfit_eyewear">משקפיים</string>
+  <string name="outfit_armor">שריון</string>
+  <string name="outfit_back">חזרה</string>
+  <string name="outfit_body">גוף</string>
+  <string name="outfit_shield">מגן</string>
+  <string name="outfit_weapon">נשק</string>
+  <string name="wear_costume">ליבשו תחפושת</string>
+  <string name="equipped">מצוייד</string>
+  <string name="quest_cancel_message">האם אתם בטוחים שאתם מעוניינים להפסיק את ההרפתקאה הזו? כל אישורי ההזמנות יאבדו. הבעלים של ההרפתקאה ימשיכו להחזיק במגילת ההרפתקאה.</string>
+  <string name="quest.invitation">הזמנה להרפתקאה</string>
+  <string name="quest_begin_message">האם אתם בטוחים שאתם מעוניינים להתחיל בהרפתקאה? ברגע שהיא מתחילה, חברי חבורה נוספים לא יכולים להצטרף אליה.</string>
+  <string name="quest.invitation.text">הוזמנתם להשתתף בהרפתקאה!</string>
+  <string name="ago_1day">לפני יום</string>
+  <string name="ago_days" formatted="false">לפני %d ימים</string>
+  <string name="ago_1Minute">לפני דקה</string>
+  <string name="ago_minutes" formatted="false">לפני %d דקות</string>
+  <string name="ago_hours" formatted="false">לפני %d שעות</string>
+  <string name="ago_1hour">לפני שעה</string>
+  <string name="today">היום</string>
+  <string name="sidebar_items">חפצים</string>
+  <string name="eggs">ביצים</string>
+  <string name="hatching_potions">שיקויי הבקעה</string>
+  <string name="food">אוכל</string>
+  <string name="quests">הרפתקאות</string>
+  <string name="pets">חיות מחמד</string>
+  <string name="mounts">חיות רכיבה</string>
+  <string name="armoireEquipment" formatted="false">מצאתם חתיכת ציוד נדיר בארמואר: %s! מגניב!</string>
+  <string name="armoireFood" formatted="false">אתם נוברים בארמואר ומוצאים %1$s %2$s. מה זה עושה פה?</string>
+  <string name="armoireExp">אתם נאבקים בארמואר וצוברים ניסיון. קבלו!</string>
+  <string name="armoireNotesFull" formatted="false">פתחו את הארמואר כדי לקבל ציוד מיוחד אקראי, ניסיון, או אוכל! חתיכות ציוד שנותרו: %d</string>
+  <string name="armoireLastItem">מצאתם את חתיכת הציוד הנדיר האחרונה בארמואר הקסום.</string>
+  <string name="armoireNotesEmpty">הארמואר יכיל ציוד חדש בשבוע הראשון של כל חודש. עד אז, המשיכו ללחוץ כדי לקבל ניסיון ואוכל!</string>
+  <string name="sell" formatted="false">מיכרו (%s זהב)</string>
+  <string name="hatch_with_potion">הבקיעו עם שיקוי</string>
+  <string name="feed_to_pet">האכילו חיית מחמד</string>
+  <string name="hatch_egg">הבקיעו עם ביצה</string>
+  <string name="invite_party">הזמינו חבורה</string>
+  <string name="dialog_feeding" formatted="false">האכלתם %1$s %2$s עם:</string>
+  <string name="use_animal">השתמשו</string>
+  <string name="feed">האכילו</string>
+  <string name="hatch_with" formatted="false">הבקיעו חיית מחמד עם %s</string>
+  <string name="hatched_pet_title" formatted="false">הבקעתם %1$s %2$s!</string>
+  <string name="close">סיגרו</string>
+  <string name="share">שתפו</string>
+  <string name="notification_pet_fed" formatted="false">האכלתם את ה %1$s %2$s שלכם!</string>
+  <string name="notification_purchase" formatted="false">%s נקנה</string>
+  <string name="sectionpets">חיות מחמד רגילות</string>
+  <string name="sectionpremiumPets">חיות מחמד משיקויים קסומים</string>
+  <string name="sectionquestPets">חיות מחמד מהרפתקאות</string>
+  <string name="sectionspecialPets">חיות מחמד נדירות</string>
+  <string name="sectionmounts">חיות רכיבה רגילות</string>
+  <string name="sectionpremiumMounts">חיות רכיבה משיקויים קסומים</string>
+  <string name="sectionquestMounts">חיות רכיבה מהרפתקאות</string>
+  <string name="sectionspecialMounts">חיות רכיבה נדירות</string>
+  <string name="world_quest">הרפתקאה עולמית</string>
+  <string name="inn_description">נוחו באכסנייה כדי למנוע ממטלות יומיות לא מושלמות לפגוע בכם במהלך הלילה! (שימו לב: לא מונע מכם להפגע מאוייבים.)</string>
+  <string name="empty_items" formatted="false">אין לכם כל %s</string>
+  <string name="user_level" formatted="false">דרגה %s</string>
+  <string name="user_level_with_class" formatted="false">דרגה %1$s - %2$s</string>
+  <string name="warrior">לוחם</string>
+  <string name="rogue">נוכל</string>
+  <string name="mage">מכשף</string>
+  <string name="healer">מרפא</string>
+  <string name="warrior_description">לוחמים גורמים ליותר ״פגיעות קריטיות״, שבאקראיות נותנות בונוס זהב, ניסיון, וסיכוי ל״נפילה״ בהשלמה של משימה. הם גם גורמים לנזק כבד לאוייבים. שחקו לוחמים אם אתם מקבלים מוטיבציה מזכיות אקראיות בסגנון של מכונת מזל, או אם אתם רוצים לגרום לכאב בהרפתקאות אוייבים!</string>
+  <string name="mage_description">מכשפים לומדים במהירות, וזוכים בניסיון ודרגות מהר יותר ממקצועות אחרים. הם גם מקבלים מנות גדולות של מאנה שמשמשות ליכולות מיוחדות. שחקו כמכשפים אם אתם נהנים מהצדדים הטקטיים של האביט, או אם עליה בדרגות והיבטים מתקדמים של המשחק הם גורמים שמדרבנים אתכם.</string>
+  <string name="rogue_description">נוכלים אוהבים לצבור עושר, זוכים ביותר זהב מכל בעל-מקצוע אחר, ומוכוונים למציאת חפצים אקראיים. יכולת ההתגנבות המפורסמת שלהם מאפשרת להם להתחמק מההשלכות של מטלות יומיות מפוספסות. שחקו בדמות של נוכל אם מדרבן אתכם לקבל פרסים, הישגים, שלל ועיטורים!</string>
+  <string name="healer_description">מרפאים הם עמידים בפני פגיעות, וחולקים את היכולת הזו עם אחרים. מטלות יומיות מפוספסות והרגלים רעים לא מבלבלים אותם כל כך, ויש להם יכולת להתאושש מכשלונות. שחקו במקצוע המרפא אם אתם נהנים לסייע לעמיתיכם לחבורה, או אם הרעיון של התחמקות ממוות דרך עבודה קשה מעורר בכם השראה!</string>
+  <string name="select_class">בחרו מקצוע</string>
+  <string name="opt_out_class">וותרו</string>
+  <string name="opt_out_description">לא מעניינים אתכם מקצועות? רוצים לבחור מאוחר יותר? וותרו - תהיו לוחמים ללא תכונות מיוחדות. תוכלו לקראו על מערכת המקצועות מאוחר יותר בוויקי ולאפשר מקצועות בכל שעה.</string>
+  <string name="class_confirmation" formatted="false">האם אתם בטוחים שברצונכם להיות %s?</string>
+  <string name="choose_class">בחרו מקצוע</string>
+  <string name="dialog_go_back">חזרה</string>
+  <string name="opt_out_confirmation">האם אתם בטוחים שאתם מעוניינים לוותר?</string>
+  <string name="change_class">שנו את המקצוע שלכם</string>
+  <string name="change_class_description">החליפו מקצוע וקבלו בחזרה את נקודות התכונה תמורת 3 אבני חן. תוכלו להקצות את נקודות התכונה מחדש דרך האתר.</string>
+  <string name="enable_class">אפשרו את מערכת המקצועות</string>
+  <string name="changing_class_progress">שנו מקצוע</string>
+  <string name="by_email">באמצעות מייל</string>
+  <string name="invite_existing_users">הזמינו משתמשים קיימים</string>
+  <string name="send">שילחו</string>
+  <string name="invite">הזמינו חברים</string>
+  <string name="invite_id_description">אם יש לכם חברים שכבר משתמשים בהאביטיקה, הזמינו אותם באמצעות מזהה המשתמש כאן.</string>
+  <string name="invite_email_description">אם חברים מצטרפים להאביטיקה באמצעות מייל שלכם, הם אוטומטית יוזמנו לחבורה שלכם!</string>
+  <string name="add_invites">הוסיפו מוזמנים</string>
+  <string name="user_id">מזהה משתמש</string>
+  <string name="email">מייל</string>
+  <string name="invite_users">הזמינו לחבורה</string>
+  <string name="share_using">שתפו באמצעות</string>
+  <string name="share_levelup" formatted="false">הגעתי לדרגה %s בהאביטיקה על ידי שיפור הרגלים שלי מהעולם האמיתי!</string>
+  <string name="share_hatched" formatted="false">הרגע הבקעתי ביצת חיית מחמד של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
+  <string name="share_raised" formatted="false">הרגע הרווחתי חיית רכיבה של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
+  <string name="open_in_store">פתיחה בפליי סטור</string>
+  <string name="change_class_confirmation">האם אתם בטוחים שאתם מעוניינים להחליף מקצוע? זה יעלה לכם 3 אבני חן.</string>
+  <string name="leaderMessage" formatted="false">הודעה מאת %1$s</string>
+</resources>
diff --git a/Habitica/res/values/values.xml b/Habitica/res/values/values.xml
index d25a6ff88..39f341c24 100644
--- a/Habitica/res/values/values.xml
+++ b/Habitica/res/values/values.xml
@@ -56,24 +56,24 @@
     </string-array>
 
     <string-array name="LanguageValues">
-        <item>0</item>
-        <item>1</item>
-        <item>4</item>
-        <item>6</item>
-        <item>7</item>
-        <item>9</item>
-        <item>10</item>
-        <item>11</item>
-        <item>12</item>
-        <item>13</item>
-        <item>14</item>
-        <item>15</item>
-        <item>16</item>
-        <item>17</item>
-        <item>18</item>
-        <item>20</item>
-        <item>25</item>
-        <item>26</item>
+        <item>en</item>
+        <item>bg</item>
+        <item>de</item>
+        <item>en-rGB</item>
+        <item>es</item>
+        <item>fr</item>
+        <item>iw</item>
+        <item>hr-rHR</item>
+        <item>in</item>
+        <item>it</item>
+        <item>ja</item>
+        <item>nl</item>
+        <item>pl</item>
+        <item>pt-rPT</item>
+        <item>pt-rBR</item>
+        <item>ru</item>
+        <item>zh</item>
+        <item>zh-rTW</item>
     </string-array>
 
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
index 47b6a870a..d67f5c615 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
@@ -16,6 +16,7 @@ import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.NotificationPublisher;
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
 import com.habitrpg.android.habitica.prefs.TimePreference;
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
@@ -27,7 +28,9 @@ import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -41,6 +44,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
     private PreferenceScreen pushNotificationsPreference;
     private Preference classSelectionPreference;
     private HabitRPGUser user;
+    public MainActivity activity;
     private PushNotificationManager pushNotificationManager;
 
     private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
@@ -200,14 +204,97 @@ public class PreferencesFragment extends BasePreferencesFragment implements
                 pushNotificationManager.removePushDeviceUsingStoredToken();
             }
         } else if (key.equals("language")) {
-            Log.v("test", sharedPreferences.getString(key,"0"));
-            Locale locale = new Locale("es");
+            Locale locale = null;
+            String languageCode = null;
+            Log.v("test",sharedPreferences.getString(key,"0"));
+            switch (sharedPreferences.getString(key,"en")){
+                case "en":
+                    locale = new Locale("en");
+                    languageCode = "en";
+                    break;
+                case "bg":
+                    locale = new Locale("bg");
+                    languageCode = "bg";
+                    break;
+                case "de":
+                    locale = new Locale("de");
+                    languageCode = "de";
+                    break;
+                case "en-rGB":
+                    locale = new Locale("en", "GB");
+                    languageCode = "en_GB";
+                    break;
+                case "es":
+                    locale = new Locale("es");
+                    languageCode = "es";
+                    break;
+                case "fr":
+                    locale = new Locale("fr");
+                    languageCode = "fr";
+                    break;
+                case "iw":
+                    locale = new Locale("iw");
+                    languageCode = "he";
+                    break;
+                case "hr-rHR":
+                    locale = new Locale("hr", "HR");
+                    languageCode = "hu";
+                    break;
+                case "in":
+                    locale = new Locale("in");
+                    languageCode = "id";
+                    break;
+                case "it":
+                    locale = new Locale("it");
+                    languageCode = "it";
+                    break;
+                case "ja":
+                    locale = new Locale("ja");
+                    languageCode = "ja";
+                    break;
+                case "nl":
+                    locale = new Locale("nl");
+                    languageCode = "nl";
+                    break;
+                case "pl":
+                    locale = new Locale("pl");
+                    languageCode = "pl";
+                    break;
+                case "pt-rPT":
+                    locale = new Locale("pt","PT");
+                    languageCode = "pt";
+                    break;
+                case "pt-rBR":
+                    locale = new Locale("pt","BR");
+                    languageCode = "pt_BR";
+                    break;
+                case "ru":
+                    locale = new Locale("ru");
+                    languageCode = "ru";
+                    break;
+                case "zh":
+                    locale = new Locale("zh");
+                    languageCode = "zh";
+                    break;
+                case "zh-rTW":
+                    locale = new Locale("zh","TW");
+                    languageCode = "zh_TW";
+                    break;
+            }
+
             Locale.setDefault(locale);
             Configuration configuration = new Configuration();
             configuration.locale = locale;
             getActivity().getResources().updateConfiguration(configuration,
                     getActivity().getResources().getDisplayMetrics());
 
+            Map<String, Object> updateData = new HashMap<>();
+            updateData.put("preferences.language", languageCode);
+            apiHelper.apiService.updateUser(updateData)
+                    .compose(apiHelper.configureApiCallObserver())
+                    .subscribe(new MergeUserCallback(activity, user), throwable -> {
+                    });
+
 
         }
     }

From 22ccb1bcf798fb7c2b3f230cfb755c2a19772aae Mon Sep 17 00:00:00 2001
From: Daniel Kaparunakis <daniel.kaparunakis@gmail.com>
Date: Sun, 4 Sep 2016 22:50:04 -0500
Subject: [PATCH 4/9] Feature: Add logic to SetupActivity to set language at
 registration

This commit adds logic to the SetupActivity for a new user. The
purpose of this logic is for the device language to be sent
to the web app automatically during registration.
---
 Habitica/res/values/values.xml                |   4 +-
 .../habitrpg/android/habitica/APIHelper.java  |  19 +--
 .../habitica/helpers/LanguageHelper.java      | 120 ++++++++++++++++++
 .../habitica/ui/activities/LoginActivity.java |  40 +++---
 .../habitica/ui/activities/SetupActivity.java |  22 ++--
 .../preferences/PreferencesFragment.java      |  94 ++------------
 .../habitrpgwrapper/lib/api/ApiService.java   |   6 +-
 7 files changed, 176 insertions(+), 129 deletions(-)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java

diff --git a/Habitica/res/values/values.xml b/Habitica/res/values/values.xml
index 39f341c24..031e924dd 100644
--- a/Habitica/res/values/values.xml
+++ b/Habitica/res/values/values.xml
@@ -63,13 +63,13 @@
         <item>es</item>
         <item>fr</item>
         <item>iw</item>
-        <item>hr-rHR</item>
+        <item>hr</item>
         <item>in</item>
         <item>it</item>
         <item>ja</item>
         <item>nl</item>
         <item>pl</item>
-        <item>pt-rPT</item>
+        <item>pt</item>
         <item>pt-rBR</item>
         <item>ru</item>
         <item>zh</item>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
index ec1c5b9e5..e188d0763 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
@@ -1,13 +1,15 @@
 package com.habitrpg.android.habitica;
 
+import android.app.Activity;
+import android.support.v7.app.AlertDialog;
+
+import com.amplitude.api.Amplitude;
+import com.crashlytics.android.Crashlytics;
 import com.google.gson.ExclusionStrategy;
 import com.google.gson.FieldAttributes;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-
-import com.amplitude.api.Amplitude;
-import com.crashlytics.android.Crashlytics;
 import com.habitrpg.android.habitica.database.CheckListItemExcludeStrategy;
 import com.magicmicky.habitrpgwrapper.lib.api.ApiService;
 import com.magicmicky.habitrpgwrapper.lib.api.Server;
@@ -17,8 +19,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.Customization;
 import com.magicmicky.habitrpgwrapper.lib.models.FAQArticle;
 import com.magicmicky.habitrpgwrapper.lib.models.Group;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationRequest;
-import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationResult;
 import com.magicmicky.habitrpgwrapper.lib.models.Purchases;
 import com.magicmicky.habitrpgwrapper.lib.models.Skill;
 import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep;
@@ -67,14 +67,9 @@ import com.raizlabs.android.dbflow.structure.ModelAdapter;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import android.app.Activity;
-import android.os.Build;
-import android.support.v7.app.AlertDialog;
-
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
-import java.net.ConnectException;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
@@ -82,11 +77,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLHandshakeException;
 
 import okhttp3.Interceptor;
 import okhttp3.MediaType;
@@ -95,8 +88,6 @@ import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 import okhttp3.logging.HttpLoggingInterceptor;
-import okio.Buffer;
-import retrofit2.Call;
 import retrofit2.Converter;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava.HttpException;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java
new file mode 100644
index 000000000..890b75679
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java
@@ -0,0 +1,120 @@
+package com.habitrpg.android.habitica.helpers;
+
+import java.util.Locale;
+
+/**
+ * Created by DanielKaparunakis on 9/2/16.
+ */
+public class LanguageHelper {
+
+    private Locale locale = null;
+    private String languageCode = null;
+    private boolean languageAvailable = false;
+
+    public LanguageHelper (String languagePreference) {
+        switch (languagePreference){
+            case "en":
+                locale = new Locale("en");
+                languageCode = "en";
+                languageAvailable = true;
+                break;
+            case "bg":
+                locale = new Locale("bg");
+                languageCode = "bg";
+                languageAvailable = true;
+                break;
+            case "de":
+                locale = new Locale("de");
+                languageCode = "de";
+                languageAvailable = true;
+                break;
+            case "en-rGB":
+                locale = new Locale("en", "GB");
+                languageCode = "en_GB";
+                languageAvailable = true;
+                break;
+            case "es":
+                locale = new Locale("es");
+                languageCode = "es";
+                languageAvailable = true;
+                break;
+            case "fr":
+                locale = new Locale("fr");
+                languageCode = "fr";
+                languageAvailable = true;
+                break;
+            case "iw":
+                locale = new Locale("iw");
+                languageCode = "he";
+                languageAvailable = true;
+                break;
+            case "hr":
+                locale = new Locale("hr", "HR");
+                languageCode = "hu";
+                languageAvailable = true;
+                break;
+            case "in":
+                locale = new Locale("in");
+                languageCode = "id";
+                languageAvailable = true;
+                break;
+            case "it":
+                locale = new Locale("it");
+                languageCode = "it";
+                languageAvailable = true;
+                break;
+            case "ja":
+                locale = new Locale("ja");
+                languageCode = "ja";
+                languageAvailable = true;
+                break;
+            case "nl":
+                locale = new Locale("nl");
+                languageCode = "nl";
+                languageAvailable = true;
+                break;
+            case "pl":
+                locale = new Locale("pl");
+                languageCode = "pl";
+                languageAvailable = true;
+                break;
+            case "pt":
+                locale = new Locale("pt","PT");
+                languageCode = "pt";
+                languageAvailable = true;
+                break;
+            case "pt-rBR":
+                locale = new Locale("pt","BR");
+                languageCode = "pt_BR";
+                languageAvailable = true;
+                break;
+            case "ru":
+                locale = new Locale("ru");
+                languageCode = "ru";
+                languageAvailable = true;
+                break;
+            case "zh":
+                locale = new Locale("zh");
+                languageCode = "zh";
+                languageAvailable = true;
+                break;
+            case "zh-rTW":
+                locale = new Locale("zh","TW");
+                languageCode = "zh_TW";
+                languageAvailable = true;
+                break;
+        }
+    }
+
+    public boolean isLanguageAvailable() {
+        return languageAvailable;
+    }
+
+    public String getLanguageCode() {
+        return languageCode;
+    }
+
+    public Locale getLocale() {
+        return locale;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
index a36181a04..3b252d1d0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
@@ -1,25 +1,5 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.amplitude.api.Amplitude;
-import com.facebook.AccessToken;
-import com.facebook.CallbackManager;
-import com.facebook.FacebookCallback;
-import com.facebook.FacebookException;
-import com.facebook.login.LoginResult;
-import com.facebook.login.widget.LoginButton;
-import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
-import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Color;
@@ -40,6 +20,26 @@ import android.widget.ProgressBar;
 import android.widget.TableRow;
 import android.widget.TextView;
 
+import com.amplitude.api.Amplitude;
+import com.facebook.AccessToken;
+import com.facebook.CallbackManager;
+import com.facebook.FacebookCallback;
+import com.facebook.FacebookException;
+import com.facebook.login.LoginResult;
+import com.facebook.login.widget.LoginButton;
+import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
+import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
+import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
index 20f0dbffc..649aacefd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
@@ -1,5 +1,13 @@
 package com.habitrpg.android.habitica.ui.activities;
 
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+import android.widget.Button;
+
 import com.amplitude.api.Amplitude;
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HostConfig;
@@ -20,15 +28,8 @@ import org.greenrobot.eventbus.Subscribe;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.View;
-import android.widget.Button;
-
 import java.util.List;
+import java.util.Locale;
 
 import javax.inject.Inject;
 
@@ -149,6 +150,11 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
     @Override
     public void onClick(View v) {
         if (v == this.nextButton) {
+            String currentDeviceLanguage = Locale.getDefault().getLanguage();
+            apiHelper.apiService.registrationLanguage(currentDeviceLanguage)
+                    .compose(apiHelper.configureApiCallObserver())
+                    .subscribe(new MergeUserCallback(this, user), throwable -> {
+                    });
             if (this.pager.getCurrentItem() == 1) {
                 List<Task> newTasks = this.taskSetupFragment.createSampleTasks();
                 this.completedSetup = true;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
index d67f5c615..e60ad8a10 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
@@ -6,17 +6,18 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
-import android.util.Log;
 
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.NotificationPublisher;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
+import com.habitrpg.android.habitica.helpers.LanguageHelper;
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
 import com.habitrpg.android.habitica.prefs.TimePreference;
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
@@ -204,98 +205,25 @@ public class PreferencesFragment extends BasePreferencesFragment implements
                 pushNotificationManager.removePushDeviceUsingStoredToken();
             }
         } else if (key.equals("language")) {
-            Locale locale = null;
-            String languageCode = null;
-            Log.v("test",sharedPreferences.getString(key,"0"));
-            switch (sharedPreferences.getString(key,"en")){
-                case "en":
-                    locale = new Locale("en");
-                    languageCode = "en";
-                    break;
-                case "bg":
-                    locale = new Locale("bg");
-                    languageCode = "bg";
-                    break;
-                case "de":
-                    locale = new Locale("de");
-                    languageCode = "de";
-                    break;
-                case "en-rGB":
-                    locale = new Locale("en", "GB");
-                    languageCode = "en_GB";
-                    break;
-                case "es":
-                    locale = new Locale("es");
-                    languageCode = "es";
-                    break;
-                case "fr":
-                    locale = new Locale("fr");
-                    languageCode = "fr";
-                    break;
-                case "iw":
-                    locale = new Locale("iw");
-                    languageCode = "he";
-                    break;
-                case "hr-rHR":
-                    locale = new Locale("hr", "HR");
-                    languageCode = "hu";
-                    break;
-                case "in":
-                    locale = new Locale("in");
-                    languageCode = "id";
-                    break;
-                case "it":
-                    locale = new Locale("it");
-                    languageCode = "it";
-                    break;
-                case "ja":
-                    locale = new Locale("ja");
-                    languageCode = "ja";
-                    break;
-                case "nl":
-                    locale = new Locale("nl");
-                    languageCode = "nl";
-                    break;
-                case "pl":
-                    locale = new Locale("pl");
-                    languageCode = "pl";
-                    break;
-                case "pt-rPT":
-                    locale = new Locale("pt","PT");
-                    languageCode = "pt";
-                    break;
-                case "pt-rBR":
-                    locale = new Locale("pt","BR");
-                    languageCode = "pt_BR";
-                    break;
-                case "ru":
-                    locale = new Locale("ru");
-                    languageCode = "ru";
-                    break;
-                case "zh":
-                    locale = new Locale("zh");
-                    languageCode = "zh";
-                    break;
-                case "zh-rTW":
-                    locale = new Locale("zh","TW");
-                    languageCode = "zh_TW";
-                    break;
+            LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString(key,"en"));
+            Locale.setDefault(languageHelper.getLocale());
+            Configuration configuration = new Configuration();
+
+            if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN){
+                configuration.locale = languageHelper.getLocale();
+            } else {
+                configuration.setLocale(languageHelper.getLocale());
             }
 
-            Locale.setDefault(locale);
-            Configuration configuration = new Configuration();
-            configuration.locale = locale;
             getActivity().getResources().updateConfiguration(configuration,
                     getActivity().getResources().getDisplayMetrics());
 
             Map<String, Object> updateData = new HashMap<>();
-            updateData.put("preferences.language", languageCode);
+            updateData.put("preferences.language", languageHelper.getLanguageCode());
             apiHelper.apiService.updateUser(updateData)
                     .compose(apiHelper.configureApiCallObserver())
                     .subscribe(new MergeUserCallback(activity, user), throwable -> {
                     });
-
-
         }
     }
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
index 7bc6c5031..0bcf7e42b 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
@@ -28,10 +28,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;
 import retrofit2.http.GET;
+import retrofit2.http.Header;
 import retrofit2.http.POST;
 import retrofit2.http.PUT;
 import retrofit2.http.Path;
@@ -57,6 +57,9 @@ public interface ApiService {
     @PUT("user/")
     Observable<HabitRPGUser> updateUser(@Body Map<String, Object> updateDictionary);
 
+    @PUT("user/")
+    Observable<HabitRPGUser> registrationLanguage(@Header("Accept-Language") String registrationLanguage);
+
     @GET("user/inventory/buy")
     Observable<List<ItemData>> getInventoryBuyableGear();
 
@@ -128,7 +131,6 @@ public interface ApiService {
     @DELETE("tags/{id}")
     Observable<Void> deleteTag(@Path("id") String id);
 
-
     @POST("user/auth/local/register")
     Observable<UserAuthResponse> registerUser(@Body UserAuth auth);
 

From d2d8cb597fcee8e36ff7464352b5eff6c3a975bb Mon Sep 17 00:00:00 2001
From: Daniel Kaparunakis <daniel.kaparunakis@gmail.com>
Date: Mon, 5 Sep 2016 23:24:06 -0500
Subject: [PATCH 5/9] Refactor: Modify LanguageHelper class to simplify switch
 block

This commit simplifies the LanguageHelper class switch block. The
original switch had 18 or so initial cases, most of which could be
reduced to two general cases. The two general cases have been
impletemented as the default.
---
 Habitica/res/values/values.xml                |  6 +-
 .../habitica/helpers/LanguageHelper.java      | 82 +++----------------
 .../habitica/ui/activities/SetupActivity.java | 12 ++-
 .../preferences/PreferencesFragment.java      | 10 +++
 4 files changed, 33 insertions(+), 77 deletions(-)

diff --git a/Habitica/res/values/values.xml b/Habitica/res/values/values.xml
index 031e924dd..d2354bad0 100644
--- a/Habitica/res/values/values.xml
+++ b/Habitica/res/values/values.xml
@@ -59,7 +59,7 @@
         <item>en</item>
         <item>bg</item>
         <item>de</item>
-        <item>en-rGB</item>
+        <item>en_GB</item>
         <item>es</item>
         <item>fr</item>
         <item>iw</item>
@@ -70,10 +70,10 @@
         <item>nl</item>
         <item>pl</item>
         <item>pt</item>
-        <item>pt-rBR</item>
+        <item>pt_BR</item>
         <item>ru</item>
         <item>zh</item>
-        <item>zh-rTW</item>
+        <item>zh_TW</item>
     </string-array>
 
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java
index 890b75679..722e8733f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java
@@ -11,38 +11,10 @@ public class LanguageHelper {
     private String languageCode = null;
     private boolean languageAvailable = false;
 
-    public LanguageHelper (String languagePreference) {
-        switch (languagePreference){
-            case "en":
-                locale = new Locale("en");
-                languageCode = "en";
-                languageAvailable = true;
-                break;
-            case "bg":
-                locale = new Locale("bg");
-                languageCode = "bg";
-                languageAvailable = true;
-                break;
-            case "de":
-                locale = new Locale("de");
-                languageCode = "de";
-                languageAvailable = true;
-                break;
-            case "en-rGB":
-                locale = new Locale("en", "GB");
-                languageCode = "en_GB";
-                languageAvailable = true;
-                break;
-            case "es":
-                locale = new Locale("es");
-                languageCode = "es";
-                languageAvailable = true;
-                break;
-            case "fr":
-                locale = new Locale("fr");
-                languageCode = "fr";
-                languageAvailable = true;
-                break;
+
+    public LanguageHelper (String languageSharedPref) {
+
+        switch (languageSharedPref){
             case "iw":
                 locale = new Locale("iw");
                 languageCode = "he";
@@ -58,49 +30,19 @@ public class LanguageHelper {
                 languageCode = "id";
                 languageAvailable = true;
                 break;
-            case "it":
-                locale = new Locale("it");
-                languageCode = "it";
-                languageAvailable = true;
-                break;
-            case "ja":
-                locale = new Locale("ja");
-                languageCode = "ja";
-                languageAvailable = true;
-                break;
-            case "nl":
-                locale = new Locale("nl");
-                languageCode = "nl";
-                languageAvailable = true;
-                break;
-            case "pl":
-                locale = new Locale("pl");
-                languageCode = "pl";
-                languageAvailable = true;
-                break;
             case "pt":
                 locale = new Locale("pt","PT");
                 languageCode = "pt";
                 languageAvailable = true;
                 break;
-            case "pt-rBR":
-                locale = new Locale("pt","BR");
-                languageCode = "pt_BR";
-                languageAvailable = true;
-                break;
-            case "ru":
-                locale = new Locale("ru");
-                languageCode = "ru";
-                languageAvailable = true;
-                break;
-            case "zh":
-                locale = new Locale("zh");
-                languageCode = "zh";
-                languageAvailable = true;
-                break;
-            case "zh-rTW":
-                locale = new Locale("zh","TW");
-                languageCode = "zh_TW";
+            default:
+                if (languageSharedPref.contains("_")) {
+                    String[] languageCodeParts = languageSharedPref.split("_");
+                    locale = new Locale(languageCodeParts[0],languageCodeParts[1]);
+                } else {
+                    locale = new Locale(languageSharedPref);
+                }
+                languageCode = languageSharedPref;
                 languageAvailable = true;
                 break;
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
index 649aacefd..2bee55590 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
@@ -16,6 +16,7 @@ import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
+import com.habitrpg.android.habitica.helpers.LanguageHelper;
 import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
 import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
@@ -151,10 +152,13 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
     public void onClick(View v) {
         if (v == this.nextButton) {
             String currentDeviceLanguage = Locale.getDefault().getLanguage();
-            apiHelper.apiService.registrationLanguage(currentDeviceLanguage)
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(new MergeUserCallback(this, user), throwable -> {
-                    });
+            LanguageHelper languageHelper = new LanguageHelper(currentDeviceLanguage);
+            if (languageHelper.isLanguageAvailable()){
+                apiHelper.apiService.registrationLanguage(currentDeviceLanguage)
+                        .compose(apiHelper.configureApiCallObserver())
+                        .subscribe(new MergeUserCallback(this, user), throwable -> {
+                        });
+            }
             if (this.pager.getCurrentItem() == 1) {
                 List<Task> newTasks = this.taskSetupFragment.createSampleTasks();
                 this.completedSetup = true;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
index e60ad8a10..21596e51f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
@@ -224,6 +224,16 @@ public class PreferencesFragment extends BasePreferencesFragment implements
                     .compose(apiHelper.configureApiCallObserver())
                     .subscribe(new MergeUserCallback(activity, user), throwable -> {
                     });
+
+            if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1){
+                Intent intent = new Intent(getActivity(), MainActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                startActivity(intent);
+            } else {
+                Intent intent = new Intent(getActivity(), MainActivity.class);
+                this.startActivity(intent);
+                getActivity().finishAffinity();
+            }
         }
     }
 

From 4b63b63b0d47153514e558fe8e5a75a7d990b3cb Mon Sep 17 00:00:00 2001
From: Daniel Kaparunakis <daniel.kaparunakis@gmail.com>
Date: Tue, 6 Sep 2016 00:10:51 -0500
Subject: [PATCH 6/9] Refactor: Fix logic for language discovery at
 registration

This commit fixes the logic of language discovery at registration.
As opposed to using the LanguageHelper class, the new logic looks
at the resources themselves to determine whether the app can support
the language of the phone.
---
 .../habitica/helpers/LanguageHelper.java      | 11 -----------
 .../habitica/ui/activities/SetupActivity.java | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java
index 722e8733f..b43068061 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java
@@ -9,8 +9,6 @@ public class LanguageHelper {
 
     private Locale locale = null;
     private String languageCode = null;
-    private boolean languageAvailable = false;
-
 
     public LanguageHelper (String languageSharedPref) {
 
@@ -18,22 +16,18 @@ public class LanguageHelper {
             case "iw":
                 locale = new Locale("iw");
                 languageCode = "he";
-                languageAvailable = true;
                 break;
             case "hr":
                 locale = new Locale("hr", "HR");
                 languageCode = "hu";
-                languageAvailable = true;
                 break;
             case "in":
                 locale = new Locale("in");
                 languageCode = "id";
-                languageAvailable = true;
                 break;
             case "pt":
                 locale = new Locale("pt","PT");
                 languageCode = "pt";
-                languageAvailable = true;
                 break;
             default:
                 if (languageSharedPref.contains("_")) {
@@ -43,15 +37,10 @@ public class LanguageHelper {
                     locale = new Locale(languageSharedPref);
                 }
                 languageCode = languageSharedPref;
-                languageAvailable = true;
                 break;
         }
     }
 
-    public boolean isLanguageAvailable() {
-        return languageAvailable;
-    }
-
     public String getLanguageCode() {
         return languageCode;
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
index 2bee55590..91c8cccaf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
@@ -16,7 +16,6 @@ import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
-import com.habitrpg.android.habitica.helpers.LanguageHelper;
 import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
 import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
@@ -79,6 +78,16 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
         } catch (JSONException exception) {
         }
         Amplitude.getInstance().logEvent("setup", eventProperties);
+
+        String currentDeviceLanguage = Locale.getDefault().getLanguage();
+        for (String language : getResources().getStringArray(R.array.LanguageValues)) {
+            if (language.equals(currentDeviceLanguage)) {
+                apiHelper.apiService.registrationLanguage(currentDeviceLanguage)
+                        .compose(apiHelper.configureApiCallObserver())
+                        .subscribe(new MergeUserCallback(this, user), throwable -> {
+                        });
+            }
+        }
     }
 
     @Override
@@ -151,14 +160,6 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
     @Override
     public void onClick(View v) {
         if (v == this.nextButton) {
-            String currentDeviceLanguage = Locale.getDefault().getLanguage();
-            LanguageHelper languageHelper = new LanguageHelper(currentDeviceLanguage);
-            if (languageHelper.isLanguageAvailable()){
-                apiHelper.apiService.registrationLanguage(currentDeviceLanguage)
-                        .compose(apiHelper.configureApiCallObserver())
-                        .subscribe(new MergeUserCallback(this, user), throwable -> {
-                        });
-            }
             if (this.pager.getCurrentItem() == 1) {
                 List<Task> newTasks = this.taskSetupFragment.createSampleTasks();
                 this.completedSetup = true;

From 2efb6ee0bb2609791881b6f79a128575caa1f55a Mon Sep 17 00:00:00 2001
From: Daniel Kaparunakis <daniel.kaparunakis@gmail.com>
Date: Fri, 16 Sep 2016 12:45:08 -0500
Subject: [PATCH 7/9] Feature: Add content reload to language switcher
 setting's calls

This commit adds a content API reload call to the list of calls that
happen when the language is changed. This call is necessary so certain
parts of the app, like the stable, have the correct language when
the language is switched.
---
 .../ui/fragments/preferences/PreferencesFragment.java        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
index 21596e51f..9cb550120 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
@@ -224,6 +224,11 @@ public class PreferencesFragment extends BasePreferencesFragment implements
                     .compose(apiHelper.configureApiCallObserver())
                     .subscribe(new MergeUserCallback(activity, user), throwable -> {
                     });
+            apiHelper.apiService.getContent(languageHelper.getLanguageCode())
+                    .compose(apiHelper.configureApiCallObserver())
+                    .subscribe(contentResult -> {
+                    }, throwable -> {
+                    });
 
             if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1){
                 Intent intent = new Intent(getActivity(), MainActivity.class);

From 96c61ed7cbda2813da1bcc7439d9561f0958bcbd Mon Sep 17 00:00:00 2001
From: Daniel Kaparunakis <daniel.kaparunakis@gmail.com>
Date: Fri, 16 Sep 2016 14:28:16 -0500
Subject: [PATCH 8/9] Fix: Fix persistence for language settings after process
 dies.

This commit corrects an issue where the language was not persisting
if the app was killed or closed.
Ref: http://stackoverflow.com/questions/22402491/
android-change-and-set-default-locale-within-the-app

Issue: #574, Pull Request: #613
---
 .../habitica/ui/activities/MainActivity.java  | 86 +++++++++++--------
 .../preferences/PreferencesFragment.java      | 10 ++-
 2 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
index 51cb77f7f..bfe237483 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
@@ -1,5 +1,42 @@
 package com.habitrpg.android.habitica.ui.activities;
 
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
+import android.database.sqlite.SQLiteDoneException;
+import android.databinding.DataBindingUtil;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.content.FileProvider;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
 import com.amplitude.api.Amplitude;
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
@@ -33,6 +70,7 @@ import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
 import com.habitrpg.android.habitica.events.commands.SellItemCommand;
 import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
+import com.habitrpg.android.habitica.helpers.LanguageHelper;
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
@@ -92,41 +130,6 @@ import org.json.JSONObject;
 import org.solovyev.android.checkout.ActivityCheckout;
 import org.solovyev.android.checkout.Checkout;
 
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.database.sqlite.SQLiteDoneException;
-import android.databinding.DataBindingUtil;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.FileProvider;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.TextView;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -134,6 +137,7 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
@@ -220,6 +224,18 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString("language","en"));
+        Locale.setDefault(languageHelper.getLocale());
+        Configuration configuration = new Configuration();
+        if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN){
+            configuration.locale = languageHelper.getLocale();
+        } else {
+            configuration.setLocale(languageHelper.getLocale());
+        }
+        getResources().updateConfiguration(configuration,
+                getResources().getDisplayMetrics());
+
         if (!HabiticaApplication.checkUserAuthentication(this, hostConfig)) {
             return;
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
index 9cb550120..43ee90568 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
@@ -23,6 +23,7 @@ import com.habitrpg.android.habitica.prefs.TimePreference;
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
@@ -206,15 +207,14 @@ public class PreferencesFragment extends BasePreferencesFragment implements
             }
         } else if (key.equals("language")) {
             LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString(key,"en"));
+
             Locale.setDefault(languageHelper.getLocale());
             Configuration configuration = new Configuration();
-
             if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN){
                 configuration.locale = languageHelper.getLocale();
             } else {
                 configuration.setLocale(languageHelper.getLocale());
             }
-
             getActivity().getResources().updateConfiguration(configuration,
                     getActivity().getResources().getDisplayMetrics());
 
@@ -224,7 +224,11 @@ public class PreferencesFragment extends BasePreferencesFragment implements
                     .compose(apiHelper.configureApiCallObserver())
                     .subscribe(new MergeUserCallback(activity, user), throwable -> {
                     });
-            apiHelper.apiService.getContent(languageHelper.getLanguageCode())
+
+            Preferences preferences = user.getPreferences();
+            preferences.setLanguage(languageHelper.getLanguageCode());
+            apiHelper.languageCode = preferences.getLanguage();
+            apiHelper.apiService.getContent(apiHelper.languageCode)
                     .compose(apiHelper.configureApiCallObserver())
                     .subscribe(contentResult -> {
                     }, throwable -> {

From 90ff59a17c001576a6be98b351882dad8aa3bec4 Mon Sep 17 00:00:00 2001
From: Daniel Kaparunakis <daniel.kaparunakis@gmail.com>
Date: Wed, 21 Sep 2016 00:00:24 -0500
Subject: [PATCH 9/9] Fix: Re-add code lost to Git conflicts.

This commit adds code that was lost due to unresolved Git conflicts.

Issue: #574, Pull Request: #613
---
 Habitica/res/values/strings.xml               |  2 +
 .../habitica/ui/activities/MainActivity.java  | 89 +++++++++++--------
 2 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 901810142..ea5fc6c24 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -14,6 +14,8 @@
     <string name="SP_userID_summary">Your User ID</string>
     <string name="SP_APIToken_title">API Token</string>
     <string name="SP_APIToken_summary">Your API Token</string>
+    <string name="Language_title">Language</string>
+    <string name="Language_summary">Change Habitica\'s language</string>
     <string name="SP_user_qr_code">Your QR Code</string>
     <string name="PS_contact_title">Contact me</string>
     <string name="unknown_error">An error happened…</string>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
index a2978fc9b..169678604 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
@@ -1,5 +1,42 @@
 package com.habitrpg.android.habitica.ui.activities;
 
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
+import android.database.sqlite.SQLiteDoneException;
+import android.databinding.DataBindingUtil;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.preference.PreferenceManager;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.content.FileProvider;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
 import com.amplitude.api.Amplitude;
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
@@ -34,9 +71,8 @@ import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
 import com.habitrpg.android.habitica.events.commands.SellItemCommand;
 import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
+import com.habitrpg.android.habitica.helpers.LanguageHelper;
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
-import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
-import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
 import com.habitrpg.android.habitica.ui.TutorialView;
@@ -95,42 +131,6 @@ import org.json.JSONObject;
 import org.solovyev.android.checkout.ActivityCheckout;
 import org.solovyev.android.checkout.Checkout;
 
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.database.sqlite.SQLiteDoneException;
-import android.databinding.DataBindingUtil;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.FileProvider;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -138,6 +138,7 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
@@ -224,6 +225,18 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString("language","en"));
+        Locale.setDefault(languageHelper.getLocale());
+        Configuration configuration = new Configuration();
+        if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN){
+            configuration.locale = languageHelper.getLocale();
+        } else {
+            configuration.setLocale(languageHelper.getLocale());
+        }
+        getResources().updateConfiguration(configuration,
+                getResources().getDisplayMetrics());
+
         if (!HabiticaApplication.checkUserAuthentication(this, hostConfig)) {
             return;
         }