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

update strings

Browse source
This commit is contained in:
Victor Shcherb 2013-07-24 00:55:08 +02:00
parent fc9e43ac8c
commit 4b54e618a7
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,12 @@
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="speak_title">Announce &#8230;</string>
<string name="speak_descr">Configure to announce street names, traffic warnings (forced stops, speed bumps), speed camera warnings, speed limits</string>
<string name="speak_street_name">Announce speed limit</string>
<string name="speak_speed_limit">Announce speed limit</string>
<string name="speak_cameras">Announce speed cameras</string>
<string name="speak_traffic_warnings">Announce traffic warnings</string>
<string name="tip_recent_changes_1_5_t">Changes in 1.5:
\n\t* Voice warnings about speed limits and cameras
\n\t* High density map icons
@ -28,11 +34,6 @@
<string name="route_to">To:</string>
<string name="route_via">Via:</string>
<string name="route_from">From:</string>
<string name="speak_warnings_title">Announce alarms&#8230;</string>
<string name="speak_warnings_descr">Configure traffic warnings (forced stops, speed bumps), speed camera warnings, speed limits</string>
<string name="speak_speed_limit">Announce speed limit</string>
<string name="speak_cameras">Announce speed cameras</string>
<string name="speak_traffic_warnings">Announce traffic warnings</string>
<string name="local_index_gpx_timespan">\nTime span: %1$d:%2$02d:%3$02d</string>
<string name="local_index_gpx_timemoving">\nTime moving: %1$d:%2$02d:%3$02d</string>
<string name="app_mode_default">Browse map</string>

1
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -684,6 +684,7 @@ public class OsmandSettings {
public final OsmandPreference<Boolean> SHOW_LANES = new BooleanPreference("show_lanes", true).makeProfile().cache();
public final OsmandPreference<Boolean> SPEAK_TRAFFIC_WARNINGS = new BooleanPreference("speak_traffic_warnings", true).makeProfile().cache();
public final OsmandPreference<Boolean> SPEAK_STREET_NAMES = new BooleanPreference("speak_street_names", true).makeProfile().cache();
public final OsmandPreference<Boolean> SPEAK_SPEED_CAMERA = new BooleanPreference("speak_cameras", true).makeProfile().cache();
public final OsmandPreference<Boolean> SPEAK_SPEED_LIMIT = new BooleanPreference("speak_speed_limit", true).makeProfile().cache();

2
OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
View file

@ -392,7 +392,7 @@ public class VoiceRouter {
}
public String getSpeakableStreetName(RouteDirectionInfo i) {
if(i == null){
if(i == null || !router.getSettings().SPEAK_STREET_NAMES.get()){
return "";
}
if(!Algorithms.isEmpty(i.getRef())) {