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

Better wording for search screen headlines

Browse source
This commit is contained in:
sonora 2014-12-27 10:51:42 +01:00
parent 2306d00804
commit d286896b41
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/res/values-de/strings.xml
View file

@ -610,12 +610,12 @@
<string name="search_position_current_location_search">Standort wird ermittelt…</string> <string name="search_position_current_location_search">Standort wird ermittelt…</string>
<string name="search_position_current_location_found">Standort (gefunden)</string> <string name="search_position_current_location_found">Standort (gefunden)</string>
<string name="search_position_address">Adresse…</string> <string name="search_position_address">Adresse…</string>
<string name="search_position_favorites">Favoriten…</string> <string name="search_position_favorites">Favorit…</string>
<string name="search_position_undefined">Undefiniert</string> <string name="search_position_undefined">Undefiniert</string>
<string name="search_position_fixed">Festgelegt</string> <string name="search_position_fixed"></string>
<string name="search_position_current_location">Aktueller Standort…</string> <string name="search_position_current_location">Aktueller Standort…</string>
<string name="search_position_map_view">Letzte Kartenposition</string> <string name="search_position_map_view">Letzte Kartenposition</string>
<string name="select_search_position">Suchen in der Nähe von:</string> <string name="select_search_position">Ausgangspunkt:</string>
<string name="context_menu_item_search">In der Nähe suchen</string> <string name="context_menu_item_search">In der Nähe suchen</string>
<string name="save_route_dialog_title">Route als GPX-Track speichern</string> <string name="save_route_dialog_title">Route als GPX-Track speichern</string>
<string name="route_successfully_saved_at">Route erfolgreich gespeichert als \'%1$s\'.</string> <string name="route_successfully_saved_at">Route erfolgreich gespeichert als \'%1$s\'.</string>

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

@ -1474,10 +1474,10 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="search_position_address">Address&#8230;</string> <string name="search_position_address">Address&#8230;</string>
<string name="search_position_favorites">Favorites&#8230;</string> <string name="search_position_favorites">Favorites&#8230;</string>
<string name="search_position_undefined">Undefined</string> <string name="search_position_undefined">Undefined</string>
<string name="search_position_fixed">Fixed</string> <string name="search_position_fixed"></string>
<string name="search_position_current_location">Current position&#8230;</string> <string name="search_position_current_location">Current position&#8230;</string>
<string name="search_position_map_view">Last map view</string> <string name="search_position_map_view">Last map view</string>
<string name="select_search_position">Search near:</string> <string name="select_search_position">Origin:</string>
<string name="context_menu_item_search">Search near here</string> <string name="context_menu_item_search">Search near here</string>
<string name="tip_recent_changes_0_6_7_t">Recent changes for 0.6.7: <string name="tip_recent_changes_0_6_7_t">Recent changes for 0.6.7:
\n\t- Offline data manager (download, delete, activate / deactivate offline data directly in OsmAnd) \n\t- Offline data manager (download, delete, activate / deactivate offline data directly in OsmAnd)

12
OsmAnd/src/net/osmand/plus/activities/search/SearchActivity.java
View file

@ -169,7 +169,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
LatLon l = new LatLon(lat, lon); LatLon l = new LatLon(lat, lon);
if(!Algorithms.objectEquals(reqSearchPoint, l)){ if(!Algorithms.objectEquals(reqSearchPoint, l)){
reqSearchPoint = l; reqSearchPoint = l;
updateSearchPoint(reqSearchPoint, getString(R.string.search_position_fixed), true); updateSearchPoint(reqSearchPoint, getString(R.string.select_search_position) + " " + getString(R.string.search_position_fixed), true);
} }
} }
} }
@ -239,7 +239,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
searchAroundCurrentLocation = false; searchAroundCurrentLocation = false;
endSearchCurrentLocation(); endSearchCurrentLocation();
if (position == POSITION_LAST_MAP_VIEW) { if (position == POSITION_LAST_MAP_VIEW) {
updateSearchPoint(settings.getLastKnownMapLocation(), getString(R.string.search_position_fixed), true); updateSearchPoint(settings.getLastKnownMapLocation(), getString(R.string.select_search_position) + " " + getString(R.string.search_position_fixed), true);
} else if (position == POSITION_FAVORITES) { } else if (position == POSITION_FAVORITES) {
Intent intent = new Intent(SearchActivity.this, FavouritesListActivity.class); Intent intent = new Intent(SearchActivity.this, FavouritesListActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
@ -276,7 +276,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
FavouritePoint p = (FavouritePoint) data.getSerializableExtra(FavouritesListFragment.SELECT_FAVORITE_POINT_INTENT_KEY); FavouritePoint p = (FavouritePoint) data.getSerializableExtra(FavouritesListFragment.SELECT_FAVORITE_POINT_INTENT_KEY);
if (p != null) { if (p != null) {
LatLon latLon = new LatLon(p.getLatitude(), p.getLongitude()); LatLon latLon = new LatLon(p.getLatitude(), p.getLongitude());
updateSearchPoint(latLon, p.getName(), false); updateSearchPoint(latLon, getString(R.string.select_search_position) + " " + p.getName(), false);
} }
} else if(requestCode == REQUEST_ADDRESS_SELECT && resultCode == SearchAddressFragment.SELECT_ADDRESS_POINT_RESULT_OK){ } else if(requestCode == REQUEST_ADDRESS_SELECT && resultCode == SearchAddressFragment.SELECT_ADDRESS_POINT_RESULT_OK){
String name = data.getStringExtra(SearchAddressFragment.SELECT_ADDRESS_POINT_INTENT_KEY); String name = data.getStringExtra(SearchAddressFragment.SELECT_ADDRESS_POINT_INTENT_KEY);
@ -284,9 +284,9 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
data.getDoubleExtra(SearchAddressFragment.SELECT_ADDRESS_POINT_LAT, 0), data.getDoubleExtra(SearchAddressFragment.SELECT_ADDRESS_POINT_LAT, 0),
data.getDoubleExtra(SearchAddressFragment.SELECT_ADDRESS_POINT_LON, 0)); data.getDoubleExtra(SearchAddressFragment.SELECT_ADDRESS_POINT_LON, 0));
if(name != null){ if(name != null){
updateSearchPoint(latLon, name, false); updateSearchPoint(latLon, getString(R.string.select_search_position) + " " + name, false);
} else { } else {
updateSearchPoint(latLon, getString(R.string.search_position_fixed), true); updateSearchPoint(latLon, getString(R.string.select_search_position) + " " + getString(R.string.search_position_fixed), true);
} }
} }
} }
@ -295,7 +295,7 @@ public class SearchActivity extends SherlockFragmentActivity implements OsmAndLo
public void updateLocation(net.osmand.Location location){ public void updateLocation(net.osmand.Location location){
if (location != null) { if (location != null) {
updateSearchPoint(new LatLon(location.getLatitude(), location.getLongitude()), updateSearchPoint(new LatLon(location.getLatitude(), location.getLongitude()),
getString(R.string.search_position_current_location_found), false); getString(R.string.select_search_position) + " " + getString(R.string.search_position_current_location_found), false);
if (location.getAccuracy() < 20) { if (location.getAccuracy() < 20) {
endSearchCurrentLocation(); endSearchCurrentLocation();
} }