From 58ce6d8a2c9c682b04eac9fc2b376dfc4a21062d Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Wed, 26 Oct 2011 10:41:33 -0700 Subject: [PATCH] Add translation context for Sensor Options and Track Color Mode. Convention: Use "option" to indicate a display string like "sensor_type_option_ant". Use "value" to indicate a stored value like "sensor_type_value_ant". Additional proposals not in this changeset: - rename "Sensor Options" to "Sensor"? - rename "Track Color Mode" to "Track color"? --- MyTracks/res/values-ca/strings.xml | 2 +- MyTracks/res/values-es-rES/strings.xml | 6 +- MyTracks/res/values-es/strings.xml | 17 +- MyTracks/res/values-fi/strings.xml | 10 +- MyTracks/res/values-fr/strings.xml | 10 +- MyTracks/res/values-ja/strings.xml | 6 +- MyTracks/res/values-ru/strings.xml | 6 +- MyTracks/res/values-zh-rCN/strings.xml | 10 +- .../res/values/arrays_do_not_translate.xml | 159 +++++++++--------- MyTracks/res/values/do_not_translate.xml | 17 +- MyTracks/res/values/strings.xml | 55 ++++-- MyTracks/res/xml/preferences.xml | 4 +- .../apps/mytracks/SettingsActivity.java | 12 +- .../maps/TrackPathPainterFactory.java | 6 +- .../sensors/SensorManagerFactory.java | 8 +- .../services/sensors/SensorUtils.java | 6 +- .../maps/TrackPathPainterFactoryTest.java | 6 +- .../services/TrackRecordingServiceTest.java | 2 +- .../sensors/SensorManagerFactoryTest.java | 6 +- 19 files changed, 198 insertions(+), 150 deletions(-) diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml index c7ed91c42..6dcf9fd80 100644 --- a/MyTracks/res/values-ca/strings.xml +++ b/MyTracks/res/values-ca/strings.xml @@ -415,5 +415,5 @@ limitations under the License. S\'està enviant - Cap + Cap diff --git a/MyTracks/res/values-es-rES/strings.xml b/MyTracks/res/values-es-rES/strings.xml index 169e3b78a..773b99cf7 100644 --- a/MyTracks/res/values-es-rES/strings.xml +++ b/MyTracks/res/values-es-rES/strings.xml @@ -129,7 +129,7 @@ limitations under the License. --> - Ninguna - ANT+ Sensores - SRM ANT+ Puente + Ninguna + ANT+ Sensores + SRM ANT+ Puente diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml index e87a0e14a..4b880d10d 100644 --- a/MyTracks/res/values-es/strings.xml +++ b/MyTracks/res/values-es/strings.xml @@ -514,14 +514,15 @@ limitations under the License. Poder leer datos, como puntos de interés. Poder escribir datos, como registrar o añadir puntos de interés. - - Ninguno - Sensores ANT+ - Puente SRM ANT+ - Bluetooth Polar - Bluetooth Zephyr + + Ninguno + Sensores ANT+ + Puente SRM ANT+ + Bluetooth Polar + Bluetooth Zephyr - Fijo (BETA) - Dinámico (BETA) + Ninguno + Fijo (BETA) + Dinámico (BETA) diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml index a47e2378b..96826fefc 100644 --- a/MyTracks/res/values-fi/strings.xml +++ b/MyTracks/res/values-fi/strings.xml @@ -499,11 +499,11 @@ limitations under the License. Etsitään Lähetetään - Ei sensoria - ANT+ -sensori - SRM ANT+ -silta - Polar bluetooth - Zephyr bluetooth + Ei sensoria + ANT+ -sensori + SRM ANT+ -silta + Polar bluetooth + Zephyr bluetooth vastaanota huomautuksia reitin tallentamisesta diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml index 4229d1a66..81634ac1e 100644 --- a/MyTracks/res/values-fr/strings.xml +++ b/MyTracks/res/values-fr/strings.xml @@ -403,11 +403,11 @@ limitations under the License. Envoi - Aucun - Capteur ANT+ - Pont SRM ANT+ - Bluetooth Polar - Bluetooth Zephyr + Aucun + Capteur ANT+ + Pont SRM ANT+ + Bluetooth Polar + Bluetooth Zephyr notifications lors de l\'enregistrement de parcours diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml index 36cc5e415..23fdcdebd 100644 --- a/MyTracks/res/values-ja/strings.xml +++ b/MyTracks/res/values-ja/strings.xml @@ -469,9 +469,9 @@ limitations under the License. 送信中 - なし - ANT+ センサー - SRM ANT+ ブリッジ + なし + ANT+ センサー + SRM ANT+ ブリッジ トラック記録通知受信 diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml index 3d301605d..3c2a9fe08 100644 --- a/MyTracks/res/values-ru/strings.xml +++ b/MyTracks/res/values-ru/strings.xml @@ -496,9 +496,9 @@ limitations under the License. Отправка - Нет - ANT+ Датчик - SRM ANT+ Bridge + Нет + ANT+ Датчик + SRM ANT+ Bridge получать уведомления о записи трека diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml index cd9ede1a2..4832b16ac 100644 --- a/MyTracks/res/values-zh-rCN/strings.xml +++ b/MyTracks/res/values-zh-rCN/strings.xml @@ -476,10 +476,10 @@ limitations under the License. 发送中 - 无 - ANT+ 感应器 - SRM ANT+ 转接器 - Polar Bluetooth - Zephyr 蓝牙设备 + 无 + ANT+ 感应器 + SRM ANT+ 转接器 + Polar Bluetooth + Zephyr 蓝牙设备 diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml index 9e7083b33..5d3e9e446 100644 --- a/MyTracks/res/values/arrays_do_not_translate.xml +++ b/MyTracks/res/values/arrays_do_not_translate.xml @@ -16,37 +16,38 @@ limitations under the License. --> - + + + + @string/track_color_mode_option_none + @string/track_color_mode_option_fixed + @string/track_color_mode_option_dynamic + + + + @string/track_color_mode_value_none + @string/track_color_mode_value_fixed + @string/track_color_mode_value_dynamic + + + + + 0 + -100 + -50 + -25 + -10 + -5 + -1 + 60 + 30 + 15 10 - 20 - 50 - 100 - 200 - 500 - 1000 - 2000 - 5000 + 5 + 2 + 1 - - 1 - 2 - 3 - 4 - 5 - 10 - 100 - - - - 50 - 100 - 200 - 500 - 1000 - 5000 - - -2 -1 @@ -65,24 +66,38 @@ limitations under the License. 900 1800 - - - 0 - -100 - -50 - -25 - -10 - -5 - -1 - 60 - 30 - 15 - 10 - 5 - 2 + + 1 + 2 + 3 + 4 + 5 + 10 + 100 - + + + 50 + 100 + 200 + 500 + 1000 + 5000 + + + + 10 + 20 + 50 + 100 + 200 + 500 + 1000 + 2000 + 5000 + + 0 5 @@ -91,43 +106,35 @@ limitations under the License. -1 + + + @string/sensor_type_option_none + @string/sensor_type_option_ant + @string/sensor_type_option_srm_ant_bridge + @string/sensor_type_option_polar + @string/sensor_type_option_zephyr + + + + @string/sensor_type_value_none + @string/sensor_type_value_ant + @string/sensor_type_value_srm_ant_bridge + @string/sensor_type_value_polar + @string/sensor_type_value_zephyr + + + + @string/sensor_type_value_ant + @string/sensor_type_value_srm_ant_bridge + + + GPX KML CSV TCX - - - @string/no_sensor_option - @string/ant_sensor_option - @string/ant_bridge_sensor_option - @string/polar_bt_sensor_option - @string/zephyr_bt_sensor_option - - - - @string/none - @string/ant_sensor_type - @string/srm_ant_bridge_sensor_type - @string/polar_sensor_type - @string/zephyr_sensor_type - - - - @string/ant_sensor_type - @string/srm_ant_bridge_sensor_type - - - @string/none - @string/track_color_mode_fixed - @string/track_color_mode_dynamic - - - - @string/none - @string/track_color_mode_fixed - @string/track_color_mode_dynamic - + diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml index c7cd1fe93..76056d78c 100644 --- a/MyTracks/res/values/do_not_translate.xml +++ b/MyTracks/res/values/do_not_translate.xml @@ -29,12 +29,17 @@ limitations under the License. Rodrigo Damazio Bovendorp Sandor Dornbush - - NONE - ANT - SRM_ANT_BRIDGE - POLAR - ZEPHYR + + NONE + ANT + SRM_ANT_BRIDGE + POLAR + ZEPHYR + + + NONE + FIXED + DYNAMIC google.com/fusiontables diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index 5361eb435..af300f477 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -55,7 +55,8 @@ limitations under the License. My Location + translation_description="In the menu for the map view, to switch the display to the satellite + mode."> Satellite Mode - NONE - ANT+ Sensors - SRM ANT+ Bridge - Polar Bluetooth - Zephyr Bluetooth + + None + + + ANT+ Sensor + + + SRM ANT+ Bridge + + + Polar Bluetooth + + + Zephyr Bluetooth + - - Fixed (BETA) - Dynamic (BETA) - + + + One Color + + + Fixed Thresholds + + + Dynamic Thresholds + + \ No newline at end of file diff --git a/MyTracks/res/xml/preferences.xml b/MyTracks/res/xml/preferences.xml index 24dcf68ed..d27a968a9 100644 --- a/MyTracks/res/xml/preferences.xml +++ b/MyTracks/res/xml/preferences.xml @@ -39,7 +39,7 @@ limitations under the License. android:summary="@string/settings_track_color_mode_summary" android:entries="@array/track_color_mode_options" android:entryValues="@array/track_color_mode_values" - android:defaultValue="@string/none"/> + android:defaultValue="@string/track_color_mode_value_none"/> @@ -162,7 +162,7 @@ limitations under the License. android:summary="@string/settings_sensor_type_summary" android:entries="@array/sensor_type_options" android:entryValues="@array/sensor_type_values" - android:defaultValue="@string/none"/> + android:defaultValue="@string/sensor_type_value_none"/> diff --git a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java index b4e2ffd62..0d1fa11e0 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java @@ -323,8 +323,8 @@ public class SettingsActivity extends PreferenceActivity { private void updateSensorSettings(String sensorType) { boolean usesBluetooth = - getString(R.string.zephyr_sensor_type).equals(sensorType) - || getString(R.string.polar_sensor_type).equals(sensorType); + getString(R.string.sensor_type_value_zephyr).equals(sensorType) + || getString(R.string.sensor_type_value_polar).equals(sensorType); findPreference( getString(R.string.bluetooth_sensor_key)).setEnabled(usesBluetooth); findPreference( @@ -336,15 +336,15 @@ public class SettingsActivity extends PreferenceActivity { Preference antSrm = findPreference(getString(R.string.ant_srm_bridge_sensor_id_key)); if (antHrm != null && antSrm != null) { antHrm - .setEnabled(getString(R.string.ant_sensor_type).equals(sensorType)); + .setEnabled(getString(R.string.sensor_type_value_ant).equals(sensorType)); antSrm - .setEnabled(getString(R.string.srm_ant_bridge_sensor_type).equals(sensorType)); + .setEnabled(getString(R.string.sensor_type_value_srm_ant_bridge).equals(sensorType)); } } private void updateTrackColorModeSettings(String trackColorMode) { - boolean usesFixedSpeed = trackColorMode.equals(getString(R.string.track_color_mode_fixed)); - boolean usesDynamicSpeed = trackColorMode.equals(getString(R.string.track_color_mode_dynamic)); + boolean usesFixedSpeed = trackColorMode.equals(getString(R.string.track_color_mode_value_fixed)); + boolean usesDynamicSpeed = trackColorMode.equals(getString(R.string.track_color_mode_value_dynamic)); findPreference( getString(R.string.track_color_mode_fixed_speed_slow_display_key)).setEnabled(usesFixedSpeed); diff --git a/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java b/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java index 3403d6082..a287d4caa 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java +++ b/MyTracks/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactory.java @@ -49,12 +49,12 @@ public class TrackPathPainterFactory { String colorMode = prefs.getString(context.getString(R.string.track_color_mode_key), null); Log.i(TAG, "Creating track path painter of type: " + colorMode); - if (colorMode == null || colorMode.equals(context.getString(R.string.none))) { + if (colorMode == null || colorMode.equals(context.getString(R.string.track_color_mode_value_none))) { return new SingleColorTrackPathPainter(context); - } else if (colorMode.equals(context.getString(R.string.track_color_mode_fixed))) { + } else if (colorMode.equals(context.getString(R.string.track_color_mode_value_fixed))) { return new DynamicSpeedTrackPathPainter(context, new FixedSpeedTrackPathDescriptor(context)); - } else if (colorMode.equals(context.getString(R.string.track_color_mode_dynamic))) { + } else if (colorMode.equals(context.getString(R.string.track_color_mode_value_dynamic))) { return new DynamicSpeedTrackPathPainter(context, new DynamicSpeedTrackPathDescriptor(context)); } else { diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java index a7836c3d0..c41083e5f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java @@ -53,13 +53,13 @@ public class SensorManagerFactory { if (sensor == null) { return null; - } else if (sensor.equals(context.getString(R.string.ant_sensor_type))) { + } else if (sensor.equals(context.getString(R.string.sensor_type_value_ant))) { return new AntDirectSensorManager(context); - } else if (sensor.equals(context.getString(R.string.srm_ant_bridge_sensor_type))) { + } else if (sensor.equals(context.getString(R.string.sensor_type_value_srm_ant_bridge))) { return new AntSRMSensorManager(context); - } else if (sensor.equals(context.getString(R.string.zephyr_sensor_type))) { + } else if (sensor.equals(context.getString(R.string.sensor_type_value_zephyr))) { return new ZephyrSensorManager(context); - } else if (sensor.equals(context.getString(R.string.polar_sensor_type))) { + } else if (sensor.equals(context.getString(R.string.sensor_type_value_polar))) { return new PolarSensorManager(context); } else { Log.w(Constants.TAG, "Unable to find sensor type: " + sensor); diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java index e52103f23..c4b23a206 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java @@ -15,11 +15,11 @@ */ package com.google.android.apps.mytracks.services.sensors; -import android.content.Context; - import com.google.android.apps.mytracks.content.Sensor; import com.google.android.maps.mytracks.R; +import android.content.Context; + /** * A collection of methods for message parsers. * @@ -99,7 +99,7 @@ public class SensorUtils { public static String getStateAsString(Sensor.SensorState state, Context c) { switch (state) { case NONE: - return c.getString(R.string.none); + return c.getString(R.string.sensor_type_value_none); case CONNECTING: return c.getString(R.string.connecting); case CONNECTED: diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java index c1f84d53a..4c7d83f7b 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java @@ -46,11 +46,11 @@ public class TrackPathPainterFactoryTest extends TrackPathPainterTestCase { return; } - testTrackPathPainterFactorySpecific(context, prefs, R.string.none, + testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_none, SingleColorTrackPathPainter.class); - testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_fixed, + testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_fixed, DynamicSpeedTrackPathPainter.class); - testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_dynamic, + testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_dynamic, DynamicSpeedTrackPathPainter.class); } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java index 4d58a101a..16b7af12a 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java @@ -625,7 +625,7 @@ public class TrackRecordingServiceTest @MediumTest public void testWithProperties_zephyrSensorType() throws Exception { functionalTest(R.string.sensor_type_key, - context.getString(R.string.zephyr_sensor_type)); + context.getString(R.string.sensor_type_value_zephyr)); } private ITrackRecordingService bindAndGetService(Intent intent) { diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java index 933ba333a..2be7fa2f5 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java @@ -30,17 +30,17 @@ public class SensorManagerFactoryTest extends AndroidTestCase { @SmallTest public void testCreateZephyr() throws Exception { - assertClassForName(ZephyrSensorManager.class, R.string.zephyr_sensor_type); + assertClassForName(ZephyrSensorManager.class, R.string.sensor_type_value_zephyr); } @SmallTest public void testCreateAnt() throws Exception { - assertClassForName(AntDirectSensorManager.class, R.string.ant_sensor_type); + assertClassForName(AntDirectSensorManager.class, R.string.sensor_type_value_ant); } @SmallTest public void testCreateAntSRM() throws Exception { - assertClassForName(AntSRMSensorManager.class, R.string.srm_ant_bridge_sensor_type); + assertClassForName(AntSRMSensorManager.class, R.string.sensor_type_value_srm_ant_bridge); } private void assertClassForName(Class c, int i) {