meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

repo(release): merge changes from 2.7.0 to main (#3070)

Browse source 
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
Co-authored-by: DaneEvans <dane@goneepic.com>
This commit is contained in:
James Rich 2025-09-10 15:59:57 -05:00 • committed by GitHub
parent 94f30ef540
commit 3c726457eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 84 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/geeksville/mesh/ui/Main.kt
View file

@ -420,7 +420,7 @@ private fun VersionChecks(viewModel: UIViewModel) {
LaunchedEffect(connectionState, myNodeInfo) {
if (connectionState == ConnectionState.CONNECTED) {
myNodeInfo?.let { info ->
val isOld = info.minAppVersion > BuildConfig.VERSION_CODE
val isOld = info.minAppVersion > BuildConfig.VERSION_CODE && BuildConfig.DEBUG.not()
if (isOld) {
viewModel.showAlert(
context.getString(R.string.app_too_old),

4
app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt
View file

@ -57,7 +57,7 @@ object LanguageUtils : Logging {
context.resources.getXml(R.xml.locales_config).use {
while (it.eventType != XmlPullParser.END_DOCUMENT) {
if (it.eventType == XmlPullParser.START_TAG && it.name == "locale") {
languageTags += it.getAttributeValue(0)
it.getAttributeValue(0)?.let { tag -> languageTags += tag }
}
it.next()
}
@ -66,7 +66,7 @@ object LanguageUtils : Logging {
errormsg("Error parsing locale_config.xml ${e.message}")
}
return languageTags.associateBy { tag ->
val loc = Locale(tag)
val loc = Locale.forLanguageTag(tag)
when (tag) {
SYSTEM_DEFAULT -> context.getString(R.string.preferences_system_default)
"fr-HT" -> context.getString(R.string.fr_HT)

76
app/src/main/res/xml/locales_config.xml
View file

@ -1,40 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
<locale android:name="en"/> <!-- English (ultimate fallback locale) -->
<locale android:name="bg"/> <!-- Bulgarian -->
<locale android:name="ca"/> <!-- Catalan -->
<locale android:name="cs"/> <!-- Czech -->
<locale android:name="zh-CN"/> <!-- Chinese Simplified -->
<locale android:name="zh-TW"/> <!-- Chinese Traditional -->
<locale android:name="de"/> <!-- German -->
<locale android:name="et"/> <!-- Estonian -->
<locale android:name="es"/> <!-- Spanish (Spain) -->
<locale android:name="fr"/> <!-- French (France) -->
<locale android:name="ga"/> <!-- Irish -->
<locale android:name="gl"/> <!-- Galician -->
<locale android:name="hr"/> <!-- Croatian -->
<locale android:name="el"/> <!-- Greek -->
<locale android:name="fr-HT"/> <!-- Haitian Creole -->
<locale android:name="it"/> <!-- Italian -->
<locale android:name="is"/> <!-- Icelandic -->
<locale android:name="iw"/> <!-- Hebrew -->
<locale android:name="ja"/> <!-- Japanese -->
<locale android:name="ko"/> <!-- Korean -->
<locale android:name="lt"/> <!-- Lithuanian -->
<locale android:name="hu"/> <!-- Hungarian -->
<locale android:name="nl"/> <!-- Dutch -->
<locale android:name="nb"/> <!-- Norwegian -->
<locale android:name="pl"/> <!-- Polish -->
<locale android:name="pt"/> <!-- Portuguese -->
<locale android:name="pt-BR"/> <!-- Portuguese (Brazil) -->
<locale android:name="ro"/> <!-- Romanian -->
<locale android:name="ru"/> <!-- Russian -->
<locale android:name="sq"/> <!-- Albanian -->
<locale android:name="sr"/> <!-- Serbian (Cyrillic) -->
<locale android:name="sk"/> <!-- Slovak -->
<locale android:name="sl"/> <!-- Slovenian -->
<locale android:name="fi"/> <!-- Finnish -->
<locale android:name="sv"/> <!-- Swedish -->
<locale android:name="tr"/> <!-- Turkish -->
<locale android:name="uk"/> <!-- Ukrainian -->
<locale android:name="en"/>
<locale android:name="ar-SA"/>
<locale android:name="sr-Latn"/>
<locale android:name="bg-BG"/>
<locale android:name="ca-ES"/>
<locale android:name="cs-CZ"/>
<locale android:name="de-DE"/>
<locale android:name="el-GR"/>
<locale android:name="es-ES"/>
<locale android:name="et-EE"/>
<locale android:name="fi-FI"/>
<locale android:name="fr-FR"/>
<locale android:name="ga-IE"/>
<locale android:name="gl-ES"/>
<locale android:name="hr-HR"/>
<locale android:name="ht-HT"/>
<locale android:name="hu-HU"/>
<locale android:name="is-IS"/>
<locale android:name="it-IT"/>
<locale android:name="iw-IL"/>
<locale android:name="ja-JP"/>
<locale android:name="ko-KR"/>
<locale android:name="lt-LT"/>
<locale android:name="nl-NL"/>
<locale android:name="nb-NO"/>
<locale android:name="pl-PL"/>
<locale android:name="pt-BR"/>
<locale android:name="pt-PT"/>
<locale android:name="ro-RO"/>
<locale android:name="ru-RU"/>
<locale android:name="sk-SK"/>
<locale android:name="sl-SI"/>
<locale android:name="sq-AL"/>
<locale android:name="sr"/>
<locale android:name="sv-SE"/>
<locale android:name="tr-TR"/>
<locale android:name="uk-UA"/>
<locale android:name="zh-CN"/>
<locale android:name="zh-TW"/>
</locale-config>