diff --git a/app/build.gradle b/app/build.gradle
index 48ba07ac46..4dde1576cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdkVersion 26
targetSdkVersion 34
- versionCode 2155
- versionName "0.21.55"
+ versionCode 2156
+ versionName "0.21.56"
ndkVersion '21.3.6528147'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt
index 681a8b0e9d..386878e70a 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt
@@ -340,13 +340,13 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
val max = progress.get("max").asInt
val current = progress.get("current").asInt
val courseStatus = if (current == max) {
- "$courseName terminado!"
+ getString(R.string.course_completed, courseName)
} else {
- "Ingresa al curso $courseName completalo ($current de $max hecho)"
+ getString(R.string.course_in_progress, courseName, current, max)
}
challengeDialog(uniqueDates.size, courseStatus, allUniqueDates.size, hasUnfinishedSurvey)
} else {
- challengeDialog(uniqueDates.size, "$courseName no iniciado", allUniqueDates.size, hasUnfinishedSurvey)
+ challengeDialog(uniqueDates.size, getString(R.string.course_not_started, courseName), allUniqueDates.size, hasUnfinishedSurvey)
}
}
}
@@ -376,27 +376,25 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
if (isCompleted && !hasShownCongrats) {
editor.putBoolean("has_shown_congrats", true).apply()
val markdownContent = """
- Ingresos totales de la comunidad: **$${calculateCommunityProgress(allVoiceCount, hasUnfinishedSurvey)}** /$500
-
- Tus ganancias totales: **$${calculateIndividualProgress(voiceCount, hasUnfinishedSurvey)}** /$11
- ### ¡Felicidades! Reto Completado
- """.trimIndent()
+ ${getString(R.string.community_earnings, calculateCommunityProgress(allVoiceCount, hasUnfinishedSurvey))}
+ ${getString(R.string.your_earnings, calculateIndividualProgress(voiceCount, hasUnfinishedSurvey))}
+ ### ${getString(R.string.congratulations)}
+ """.trimIndent()
MarkdownDialog.newInstance(markdownContent, courseStatus, voiceCount, allVoiceCount, hasUnfinishedSurvey).show(supportFragmentManager, "markdown_dialog")
} else {
val cappedVoiceCount = minOf(voiceCount, 5)
val voicesText = if (cappedVoiceCount > 0) {
- "$cappedVoiceCount de 5 Voces diarias"
+ "$cappedVoiceCount ${getString(R.string.daily_voices)}"
} else {
""
}
val markdownContent = """
- Ingresos totales de la comunidad: **$${calculateCommunityProgress(allVoiceCount, hasUnfinishedSurvey)}** /$500
-
- Tus ganancias totales: **$${calculateIndividualProgress(voiceCount, hasUnfinishedSurvey)}** /$11
- ### $courseTaskDone $1 por encuesta
- ### $voiceTaskDone Comparte tu opinión en Nuestras Voces.[$2/voz] $voicesText
- ### $syncTaskDone Recuerda sincronizar la aplicación móvil.
- """.trimIndent()
+ ${getString(R.string.community_earnings, calculateCommunityProgress(allVoiceCount, hasUnfinishedSurvey))}
+ ${getString(R.string.your_earnings, calculateIndividualProgress(voiceCount, hasUnfinishedSurvey))}
+ ### ${getString(R.string.per_survey, courseTaskDone)}
+ ### ${getString(R.string.share_opinion)} $voicesText
+ ### ${getString(R.string.remember_sync)}
+ """.trimIndent()
MarkdownDialog.newInstance(markdownContent, courseStatus, voiceCount, allVoiceCount, hasUnfinishedSurvey)
.show(supportFragmentManager, "markdown_dialog")
}
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite
index 42f3813c84..0afa9e382e 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite
@@ -340,13 +340,13 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
val max = progress.get("max").asInt
val current = progress.get("current").asInt
val courseStatus = if (current == max) {
- "$courseName terminado!"
+ getString(R.string.course_completed, courseName)
} else {
- "Ingresa al curso $courseName completalo ($current de $max hecho)"
+ getString(R.string.course_in_progress, courseName, current, max)
}
challengeDialog(uniqueDates.size, courseStatus, allUniqueDates.size, hasUnfinishedSurvey)
} else {
- challengeDialog(uniqueDates.size, "$courseName no iniciado", allUniqueDates.size, hasUnfinishedSurvey)
+ challengeDialog(uniqueDates.size, getString(R.string.course_not_started, courseName), allUniqueDates.size, hasUnfinishedSurvey)
}
}
}
@@ -376,27 +376,25 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
if (isCompleted && !hasShownCongrats) {
editor.putBoolean("has_shown_congrats", true).apply()
val markdownContent = """
- Ingresos totales de la comunidad: **$${calculateCommunityProgress(allVoiceCount, hasUnfinishedSurvey)}** /$500
-
- Tus ganancias totales: **$${calculateIndividualProgress(voiceCount, hasUnfinishedSurvey)}** /$11
- ### ¡Felicidades! Reto Completado
- """.trimIndent()
+ ${getString(R.string.community_earnings, calculateCommunityProgress(allVoiceCount, hasUnfinishedSurvey))}
+ ${getString(R.string.your_earnings, calculateIndividualProgress(voiceCount, hasUnfinishedSurvey))}
+ ### ${getString(R.string.congratulations)}
+ """.trimIndent()
MarkdownDialog.newInstance(markdownContent, courseStatus, voiceCount, allVoiceCount, hasUnfinishedSurvey).show(supportFragmentManager, "markdown_dialog")
} else {
val cappedVoiceCount = minOf(voiceCount, 5)
val voicesText = if (cappedVoiceCount > 0) {
- "$cappedVoiceCount de 5 Voces diarias"
+ "$cappedVoiceCount ${getString(R.string.daily_voices)}"
} else {
""
}
val markdownContent = """
- Ingresos totales de la comunidad: **$${calculateCommunityProgress(allVoiceCount, hasUnfinishedSurvey)}** /$500
-
- Tus ganancias totales: **$${calculateIndividualProgress(voiceCount, hasUnfinishedSurvey)}** /$11
- ### $courseTaskDone $1 por encuesta
- ### $voiceTaskDone Comparte tu opinión en Nuestras Voces.[$2/voz] $voicesText
- ### $syncTaskDone Recuerda sincronizar la aplicación móvil.
- """.trimIndent()
+ ${getString(R.string.community_earnings, calculateCommunityProgress(allVoiceCount, hasUnfinishedSurvey))}
+ ${getString(R.string.your_earnings, calculateIndividualProgress(voiceCount, hasUnfinishedSurvey))}
+ ### ${getString(R.string.per_survey, courseTaskDone)}
+ ### ${getString(R.string.share_opinion)} $voicesText
+ ### ${getString(R.string.remember_sync)}
+ """.trimIndent()
MarkdownDialog.newInstance(markdownContent, courseStatus, voiceCount, allVoiceCount, hasUnfinishedSurvey)
.show(supportFragmentManager, "markdown_dialog")
}
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index bedb182ec1..40f6d82235 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,5 +1,15 @@
+ إجمالي أرباح المجتمع: **$%1$d** /$500
+ أرباحك الإجمالية: **$%1$d** /$11
+ تهانينا! التحدي مكتمل
+ من 5 أصوات يومية
+ شارك رأيك في أصواتنا.[$2/صوت]
+ تذكر مزامنة التطبيق المحمول.
+ %1$s لكل استبيان
+ %1$s مكتمل!
+ أدخل الدورة %1$s أكملها (%2$d من %3$d تم)
+ %1$s لم يبدأ
My Planet
كوكب
myPlanet
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 425a679249..57927ce9a7 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,5 +1,15 @@
+ Ingresos totales de la comunidad: **$%1$d** /$500
+ Tus ganancias totales: **$%1$d** /$11
+ ¡Felicidades! Reto Completado
+ de 5 Voces diarias
+ Comparte tu opinión en Nuestras Voces.[$2/voz]
+ Recuerda sincronizar la aplicación móvil.
+ %1$s por encuesta
+ %1$s terminado!
+ Ingresa al curso %1$s completalo (%2$d de %3$d hecho)
+ %1$s no iniciado
My Planet
Planeta
myPlanet
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 915d532d91..7dbb0dfed1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,5 +1,15 @@
+ Revenus totaux de la communauté: **$%1$d** /$500
+ Vos gains totaux: **$%1$d** /$11
+ Félicitations! Défi terminé
+ de 5 Voix quotidiennes
+ Partagez votre opinion dans Nos Voix.[$2/voix]
+ N\'oubliez pas de synchroniser l\'application mobile.
+ %1$s par enquête
+ %1$s terminé!
+ Entrez dans le cours %1$s complétez-le (%2$d de %3$d fait)
+ %1$s non commencé
My Planet
planète
myPlanet
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index cbf6a8f348..cea8c2ccd9 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -1,5 +1,15 @@
+ समुदायको कुल आम्दानी: **$%1$d** /$500
+ तपाईंको कुल आम्दानी: **$%1$d** /$11
+ बधाई छ! चुनौती पूरा भयो
+ ५ दैनिक आवाजहरू
+ हाम्रो आवाजमा आफ्नो विचार साझा गर्नुहोस्।[$2/आवाज]
+ मोबाइल एप्लिकेसनलाई समक्रमण गर्न सम्झनुहोस्।
+ %1$s प्रति सर्वेक्षण
+ %1$s समाप्त!
+ कोर्स %1$s मा प्रवेश गर्नुहोस् यसलाई पूरा गर्नुहोस् (%2$d को %3$d गरियो)
+ %1$s सुरु भएको छैन
My Planet
ग्रह
myPlanet
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index 6e9a244049..be0368553f 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -1,5 +1,15 @@
+ Dakhliga guud ee bulshada: **$%1$d** /$500
+ Dakhligaaga guud: **$%1$d** /$11
+ Hambalyo! Tartanka waa la dhameeyay
+ 5 Cod maalinle ah
+ La wadaag fikradaada Codkayaga.[$2/cod]
+ Xusuusnow inaad la socodsiiso codsiga mobilka.
+ %1$s halkii sahamin
+ %1$s dhameystiran!
+ Geli koorsada %1$s dhameystir (%2$d ka %3$d la sameeyay)
+ %1$s lama bilaabin
My Planet
Meerah
myPlanet
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c23eed13c0..a080e49115 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,15 @@
+ Community total earnings: **$%1$d** /$500
+ Your total earnings: **$%1$d** /$11
+ Congratulations! Challenge Completed
+ of 5 Daily Voices
+ Share your opinion in Our Voices.[$2/voice]
+ Remember to sync the mobile app.
+ %1$s per survey
+ %1$s completed!
+ Enter the course %1$s and complete it (%2$d of %3$d done)
+ %1$s not started
My Planet
Planet
myPlanet