upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 09:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use a different name for new strings.

Browse Source
This commit is contained in:
Jimmy Shih
2012-08-01 13:40:16 -07:00
parent 2dbd2ff956
commit f0de32eb04
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/strings.xml
+2 -2
View File
@@ -672,7 +672,7 @@ limitations under the License.
for all applications. See Settings -> Location access.">
\'Location access\'
</string>
<string name="gps_need_to_enable"
<string name="gps_disabled"
translation_description="In the main view, the message on the top asking the user to enable
GPS.
@@ -1176,7 +1176,7 @@ limitations under the License.
indicating that GPS is not available and an approximate location is used instead.">
GPS is not available. An approximate location based on cell towers and WiFi networks is shown.
</string>
<string name="my_location_no_location"
<string name="my_location_no_gps"
translation_description="When displaying the user's current location, a status message
indicating that the current location cannot be determined.
MyTracks/src/com/google/android/apps/mytracks/content/DataSourcesWrapperImpl.java
+1 -1
View File
@@ -165,7 +165,7 @@ class DataSourcesWrapperImpl implements DataSourcesWrapper {
String setting = context.getString(
GoogleLocationUtils.isAvailable(context) ? R.string.gps_google_location_settings
: R.string.gps_location_access);
toast = context.getString(R.string.my_location_no_location, setting);
toast = context.getString(R.string.my_location_no_gps, setting);
}
// Let the user know we have only an approximate location:
MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
+1 -1
View File
@@ -283,7 +283,7 @@ public class MapFragment extends Fragment
String setting = getString(
GoogleLocationUtils.isAvailable(getActivity()) ? R.string.gps_google_location_settings
: R.string.gps_location_access);
message = getString(R.string.gps_need_to_enable, setting);
message = getString(R.string.gps_disabled, setting);
isGpsDisabled = true;
break;
case NO_FIX:
MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/GoToMyLocationTest.java
+5 -1
View File
@@ -16,6 +16,7 @@
package com.google.android.apps.mytracks.endtoendtest;
import com.google.android.apps.mytracks.TrackListActivity;
import com.google.android.apps.mytracks.util.GoogleLocationUtils;
import com.google.android.maps.mytracks.R;
import android.annotation.TargetApi;
@@ -57,8 +58,11 @@ public class GoToMyLocationTest extends ActivityInstrumentationTestCase2<TrackLi
.findViewById(R.id.map_my_location);
EndToEndTestUtils.SOLO.clickOnView(myLocation);
if (EndToEndTestUtils.isEmulator) {
String setting = activityMyTracks.getString(
GoogleLocationUtils.isAvailable(activityMyTracks) ? R.string.gps_google_location_settings
: R.string.gps_location_access);
EndToEndTestUtils.SOLO.waitForText(
activityMyTracks.getString(R.string.my_location_no_location), 1, 1000);
activityMyTracks.getString(R.string.my_location_no_gps, setting), 1, 1000);
} else {
// TODO How to verify the location is shown on the map.
}