Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dashboard: better strings (fixes #3683) #3684

Merged
merged 18 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdkVersion 21
targetSdkVersion 34
versionCode 1640
versionName "0.16.40"
versionCode 1641
versionName "0.16.41"
ndkVersion '21.3.6528147'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">My Planet</string>
<string name="planet">كوكب</string>
<string name="app_project_name">myPlanet</string>
<string name="action_settings">الإعدادات</string>
<string name="hint_name">اسم المستخدم</string>
Expand Down Expand Up @@ -1045,6 +1046,7 @@
<string name="checking_server">جارٍ فحص الخادم</string>
<string name="below_min_apk">إصدار Apk أقل من المسموح. يرجى تحديث التطبيق إلى أحدث إصدار.</string>
<string name="add_note">إضافة ملاحظة (اختياري)</string>
<string name="planet_name">كوكب %s</string>
<string name="no_submissions">التقديمات غير متاحة</string>
<string name="no_chats">لا توجد محادثات سابقة</string>

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">My Planet</string>
<string name="planet">Planeta</string>
<string name="app_project_name">myPlanet</string>
<string name="action_settings">configuración</string>
<string name="hint_name">Nombre</string>
Expand Down Expand Up @@ -1045,6 +1046,7 @@
<string name="checking_server">verificando el servidor</string>
<string name="below_min_apk">la versión de la aplicación está por debajo de la permitida. Actualice la aplicación a la última versión.</string>
<string name="add_note">Agregar una nota (opcional)</string>
<string name="planet_name">%s Planeta</string>
<string name="no_submissions">envíos no disponibles</string>
<string name="no_chats">no hay chats anteriores</string>

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">My Planet</string>
<string name="planet">planète</string>
<string name="app_project_name">myPlanet</string>
<string name="action_settings">paramètres</string>
<string name="hint_name">Nom d\'utilisateur</string>
Expand Down Expand Up @@ -1045,6 +1046,7 @@
<string name="checking_server">vérification du serveur</string>
<string name="below_min_apk">la version de l\'app est inférieure à celle autorisée. veuillez mettre à jour l\'application vers la dernière version.</string>
<string name="add_note">Ajouter une note (optionnel)</string>
<string name="planet_name">%s planète</string>
<string name="no_submissions">soumissions non disponibles</string>
<string name="no_chats">aucune discussion précédente</string>

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-ne/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">My Planet</string>
<string name="planet">ग्रह</string>
<string name="app_project_name">myPlanet</string>
<string name="action_settings">सेटिङ्स</string>
<string name="hint_name">प्रयोगकर्तानाम</string>
Expand Down Expand Up @@ -1045,6 +1046,7 @@
<string name="checking_server">सर्भर जाँच गर्दै</string>
<string name="below_min_apk">एप संस्करण अनुमत संस्करणभन्दा कम छ। कृपया अनुप्रयोगलाई नवीनतम संस्करणमा अद्यावधिक गर्नुहोस्।</string>
<string name="add_note">नोट थप्नुहोस् (वैकल्पिक)</string>
<string name="planet_name">%s ग्रह</string>
<string name="no_submissions">पेशाहरू उपलब्ध छैनन्</string>
<string name="no_chats">अघिल्ला कुराकानीहरू छैनन्</string>

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-so/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">My Planet</string>
<string name="planet">Meerah</string>
<string name="app_project_name">myPlanet</string>
<string name="action_settings">goobooyinka</string>
<string name="hint_name">Magaca isticmaalaha</string>
Expand Down Expand Up @@ -1045,6 +1046,7 @@
<string name="checking_server">hubinta server-ka</string>
<string name="below_min_apk">nooca app-ga waa ka hooseeyaa kan la oggol yahay. fadlan cusbooneysii app-ka nooca ugu dambeeya.</string>
<string name="add_note">Ku dar falanqeey (ixtiyaacsi ah)</string>
<string name="planet_name">%s Meerah</string>
<string name="no_submissions">soo gudbin lama heli karo</string>
<string name="no_chats">ma jiraan wada sheekaysi hore</string>

Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">My Planet</string>
<string name="planet">Planet</string>
<string name="app_project_name">myPlanet</string>
<string name="action_settings">settings</string>
<string name="hint_name">username</string>
Expand Down Expand Up @@ -1045,6 +1046,7 @@
<string name="checking_server">checking server</string>
<string name="below_min_apk">app is below allowed version. please update the app to the latest version.</string>
<string name="add_note">add a note (optional)</string>
<string name="planet_name">%s\'s Planet</string>
<string name="no_submissions">submissions not available</string>
<string name="no_chats">no previous chats</string>

Expand Down