karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2013-06-25 09:57:20 -07:00
parent 7dc86aaeb2 5efada2a6e
commit bbce0b946e
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/strings.xml
+5 -5
View File
@@ -381,7 +381,7 @@ limitations under the License.
%1$s activity type. E.g., 'hiking'."> %1$s activity type. E.g., 'hiking'.">
Activity type: %1$s Activity type: %1$s
</string> </string>
<string name="description_average_moving_pace" <string name="description_average_moving_pace_in_minute"
translation_description="Average moving pace description. translation_description="Average moving pace description.
%1$s pace in minutes per kilometer %1$s pace in minutes per kilometer
@@ -395,7 +395,7 @@ limitations under the License.
%2$.1f speed in miles per hour"> %2$.1f speed in miles per hour">
Average moving speed: %1$.2f km/h (%2$.1f mi/h) Average moving speed: %1$.2f km/h (%2$.1f mi/h)
</string> </string>
<string name="description_average_pace" <string name="description_average_pace_in_minute"
translation_description="Average pace description. translation_description="Average pace description.
%1$s pace in minutes per kilometer %1$s pace in minutes per kilometer
@@ -424,7 +424,7 @@ limitations under the License.
translation_description="Elevation in metric units, meters."> translation_description="Elevation in metric units, meters.">
Elevation (m) Elevation (m)
</string> </string>
<string name="description_fastest_pace" <string name="description_fastest_pace_in_minute"
translation_description="Fastest pace description. translation_description="Fastest pace description.
%1$s pace in minutes per kilometer %1$s pace in minutes per kilometer
@@ -1517,9 +1517,9 @@ limitations under the License.
translation_description="When restoring from backup, the error message."> translation_description="When restoring from backup, the error message.">
Unable to restore from backup. Unable to restore from backup.
</string> </string>
<string name="settings_backup_restore_no_backup" <string name="settings_backup_restore_no_backups"
translation_description="In the 'Backup and reset' settings, after pressing the 'Restore now' translation_description="In the 'Backup and reset' settings, after pressing the 'Restore now'
option, the message in the alert dialog informing the user that there is no backup to restore option, the message in the alert dialog informing the user that there is no backups to restore
from. from.
%1$s the directory. E.g., '/MyTracks/backups'."> %1$s the directory. E.g., '/MyTracks/backups'.">
MyTracks/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java
+5 -4
View File
@@ -126,14 +126,15 @@ public class DescriptionGeneratorImpl implements DescriptionGenerator {
writeSpeed(stats.getMaxSpeed(), builder, R.string.description_max_speed, lineBreak); writeSpeed(stats.getMaxSpeed(), builder, R.string.description_max_speed, lineBreak);
// Average pace // Average pace
writePace(stats.getAverageSpeed(), builder, R.string.description_average_pace, lineBreak); writePace(
stats.getAverageSpeed(), builder, R.string.description_average_pace_in_minute, lineBreak);
// Average moving pace // Average moving pace
writePace(stats.getAverageMovingSpeed(), builder, R.string.description_average_moving_pace, writePace(stats.getAverageMovingSpeed(), builder,
lineBreak); R.string.description_average_moving_pace_in_minute, lineBreak);
// Fastest pace // Fastest pace
writePace(stats.getMaxSpeed(), builder, R.string.description_fastest_pace, lineBreak); writePace(stats.getMaxSpeed(), builder, R.string.description_fastest_pace_in_minute, lineBreak);
// Max elevation // Max elevation
writeElevation(stats.getMaxElevation(), builder, R.string.description_max_elevation, lineBreak); writeElevation(stats.getMaxElevation(), builder, R.string.description_max_elevation, lineBreak);
MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java
+1 -1
View File
@@ -123,7 +123,7 @@ public class RestoreChooserActivity extends Activity {
* Shows a no backup message. * Shows a no backup message.
*/ */
private void showNoBackupMessage() { private void showNoBackupMessage() {
String message = getString(R.string.settings_backup_restore_no_backup, String message = getString(R.string.settings_backup_restore_no_backups,
FileUtils.getDirectoryDisplayName(FileUtils.BACKUPS_DIR)); FileUtils.getDirectoryDisplayName(FileUtils.BACKUPS_DIR));
Toast.makeText(this, message, Toast.LENGTH_LONG).show(); Toast.makeText(this, message, Toast.LENGTH_LONG).show();
} }
MyTracksTest/src/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java
+1 -1
View File
@@ -161,7 +161,7 @@ public class DescriptionGeneratorImplTest extends AndroidTestCase {
*/ */
public void testWritePace() { public void testWritePace() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
descriptionGenerator.writePace(1.1, builder, R.string.description_average_pace, "\n"); descriptionGenerator.writePace(1.1, builder, R.string.description_average_pace_in_minute, "\n");
assertEquals("Average pace: 15:09 min/km (24:23 min/mi)\n", builder.toString()); assertEquals("Average pace: 15:09 min/km (24:23 min/mi)\n", builder.toString());
} }