From e58e12ad5e3272c1b989b2ddaf4a24e742825601 Mon Sep 17 00:00:00 2001 From: PWRxPSYCHO Date: Thu, 10 Mar 2022 08:52:23 -0500 Subject: [PATCH] Added hard-coded strings to translations --- .../java/com/geeksville/mesh/ui/MapFragment.kt | 16 ++++++++-------- app/src/main/res/values/strings.xml | 8 ++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt index 845d32991..3808aeb95 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt @@ -345,7 +345,7 @@ class MapFragment : ScreenFragment("Map"), Logging { expected.error?.let { Toast.makeText( requireContext(), - "Unable to download style pack", + R.string.stylepack_download_error_alert, Toast.LENGTH_SHORT ).show() // Handle error occurred during the style pack download. @@ -415,7 +415,7 @@ class MapFragment : ScreenFragment("Map"), Logging { expected.error?.let { Toast.makeText( requireContext(), - "Unable to download TileRegion", + R.string.tileregion_error_alert, Toast.LENGTH_SHORT ).show() // Handle error occurred during the tile region download. @@ -425,7 +425,7 @@ class MapFragment : ScreenFragment("Map"), Logging { } else { Toast.makeText( requireContext(), - "You are not connected to the internet, you cannot download an offline map", + R.string.download_region_connection_alert, Toast.LENGTH_LONG ).show() } @@ -553,7 +553,7 @@ class MapFragment : ScreenFragment("Map"), Logging { downloadRegionDialogFragment.setView(mapDownloadView) - .setTitle("Download Region") + .setTitle(R.string.download_region_dialog_title) .setMultiChoiceItems( R.array.MapMenuCheckbox, null, @@ -571,9 +571,9 @@ class MapFragment : ScreenFragment("Map"), Logging { } } .setPositiveButton( - "Save", null + R.string.save_btn, null ) - .setNeutralButton("View Region") { _, _ -> + .setNeutralButton(R.string.view_region_btn) { _, _ -> if (tileRegionDownloadSuccess && stylePackDownloadSuccess) { mapView?.getMapboxMap().also { it?.flyTo( @@ -593,7 +593,7 @@ class MapFragment : ScreenFragment("Map"), Logging { } else { Toast.makeText( requireContext(), - "No downloaded region available", + R.string.no_download_region_alert, Toast.LENGTH_SHORT ).show() } @@ -630,7 +630,7 @@ class MapFragment : ScreenFragment("Map"), Logging { } else { Toast.makeText( requireContext(), - "Style URI cannot be empty", + R.string.style_uri_empty_alert, Toast.LENGTH_SHORT ).show() } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 893939168..3802ae091 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -130,4 +130,12 @@ Style Selection Download Region Name + View Region + Save + No downloaded region available + Style URI cannot be empty + Download Region + You are not connected to the internet, you cannot download an offline map + Unable to download TileRegion + Unable to download style pack \ No newline at end of file