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 c86508b6dc..81cd6ea7a7 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 @@ -99,10 +99,10 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N val userProfileModel = profileDbHandler.userModel if (userProfileModel != null) { var name: String? = userProfileModel.getFullName() - if (name?.trim { it <= ' ' }?.isEmpty() == true) { + if (name.isNullOrBlank()) { name = profileDbHandler.userModel?.name } - activityDashboardBinding.appBarBell.appTitleName.text = "$name's Planet" + activityDashboardBinding.appBarBell.appTitleName.text = getString(R.string.planet_name, name) } else { activityDashboardBinding.appBarBell.appTitleName.text = getString(R.string.app_project_name) } 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 77fe5e75ce..bca5982bfc 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 @@ -99,10 +99,10 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N val userProfileModel = profileDbHandler.userModel if (userProfileModel != null) { var name: String? = userProfileModel.getFullName() - if (name?.trim { it <= ' ' }?.isEmpty() == true) { + if (name.isNullOrBlank()) { name = profileDbHandler.userModel?.name } - activityDashboardBinding.appBarBell.appTitleName.text = "$name's Planet" + activityDashboardBinding.appBarBell.appTitleName.text = getString(R.string.planet_name, name) } else { activityDashboardBinding.appBarBell.appTitleName.text = getString(R.string.app_project_name) } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e0288d4237..54d288486b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1,6 +1,7 @@ My Planet + كوكب myPlanet الإعدادات اسم المستخدم @@ -1045,6 +1046,7 @@ جارٍ فحص الخادم إصدار Apk أقل من المسموح. يرجى تحديث التطبيق إلى أحدث إصدار. إضافة ملاحظة (اختياري) + كوكب %s التقديمات غير متاحة لا توجد محادثات سابقة diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1326d1a6a5..ebcda27391 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,6 +1,7 @@ My Planet + Planeta myPlanet configuración Nombre @@ -1045,6 +1046,7 @@ verificando el servidor la versión de la aplicación está por debajo de la permitida. Actualice la aplicación a la última versión. Agregar una nota (opcional) + %s Planeta envíos no disponibles no hay chats anteriores diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index cf52ae05f9..9c41b60a23 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,6 +1,7 @@ My Planet + planète myPlanet paramètres Nom d\'utilisateur @@ -1045,6 +1046,7 @@ vérification du serveur la version de l\'app est inférieure à celle autorisée. veuillez mettre à jour l\'application vers la dernière version. Ajouter une note (optionnel) + %s planète soumissions non disponibles aucune discussion précédente diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 31f4e1aa2b..6795dd2fa4 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -1,6 +1,7 @@ My Planet + ग्रह myPlanet सेटिङ्स प्रयोगकर्तानाम @@ -1045,6 +1046,7 @@ सर्भर जाँच गर्दै एप संस्करण अनुमत संस्करणभन्दा कम छ। कृपया अनुप्रयोगलाई नवीनतम संस्करणमा अद्यावधिक गर्नुहोस्। नोट थप्नुहोस् (वैकल्पिक) + %s ग्रह पेशाहरू उपलब्ध छैनन् अघिल्ला कुराकानीहरू छैनन् diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml index bf51a3f35f..379bd4d1f9 100644 --- a/app/src/main/res/values-so/strings.xml +++ b/app/src/main/res/values-so/strings.xml @@ -1,6 +1,7 @@ My Planet + Meerah myPlanet goobooyinka Magaca isticmaalaha @@ -1045,6 +1046,7 @@ hubinta server-ka nooca app-ga waa ka hooseeyaa kan la oggol yahay. fadlan cusbooneysii app-ka nooca ugu dambeeya. Ku dar falanqeey (ixtiyaacsi ah) + %s Meerah soo gudbin lama heli karo ma jiraan wada sheekaysi hore diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b0bdc046c0..045423963f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,7 @@ My Planet + Planet myPlanet settings username @@ -1045,6 +1046,7 @@ checking server app is below allowed version. please update the app to the latest version. add a note (optional) + %s\'s Planet submissions not available no previous chats