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 2016-07-04 21:44:47 +02:00
commit 41f9d4a6c4
2 changed files with 6 additions and 4 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="shared_string_open_POIs">Open POIs</string>
<string name="shared_string_open_24_7">Open 24/7</string>
<string name="storage_directory_card">Memory card</string>
<string name="coords_format">Coordinate format</string>
<string name="coords_format_descr">Format for the geographical coordinates</string>

8
OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
View file

@ -361,8 +361,8 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
return true;
}
});
addFilter(optionsMenu, getString(R.string.shared_string_open).toLowerCase());
addFilter(optionsMenu, "24/7");
addFilter(optionsMenu, getString(R.string.shared_string_open_POIs));
addFilter(optionsMenu, getString(R.string.shared_string_open_open_24_7));
Map<String, PoiType> poiAdditionals = f.getPoiAdditionals();
if(poiAdditionals != null) {
TreeMap<String, PoiType> adds = new TreeMap<String, PoiType>();
@ -381,7 +381,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
private void addFilter(PopupMenu optionsMenu, final String value) {
IconsCache iconsCache = getMyApplication().getIconsCache();
MenuItem item = optionsMenu.getMenu().add(getString(R.string.search_poi_filter) + " " + value)
MenuItem item = optionsMenu.getMenu().add(getString(R.string.search_poi_filter) + ": " + value)
.setIcon(iconsCache.getThemedIcon(R.drawable.ic_action_filter_dark));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
@ -389,7 +389,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
if(searchFilterLayout.getVisibility() == View.GONE) {
searchFilterLayout.setVisibility(View.VISIBLE);
}
searchFilter.setText((searchFilter.getText().toString() + " " + value).trim());
searchFilter.setText((searchFilter.getText().toString() + ": " + value).trim());
return true;
}
});