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

- Clean up arrays_do_not_translate.xml

Browse Source 
- rename variables and sort alphabetically

- remove arrays.xml in other locales that are no longer being used.
This commit is contained in:
Jimmy Shih
2011-11-11 18:04:14 -08:00
parent 89fb6f6bd8
commit 0365ac5043
19 changed files with 167 additions and 3623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
+4 -4
View File
@@ -79,11 +79,11 @@ public class ExportAllTracks {
Log.i(Constants.TAG, "ExportAllTracks: Starting");
String exportFileFormat = activity.getString(R.string.track_list_export_file);
String formats[] = activity.getResources().getStringArray(R.array.file_formats);
String fileTypes[] = activity.getResources().getStringArray(R.array.file_types);
String[] choices = new String[formats.length];
for (int i = 0; i < formats.length; i++) {
choices[i] = String.format(exportFileFormat, formats[i]);
String[] choices = new String[fileTypes.length];
for (int i = 0; i < fileTypes.length; i++) {
choices[i] = String.format(exportFileFormat, fileTypes[i]);
}
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+13 -9
View File
@@ -364,7 +364,7 @@ public class MapActivity extends com.google.android.maps.MapActivity
if (!dataHub.isRecordingSelected()) {
String saveFileFormat = getString(R.string.track_list_save_file);
String shareFileFormat = getString(R.string.track_list_share_file);
String formats[] = getResources().getStringArray(R.array.file_formats);
String fileTypes[] = getResources().getStringArray(R.array.file_types);
menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
R.string.track_list_send_google);
@@ -373,20 +373,24 @@ public class MapActivity extends com.google.android.maps.MapActivity
share.add(0, Constants.MENU_SHARE_LINK, 0,
R.string.track_list_share_url);
share.add(
0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, formats[0]));
0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, fileTypes[0]));
share.add(
0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, formats[1]));
0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, fileTypes[1]));
share.add(
0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, formats[2]));
0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, fileTypes[2]));
share.add(
0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, formats[3]));
0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, fileTypes[3]));
SubMenu save = menu.addSubMenu(0,
Constants.MENU_WRITE_TO_SD_CARD, 0,
R.string.track_list_save_sd);
save.add(0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, formats[0]));
save.add(0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, formats[1]));
save.add(0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, formats[2]));
save.add(0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, formats[3]));
save.add(
0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, fileTypes[0]));
save.add(
0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, fileTypes[1]));
save.add(
0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, fileTypes[2]));
save.add(
0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, fileTypes[3]));
menu.add(0, Constants.MENU_CLEAR_MAP, 0,
R.string.track_list_clear_map);
menu.add(0, Constants.MENU_DELETE, 0,
MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java
+7 -7
View File
@@ -194,7 +194,7 @@ public class SettingsActivity extends PreferenceActivity {
* Sets the display options for the 'Time between points' option.
*/
private void setRecordingIntervalOptions() {
String[] values = getResources().getStringArray(R.array.min_recording_interval_values);
String[] values = getResources().getStringArray(R.array.recording_interval_values);
String[] options = new String[values.length];
for (int i = 0; i < values.length; i++) {
if (values[i].equals(RECORDING_INTERVAL_ADAPT_BATTERY_LIFE)) {
@@ -224,7 +224,7 @@ public class SettingsActivity extends PreferenceActivity {
* Sets the display options for the 'Auto-resume timeout' option.
*/
private void setAutoResumeTimeoutOptions() {
String[] values = getResources().getStringArray(R.array.auto_resume_track_timeout_values);
String[] values = getResources().getStringArray(R.array.recording_auto_resume_timeout_values);
String[] options = new String[values.length];
for (int i = 0; i < values.length; i++) {
if (values[i].equals(AUTO_RESUME_TIMEOUT_NEVER)) {
@@ -263,7 +263,7 @@ public class SettingsActivity extends PreferenceActivity {
Set<Integer> toRemove = new HashSet<Integer>();
String[] antValues = getResources().getStringArray(R.array.ant_sensor_type_values);
String[] antValues = getResources().getStringArray(R.array.sensor_type_ant_values);
for (String antValue : antValues) {
toRemove.add(sensorTypePreference.findIndexOfValue(antValue));
}
@@ -425,7 +425,7 @@ public class SettingsActivity extends PreferenceActivity {
* Sets the display options for a periodic task.
*/
private void setTaskOptions(boolean isMetric, int listId) {
String[] values = getResources().getStringArray(R.array.task_frequency_values);
String[] values = getResources().getStringArray(R.array.recording_task_frequency_values);
String[] options = new String[values.length];
for (int i = 0; i < values.length; i++) {
if (values[i].equals(TASK_FREQUENCY_OFF)) {
@@ -450,7 +450,7 @@ public class SettingsActivity extends PreferenceActivity {
* Sets the display options for 'Distance between points' option.
*/
private void setRecordingDistanceOptions(boolean isMetric, int listId) {
String[] values = getResources().getStringArray(R.array.min_recording_distance_values);
String[] values = getResources().getStringArray(R.array.recording_distance_values);
String[] options = new String[values.length];
for (int i = 0; i < values.length; i++) {
int value = Integer.parseInt(values[i]);
@@ -477,7 +477,7 @@ public class SettingsActivity extends PreferenceActivity {
* Sets the display options for 'Distance between Tracks'.
*/
private void setTrackDistanceOptions(boolean isMetric, int listId) {
String[] values = getResources().getStringArray(R.array.max_recording_distance_values);
String[] values = getResources().getStringArray(R.array.recording_track_distance_values);
String[] options = new String[values.length];
for (int i = 0; i < values.length; i++) {
int value = Integer.parseInt(values[i]);
@@ -510,7 +510,7 @@ public class SettingsActivity extends PreferenceActivity {
* Sets the display options for 'GPS accuracy'.
*/
private void setGpsAccuracyOptions(boolean isMetric, int listId) {
String[] values = getResources().getStringArray(R.array.min_required_accuracy_values);
String[] values = getResources().getStringArray(R.array.recording_gps_accuracy_values);
String[] options = new String[values.length];
for (int i = 0; i < values.length; i++) {
int value = Integer.parseInt(values[i]);
MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+13 -9
View File
@@ -88,7 +88,7 @@ public class TrackList extends ListActivity
if (!isRecording() || trackId != recordingTrackId) {
String saveFileFormat = getString(R.string.track_list_save_file);
String shareFileFormat = getString(R.string.track_list_share_file);
String formats[] = getResources().getStringArray(R.array.file_formats);
String fileTypes[] = getResources().getStringArray(R.array.file_types);
menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
R.string.track_list_send_google);
@@ -97,20 +97,24 @@ public class TrackList extends ListActivity
share.add(0, Constants.MENU_SHARE_LINK, 0,
R.string.track_list_share_url);
share.add(
0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, formats[0]));
0, Constants.MENU_SHARE_GPX_FILE, 0, String.format(shareFileFormat, fileTypes[0]));
share.add(
0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, formats[1]));
0, Constants.MENU_SHARE_KML_FILE, 0, String.format(shareFileFormat, fileTypes[1]));
share.add(
0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, formats[2]));
0, Constants.MENU_SHARE_CSV_FILE, 0, String.format(shareFileFormat, fileTypes[2]));
share.add(
0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, formats[3]));
0, Constants.MENU_SHARE_TCX_FILE, 0, String.format(shareFileFormat, fileTypes[3]));
SubMenu save = menu.addSubMenu(0,
Constants.MENU_WRITE_TO_SD_CARD, 0,
R.string.track_list_save_sd);
save.add(0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, formats[0]));
save.add(0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, formats[1]));
save.add(0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, formats[2]));
save.add(0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, formats[3]));
save.add(
0, Constants.MENU_SAVE_GPX_FILE, 0, String.format(saveFileFormat, fileTypes[0]));
save.add(
0, Constants.MENU_SAVE_KML_FILE, 0, String.format(saveFileFormat, fileTypes[1]));
save.add(
0, Constants.MENU_SAVE_CSV_FILE, 0, String.format(saveFileFormat, fileTypes[2]));
save.add(
0, Constants.MENU_SAVE_TCX_FILE, 0, String.format(saveFileFormat, fileTypes[3]));
menu.add(0, Constants.MENU_DELETE, 0,
R.string.track_list_delete_track);
}