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

fix comment for daebe51be6dc

Browse Source
This commit is contained in:
Jimmy Shih
2011-11-18 14:42:54 -08:00
parent 5aea1348f6
commit 8b2f2b21cd
2 changed files with 75 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/strings.xml
+55 -42
View File
@@ -609,13 +609,13 @@ limitations under the License.
<string name="import_gpx_files_few" <string name="import_gpx_files_few"
translation_description="When importing all the tracks, phrase for 'few' GPX files. translation_description="When importing all the tracks, phrase for 'few' GPX files.
%1$d an integer number. The number is a small number."> %1$d an integer number. The number is a small number.">
%1$d GPX files %1$d GPX files
</string> </string>
<string name="import_gpx_files_many" <string name="import_gpx_files_many"
translation_description="When importing all the tracks, phrase for 'many' GPX files. translation_description="When importing all the tracks, phrase for 'many' GPX files.
%1$d an integer number. The number is a large number."> %1$d an integer number. The number is a large number.">
%1$d GPX files %1$d GPX files
</string> </string>
<string name="import_gpx_files_one" <string name="import_gpx_files_one"
@@ -623,9 +623,10 @@ limitations under the License.
1 GPX file 1 GPX file
</string> </string>
<string name="import_gpx_files_other" <string name="import_gpx_files_other"
translation_description="When importing all the tracks, phrase for 'other' GPX files. translation_description="When importing all the tracks, phrase for 'other' GPX files, 'other'
means for cases that the language does not require special treatment of the given quantity.
%1$d an integer number. The number doesn't require special treatment."> %1$d an integer number.">
%1$d GPX files %1$d GPX files
</string> </string>
<string name="import_gpx_files_two" <string name="import_gpx_files_two"
@@ -1546,7 +1547,7 @@ limitations under the License.
</string> </string>
<string name="settings_sharing_allow_access" <string name="settings_sharing_allow_access"
translation_description="In the Sharing settings, the checkbox option to allow third party apps translation_description="In the Sharing settings, the checkbox option to allow third party apps
access to the My Tracks data."> access to the My Tracks data.">
Allow access Allow access
</string> </string>
<string name="settings_sharing_allow_access_confirm_message" <string name="settings_sharing_allow_access_confirm_message"
@@ -2028,13 +2029,13 @@ limitations under the License.
<string name="voice_hours_few" <string name="voice_hours_few"
translation_description="For voice announcement, to say 'few' hours. translation_description="For voice announcement, to say 'few' hours.
%1$d an integer number. The number is a small number."> %1$d an integer number. The number is a small number.">
%1$d hours %1$d hours
</string> </string>
<string name="voice_hours_many" <string name="voice_hours_many"
translation_description="For voice announcement, to say 'many' hours. translation_description="For voice announcement, to say 'many' hours.
%1$d an integer number. The number is a large number."> %1$d an integer number. The number is a large number.">
%1$d hours %1$d hours
</string> </string>
<string name="voice_hours_one" <string name="voice_hours_one"
@@ -2042,9 +2043,10 @@ limitations under the License.
1 hour 1 hour
</string> </string>
<string name="voice_hours_other" <string name="voice_hours_other"
translation_description="For voice announcement, to say 'other' hours. translation_description="For voice announcement, to say 'other' hours, 'other' means for cases
that the language does not require special treatment of the given quantity.
%1$d an integer number. The number doesn't require special treatment."> %1$d an integer number.">
%1$d hours %1$d hours
</string> </string>
<string name="voice_hours_two" <string name="voice_hours_two"
@@ -2058,13 +2060,13 @@ limitations under the License.
<string name="voice_minutes_few" <string name="voice_minutes_few"
translation_description="For voice announcement, to say 'few' minutes. translation_description="For voice announcement, to say 'few' minutes.
%1$d an integer number. The number is a small number."> %1$d an integer number. The number is a small number.">
%1$d minutes %1$d minutes
</string> </string>
<string name="voice_minutes_many" <string name="voice_minutes_many"
translation_description="For voice announcement, to say 'many' minutes. translation_description="For voice announcement, to say 'many' minutes.
%1$d an integer number. The number is a large number."> %1$d an integer number. The number is a large number.">
%1$d minutes %1$d minutes
</string> </string>
<string name="voice_minutes_one" <string name="voice_minutes_one"
@@ -2072,9 +2074,10 @@ limitations under the License.
1 minute 1 minute
</string> </string>
<string name="voice_minutes_other" <string name="voice_minutes_other"
translation_description="For voice announcement, to say 'other' minutes. translation_description="For voice announcement, to say 'other' minutes, 'other' means for cases
that the language does not require special treatment of the given quantity.
%1$d an integer number. The number doesn't require special treatment."> %1$d an integer number.">
%1$d minutes %1$d minutes
</string> </string>
<string name="voice_minutes_two" <string name="voice_minutes_two"
@@ -2085,26 +2088,30 @@ limitations under the License.
translation_description="For voice announcement, to say 0 minutes."> translation_description="For voice announcement, to say 0 minutes.">
0 minutes 0 minutes
</string> </string>
<string name="voice_per_kilometer" <string name="voice_pace_per_kilometer"
translation_description="For voice announcement, to say 'per kilometer' for pace like 'two translation_description="For voice announcement, to say 'time per kilometer' like 'two hours 2
hours 2 minutes per kilometer'."> minutes per kilometer'.
per kilometer
%1$s time. E.g., 'two hours 2 minutes'.">
%1$s per kilometer
</string> </string>
<string name="voice_per_mile" <string name="voice_pace_per_mile"
translation_description="For voice announcement, to say 'per mile' for pace like 'two hours 2 translation_description="For voice announcement, to say 'time per mile' like 'two hours 2
minutes per mile'."> minutes per mile'.
per mile
%1$s time. E.g., 'two hours 2 minutes'.">
%1$s per mile
</string> </string>
<string name="voice_seconds_few" <string name="voice_seconds_few"
translation_description="For voice announcement, to say 'few' seconds. translation_description="For voice announcement, to say 'few' seconds.
%1$d an integer number. The number is a small number."> %1$d an integer number. The number is a small number.">
%1$d seconds %1$d seconds
</string> </string>
<string name="voice_seconds_many" <string name="voice_seconds_many"
translation_description="For voice announcement, to say 'many' seconds. translation_description="For voice announcement, to say 'many' seconds.
%1$d an integer number. The number is a large number."> %1$d an integer number. The number is a large number.">
%1$d seconds %1$d seconds
</string> </string>
<string name="voice_seconds_one" <string name="voice_seconds_one"
@@ -2112,9 +2119,10 @@ limitations under the License.
1 second 1 second
</string> </string>
<string name="voice_seconds_other" <string name="voice_seconds_other"
translation_description="For voice announcement, to say 'other' seconds. translation_description="For voice announcement, to say 'other' seconds, 'other' means for cases
that the language does not require special treatment of the given quantity.
%1$d an integer number. The number doesn't require special treatment."> %1$d an integer number.">
%1$d seconds %1$d seconds
</string> </string>
<string name="voice_seconds_two" <string name="voice_seconds_two"
@@ -2128,13 +2136,13 @@ limitations under the License.
<string name="voice_speed_kilometers_per_hour_few" <string name="voice_speed_kilometers_per_hour_few"
translation_description="For voice announcement, to say 'few' kilometers per hour. translation_description="For voice announcement, to say 'few' kilometers per hour.
%1$.1f a float number. The number is a small number."> %1$.1f a float number. The number is a small number.">
%1$.1f kilometers per hour %1$.1f kilometers per hour
</string> </string>
<string name="voice_speed_kilometers_per_hour_many" <string name="voice_speed_kilometers_per_hour_many"
translation_description="For voice announcement, to say 'many' kilometers per hour. translation_description="For voice announcement, to say 'many' kilometers per hour.
%1$.1f a float number. The number is a large number."> %1$.1f a float number. The number is a large number.">
%1$.1f kilometers per hour %1$.1f kilometers per hour
</string> </string>
<string name="voice_speed_kilometers_per_hour_one" <string name="voice_speed_kilometers_per_hour_one"
@@ -2142,9 +2150,10 @@ limitations under the License.
1 kilometer per hour 1 kilometer per hour
</string> </string>
<string name="voice_speed_kilometers_per_hour_other" <string name="voice_speed_kilometers_per_hour_other"
translation_description="For voice announcement, to say 'other' kilometers per hour. translation_description="For voice announcement, to say 'other' kilometers per hour, 'other'
means for cases that the language does not require special treatment of the given quantity.
%1$.1f a float number. The number doesn't require special treatment."> %1$.1f a float number.">
%1$.1f kilometers per hour %1$.1f kilometers per hour
</string> </string>
<string name="voice_speed_kilometers_per_hour_two" <string name="voice_speed_kilometers_per_hour_two"
@@ -2158,13 +2167,13 @@ limitations under the License.
<string name="voice_speed_miles_per_hour_few" <string name="voice_speed_miles_per_hour_few"
translation_description="For voice announcement, to say 'few' miles per hour. translation_description="For voice announcement, to say 'few' miles per hour.
%1$.1f a float number. The number is a small number."> %1$.1f a float number. The number is a small number.">
%1$.1f miles per hour %1$.1f miles per hour
</string> </string>
<string name="voice_speed_miles_per_hour_many" <string name="voice_speed_miles_per_hour_many"
translation_description="For voice announcement, to say 'many' miles per hour. translation_description="For voice announcement, to say 'many' miles per hour.
%1$.1f a float number. The number is a large number."> %1$.1f a float number. The number is a large number.">
%1$.1f miles per hour %1$.1f miles per hour
</string> </string>
<string name="voice_speed_miles_per_hour_one" <string name="voice_speed_miles_per_hour_one"
@@ -2172,9 +2181,10 @@ limitations under the License.
1 mile per hour 1 mile per hour
</string> </string>
<string name="voice_speed_miles_per_hour_other" <string name="voice_speed_miles_per_hour_other"
translation_description="For voice announcement, to say 'other' miles per hour. translation_description="For voice announcement, to say 'other' miles per hour, 'other' means
for cases that the language does not require special treatment of the given quantity.
%1$.1f a float number. The number doesn't require special treatment."> %1$.1f a float number.">
%1$.1f miles per hour %1$.1f miles per hour
</string> </string>
<string name="voice_speed_miles_per_hour_two" <string name="voice_speed_miles_per_hour_two"
@@ -2191,19 +2201,19 @@ limitations under the License.
%1$s: distance string. E.g., '1 mile' or '1.2 miles', '1 kilometer', '2.2 kilometers' %1$s: distance string. E.g., '1 mile' or '1.2 miles', '1 kilometer', '2.2 kilometers'
%2$s: time string. E.g., '1 hour and 30 minutes' or '20 minutes 1 second' %2$s: time string. E.g., '1 hour and 30 minutes' or '20 minutes 1 second'
%3$s: speed/pace string. For speed, e.g., '2.2 miles per hour', '1 kilometer per hour'. For %3$s: speed/pace string. For speed, e.g., '2.2 miles per hour', '1 kilometer per hour'. For
pace, e.g., '2 hours 1 minute per mile', '30 minutes 1 second per kilometer'."> pace, e.g., '2 hours 1 minute per mile', '30 minutes 1 second per kilometer'.">
My Tracks total distance %1$s in %2$s at %3$s. My Tracks total distance %1$s in %2$s at %3$s.
</string> </string>
<string name="voice_total_distance_kilometers_few" <string name="voice_total_distance_kilometers_few"
translation_description="For voice announcement, to say total distance 'few' kilometers. translation_description="For voice announcement, to say total distance 'few' kilometers.
%1$.2f a float number. The number is a small number."> %1$.2f a float number. The number is a small number.">
total distance %1$.2f kilometers total distance %1$.2f kilometers
</string> </string>
<string name="voice_total_distance_kilometers_many" <string name="voice_total_distance_kilometers_many"
translation_description="For voice announcement, to say total distance 'many' kilometers. translation_description="For voice announcement, to say total distance 'many' kilometers.
%1$.2f a float number. The number is a large number."> %1$.2f a float number. The number is a large number.">
total distance %1$.2f kilometers total distance %1$.2f kilometers
</string> </string>
<string name="voice_total_distance_kilometers_one" <string name="voice_total_distance_kilometers_one"
@@ -2211,9 +2221,11 @@ limitations under the License.
total distance 1 kilometer total distance 1 kilometer
</string> </string>
<string name="voice_total_distance_kilometers_other" <string name="voice_total_distance_kilometers_other"
translation_description="For voice announcement, to say total distance 'other' kilometers. translation_description="For voice announcement, to say total distance 'other' kilometers,
'other' means for cases that the language does not require special treatment of the given
quantity.
%1$.2f a float number. The number doesn't require special treatment."> %1$.2f a float number.">
total distance %1$.2f kilometers total distance %1$.2f kilometers
</string> </string>
<string name="voice_total_distance_kilometers_two" <string name="voice_total_distance_kilometers_two"
@@ -2227,13 +2239,13 @@ limitations under the License.
<string name="voice_total_distance_miles_few" <string name="voice_total_distance_miles_few"
translation_description="For voice announcement, to say total distance 'few' miles. translation_description="For voice announcement, to say total distance 'few' miles.
%1$.2f a float number. The number is a small number."> %1$.2f a float number. The number is a small number.">
total distance %1$.2f miles total distance %1$.2f miles
</string> </string>
<string name="voice_total_distance_miles_many" <string name="voice_total_distance_miles_many"
translation_description="For voice announcement, to say total distance 'many' miles. translation_description="For voice announcement, to say total distance 'many' miles.
%1$.2f a float number. The number is a large number."> %1$.2f a float number. The number is a large number.">
total distance %1$.2f miles total distance %1$.2f miles
</string> </string>
<string name="voice_total_distance_miles_one" <string name="voice_total_distance_miles_one"
@@ -2241,9 +2253,10 @@ limitations under the License.
total distance 1 mile total distance 1 mile
</string> </string>
<string name="voice_total_distance_miles_other" <string name="voice_total_distance_miles_other"
translation_description="For voice announcement, to say total distance 'other' miles. translation_description="For voice announcement, to say total distance 'other' miles, 'other'
means for cases that the language does not require special treatment of the given quantity.
%1$.2f a float number. The number doesn't require special treatment."> %1$.2f a float number.">
total distance %1$.2f miles total distance %1$.2f miles
</string> </string>
<string name="voice_total_distance_miles_two" <string name="voice_total_distance_miles_two"
MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java
+11 -3
View File
@@ -185,8 +185,8 @@ public class StatusAnnouncerTask implements PeriodicTask {
: R.plurals.voiceSpeedMilesPerHour; : R.plurals.voiceSpeedMilesPerHour;
speed = context.getResources().getQuantityString(speedId, getQuantityCount(s), s); speed = context.getResources().getQuantityString(speedId, getQuantityCount(s), s);
} else { } else {
int perDistancelId = metricUnits ? R.string.voice_per_kilometer : R.string.voice_per_mile; int paceId = metricUnits ? R.string.voice_pace_per_kilometer : R.string.voice_pace_per_mile;
speed = getAnnounceTime((long) s) + " " + context.getString(perDistancelId); speed = String.format(context.getString(paceId), getAnnounceTime((long) s));
} }
int totalDistanceId = metricUnits ? R.plurals.voiceTotalDistanceKilometers int totalDistanceId = metricUnits ? R.plurals.voiceTotalDistanceKilometers
@@ -199,7 +199,15 @@ public class StatusAnnouncerTask implements PeriodicTask {
} }
/** /**
* Gets the plural count to be used by getQuantityString. * Gets the plural count to be used by getQuantityString. getQuantityString
* only supports integer quantities, not a double quantity like "2.2".
* <p>
* As a temporary workaround, we convert a double quantity to an integer
* quantity. If the double quantity is exactly 0, 1, or 2, then we can return
* these integer quantities. Otherwise, we cast the double quantity to an
* integer quantity. However, we need to make sure that if the casted value is
* 0, 1, or 2, we don't return those, instead, return the next biggest integer
* 3.
* *
* @param d the double value * @param d the double value
*/ */