diff options
| -rw-r--r-- | android/res/values-de/strings.xml | 2 | ||||
| -rw-r--r-- | android/res/values-es/strings.xml | 2 | ||||
| -rw-r--r-- | android/res/values-fr/strings.xml | 2 | ||||
| -rw-r--r-- | android/res/values-ru/strings.xml | 5 | ||||
| -rw-r--r-- | android/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | android/src/com/mapswithme/maps/DownloadResourcesActivity.java | 22 | ||||
| -rw-r--r-- | strings.txt | 7 |
7 files changed, 37 insertions, 8 deletions
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index 9c56b0e813..b4876134b7 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Android Strings File --> -<!-- Generated by Twine 0.2.2 --> +<!-- Generated by Twine 0.3.0 --> <!-- Language: de --> <resources> <!-- Strings --> diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index 50e489ef08..df620124e7 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Android Strings File --> -<!-- Generated by Twine 0.2.2 --> +<!-- Generated by Twine 0.3.0 --> <!-- Language: es --> <resources> <!-- Strings --> diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index 9f12ca1f96..d19f1cae8a 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Android Strings File --> -<!-- Generated by Twine 0.2.2 --> +<!-- Generated by Twine 0.3.0 --> <!-- Language: fr --> <resources> <!-- Strings --> diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 1af37b2680..a13aeb2200 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Android Strings File --> -<!-- Generated by Twine 0.2.2 --> +<!-- Generated by Twine 0.3.0 --> <!-- Language: ru --> <resources> <!-- Strings --> @@ -136,8 +136,11 @@ <string name="download_resources_continue">Перейти на карту</string> <string name="downloading_country_can_proceed">Пока загружается %s \nвы можете пользоваться приложением.</string> <string name="download_country_ask">Загрузить %s?</string> + <string name="update_country_ask">Обновить %s?</string> <!-- REMOVE THIS STRING AFTER REFACTORING --> <string name="download_location_map_proposal">Вы можете загрузить карту\nвашего текущего местоположения.</string> + <!-- REMOVE THIS_STRING AFTER REFACTORING --> + <string name="download_location_update_map_proposal">Вы можете обновить карту\nвашего текущего местоположения.</string> <!-- REMOVE THIS STRING AFTER REFACTORING --> <string name="download_location_map_up_to_date">Карта местности, в которой\nвы находитесь (%s) уже загружена.</string> <!-- REMOVE THIS STRING AFTER REFACTORING --> diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 6486575ef0..148249fc1d 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Android Strings File --> -<!-- Generated by Twine 0.2.2 --> +<!-- Generated by Twine 0.3.0 --> <!-- Language: en --> <resources> <!-- Strings --> @@ -137,8 +137,11 @@ <string name="download_resources_continue">Go to map</string> <string name="downloading_country_can_proceed">Downloading %s. You can now\n\"proceed to the map.</string> <string name="download_country_ask">Download %s?</string> + <string name="update_country_ask">Update %s?</string> <!-- REMOVE THIS STRING AFTER REFACTORING --> <string name="download_location_map_proposal">You can download the map\nof your current location.</string> + <!-- REMOVE THIS_STRING AFTER REFACTORING --> + <string name="download_location_update_map_proposal">You can update the map\of your current location.</string> <!-- REMOVE THIS STRING AFTER REFACTORING --> <string name="download_location_map_up_to_date">The map at your current\nlocation (%s) is up-to-date</string> <!-- REMOVE THIS STRING AFTER REFACTORING --> diff --git a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java index 88d99d3b48..707f77c440 100644 --- a/android/src/com/mapswithme/maps/DownloadResourcesActivity.java +++ b/android/src/com/mapswithme/maps/DownloadResourcesActivity.java @@ -356,14 +356,30 @@ public class DownloadResourcesActivity extends Activity implements LocationServi mCountryName = findCountryByPos(lat, lon); if (mCountryName != null) { - if (mMapStorage.countryStatus(mMapStorage.findIndexByName(mCountryName)) == MapStorage.ON_DISK) + int countryStatus = mMapStorage.countryStatus(mMapStorage.findIndexByName(mCountryName)); + if (countryStatus == MapStorage.ON_DISK) mLocationMsgView.setText(String.format(getString(R.string.download_location_map_up_to_date), mCountryName)); else { - mLocationMsgView.setText(getString(R.string.download_location_map_proposal)); CheckBox checkBox = (CheckBox)findViewById(R.id.download_country_checkbox); checkBox.setVisibility(View.VISIBLE); - checkBox.setText(String.format(getString(R.string.download_country_ask), mCountryName)); + + String msgViewText; + String checkBoxText; + + if (countryStatus == MapStorage.ON_DISK_OUT_OF_DATE) + { + msgViewText = getString(R.string.download_location_update_map_proposal); + checkBoxText = String.format(getString(R.string.update_country_ask), mCountryName); + } + else + { + msgViewText = getString(R.string.download_location_map_proposal); + checkBoxText = String.format(getString(R.string.download_country_ask), mCountryName); + } + + mLocationMsgView.setText(msgViewText); + checkBox.setText(checkBoxText); } mLocationService.stopUpdate(this); diff --git a/strings.txt b/strings.txt index 9e80ae6fd4..fb6ca647d2 100644 --- a/strings.txt +++ b/strings.txt @@ -558,10 +558,17 @@ [download_country_ask] en = Download %@? ru = Загрузить %@? + [update_country_ask] + en = Update %@? + ru = Обновить %@? [download_location_map_proposal] en = You can download the map\nof your current location. comment = REMOVE THIS STRING AFTER REFACTORING ru = Вы можете загрузить карту\nвашего текущего местоположения. + [download_location_update_map_proposal] + en = You can update the map\of your current location. + comment = REMOVE THIS_STRING AFTER REFACTORING + ru = Вы можете обновить карту\nвашего текущего местоположения. [download_location_map_up_to_date] en = The map at your current\nlocation (%@) is up-to-date comment = REMOVE THIS STRING AFTER REFACTORING |