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

Merge branch 'master' of https://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
xmd5a 2015-08-26 14:17:31 +03:00
commit 05f327fe7c
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java
View file

@ -147,7 +147,7 @@ public class OpeningHoursParser {
return s.substring(0, s.length()-2); return s.substring(0, s.length()-2);
} }
public String toStringNoMoths() { public String toStringNoMonths() {
StringBuilder s = new StringBuilder(); StringBuilder s = new StringBuilder();
if (rules.isEmpty()) { if (rules.isEmpty()) {
return ""; return "";

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

@ -2334,10 +2334,10 @@
<string name="rate_this_app_long">구글 플레이에 OsmAnd을 평가해 주세요</string> <string name="rate_this_app_long">구글 플레이에 OsmAnd을 평가해 주세요</string>
<string name="user_hates_app_get_feedback">우리에게 이유를 가르쳐 쥬세요.</string> <string name="user_hates_app_get_feedback">우리에게 이유를 가르쳐 쥬세요.</string>
<string name="user_hates_app_get_feedback_long">우리가 이 응용 프로그램에서 무엇을 변경 해야 하는 지 알려 주세요.</string> <string name="user_hates_app_get_feedback_long">우리가 이 응용 프로그램에서 무엇을 변경 해야 하는 지 알려 주세요.</string>
<string name="failed_to_upload">업로드 하지 못했습니다.</string> <string name="failed_to_upload">업로드 하지 못했습니다</string>
<string name="delete_change">변경을 삭제합니다</string> <string name="delete_change">변경을 삭제합니다</string>
<string name="successfully_uploaded_pattern">성공적으로 업로드 {0}/{1}</string> <string name="successfully_uploaded_pattern">성공적으로 업로드 {0}/{1}</string>
<string name="try_again">다시 시도하십시오.</string> <string name="try_again">다시 시도하십시오</string>
<string name="error_message_pattern">오류: {0}</string> <string name="error_message_pattern">오류: {0}</string>
<string name="dahboard_options_dialog_title">대시보드 옵션</string> <string name="dahboard_options_dialog_title">대시보드 옵션</string>
<string name="shared_string_card_was_hidden">카드는 숨겨졌습니다</string> <string name="shared_string_card_was_hidden">카드는 숨겨졌습니다</string>

4
OsmAnd/src/net/osmand/plus/osmedit/AdvancedDataFragment.java
View file

@ -16,6 +16,7 @@ import android.widget.ImageButton;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import net.osmand.PlatformUtil;
import net.osmand.osm.PoiType; import net.osmand.osm.PoiType;
import net.osmand.osm.edit.OSMSettings; import net.osmand.osm.edit.OSMSettings;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
@ -24,11 +25,14 @@ import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.osmedit.data.EditPoiData; import net.osmand.plus.osmedit.data.EditPoiData;
import net.osmand.plus.osmedit.data.Tag; import net.osmand.plus.osmedit.data.Tag;
import org.apache.commons.logging.Log;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
public class AdvancedDataFragment extends Fragment { public class AdvancedDataFragment extends Fragment {
private static final String TAG = "AdvancedDataFragment"; private static final String TAG = "AdvancedDataFragment";
private static final Log LOG = PlatformUtil.getLog(AdvancedDataFragment.class);
private TagAdapterLinearLayoutHack mAdapter; private TagAdapterLinearLayoutHack mAdapter;
private EditPoiData.TagsChangedListener mTagsChangedListener; private EditPoiData.TagsChangedListener mTagsChangedListener;

2
OsmAnd/src/net/osmand/plus/osmedit/EditPoiFragment.java
View file

@ -297,7 +297,7 @@ public class EditPoiFragment extends Fragment {
fragmentManager.popBackStack(); fragmentManager.popBackStack();
} }
}); });
updateType(editPoiData.amenity);
return view; return view;
} }

2
OsmAnd/src/net/osmand/plus/osmedit/NormalDataFragment.java
View file

@ -295,7 +295,7 @@ public class NormalDataFragment extends Fragment {
} }
if (mIsUserInput) { if (mIsUserInput) {
Tag openHours = new Tag(OSMSettings.OSMTagKey.OPENING_HOURS.getValue(), Tag openHours = new Tag(OSMSettings.OSMTagKey.OPENING_HOURS.getValue(),
openingHours.toStringNoMoths()); openingHours.toStringNoMonths());
data.tags.remove(openHours); data.tags.remove(openHours);
data.tags.add(openHours); data.tags.add(openHours);
data.notifyDatasetChanged(null); data.notifyDatasetChanged(null);