Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-03-28 10:29:54 +01:00
commit c3eac4a387
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values/strings.xml
View file

@ -9,6 +9,8 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="agps_info">A-GPS info</string>
<string name="agps_data_last_downloaded">A-GPS data last downloaded: %1$s</string>
<string name="confirm_usage_speed_cameras">In many countries (Germany, France, Italy, and others) the use of speed camera warnings is not permitted by law. OsmAnd does assume any liability if you violate the law. Please click yes only if you are eligible to use this feature.</string>
<string name="welmode_download_maps">Download maps</string>
<string name="welcome_select_region">Select your region</string>

17
OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
View file

@ -98,6 +98,20 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
//pref.setEnabled(false);
cat.addPreference(pref);
long agpsLastDonwloaded = settings.AGPS_DATA_LAST_TIME_DOWNLOADED.get();
pref = new Preference(this);
pref.setTitle(R.string.agps_info);
if (agpsLastDonwloaded != null) {
SimpleDateFormat prt = new SimpleDateFormat("yyyy-MM-dd HH:mm");
pref.setSummary(getString(R.string.agps_data_last_downloaded, prt.format(agpsLastDonwloaded))));
} else {
pref.setSummary(getString(R.string.agps_data_last_downloaded, "null",
"null"));
}
pref.setSelectable(false);
//setEnabled(false) creates bad readability on some devices
//pref.setEnabled(false);
cat.addPreference(pref);
SunriseSunset sunriseSunset = getMyApplication().getDaynightHelper().getSunriseSunset();
pref = new Preference(this);
@ -107,8 +121,7 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
pref.setSummary(getString(R.string.day_night_info_description, prt.format(sunriseSunset.getSunrise()),
prt.format(sunriseSunset.getSunset())));
} else {
pref.setSummary(getString(R.string.day_night_info_description, "null",
"null"));
pref.setSummary(getString(R.string.day_night_info_description, "null"));
}
pref.setSelectable(false);
//setEnabled(false) creates bad readability on some devices