diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml index 0870154b7..56c721c37 100644 --- a/MyTracks/res/layout/about.xml +++ b/MyTracks/res/layout/about.xml @@ -119,7 +119,7 @@ limitations under the License. android:autoLink="web" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:text="@string/about_weburl" + android:text="@string/my_tracks_web_url" android:textSize="18sp" /> diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml index 62916fbaf..1c94be163 100644 --- a/MyTracks/res/values-ca/strings.xml +++ b/MyTracks/res/values-ca/strings.xml @@ -50,10 +50,6 @@ limitations under the License. S\'està esperant per tenir una posició GPS fixa. Assegureu-vos que el cel és visible. Ara s\'està enregistrant una ruta nova. S\'ha aturat l\'enregistrament de la ruta. - S\'ha creat un Google Fusion Table nou a google.com/fusiontables. - S\'ha enviat la ruta a maps.google.com. - S\'ha enviat la ruta a un full de càlcul a docs.google.com. - S\'ha enviat la ruta a docs.google.com. Toqueu aquí per anar als paràmetres de seguretat i ubicació i activeu \'habilita els satèl·lits GPS\'. Premeu el botó d\'anar enrere per tornar. Nota: Es mostra una ubicació determinada a partir de les xarxes sense fils i antenes telefòniques. No es pot determinar la ubicació. Habiliteu més fonts d\'ubicació (vegeu els paràmetres de seguretat i ubicació) i assegureu-vos que el cel és visible. Proveu de nou més tard. @@ -82,8 +78,7 @@ limitations under the License. Creat per My Tracks a l\'Android. - Creat per <a href=\'http://mytracks.appspot.com\'>My Tracks</a> a l\'Android. - + Enregistrat Tipus d\'activitat diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml index 64a70e340..d468ca65e 100644 --- a/MyTracks/res/values-de/strings.xml +++ b/MyTracks/res/values-de/strings.xml @@ -50,10 +50,6 @@ limitations under the License. Warte auf ein besseres GPS-Signal. Bitte stelle sicher, dass der Himmel sichtbar ist. Ein neuer Track wird aufgezeichnet. Die Aufzeichnung wurde angehalten. - Eine neue Tabelle wurde auf google.com/fusiontables erstellt. - Dein Track wurde auf maps.google.com gespeichert. - Dein Track wurde in einer neuen Tabelle bei docs.google.com gespeichert. - Dein Track wurde an docs.google.com gesendet. Hier berühren, um zu den Sicherheits- und Positionseinstellungen zu gelangen. Aktiviere \'GPS-Satelliten\'. Drücke dann den Zurück-Knopf, um hierher zurückzukehren. Anmerkung: Eine ungefähre Position wird angezeigt, bestimmt mittels Mobilfunkstationen und WiFi-Netzwerken. Die Position kann derzeit nicht bestimmt werden. Aktiviere mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stelle sicher, dass der Himmel sichtbar ist. @@ -82,8 +78,7 @@ limitations under the License. Erstellt von My Tracks für Android. - Erstellt von <a href=\'http://mytracks.appspot.com\'>My Tracks</a> für Android. - + Punkte Aufgezeichnet am diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml index 030a0d96c..c83470c97 100644 --- a/MyTracks/res/values-es/strings.xml +++ b/MyTracks/res/values-es/strings.xml @@ -53,11 +53,6 @@ limitations under the License. Esperando una ubicación mas exacta del GPS. Asegúrese que el cielo sea visible. Grabando un nuevo recorrido. Grabación interrumpida. - Un nuevo sitio ha sido añadido en maps.google.com. - Una nueva tabla de Google Fusion ha sido creada en google.com/fusiontables. - Su recorrido ha sido enviado a maps.google.com. - Su recorrido ha sido enviado a una nueva hoja de cálculo de docs.google.com. - Su recorrido ha sido enviado a docs.google.com. Es posible que pasen unos minutos hasta que los nuevos recorridos aparezcan. Por favor, presione aquí para ir al menú de Seguridad y Ubicación, y asegúrese que el GPS esté habilitado. Presione el botón "atrás" para regresar. Nota: Una ubicación aproximada es determinada a partir de torres de telefonía celular y redes WIFI. @@ -92,8 +87,7 @@ limitations under the License. Creado por My Tracks para Android. - Creado por <a href=\'http://mytracks.appspot.com\'>My Tracks</a> en Android. - + Created by <a href=\'http://mytracks.appspot.com\'>My Tracks</a> en Android. Nuevo Sitio diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml index 3a383c2db..b17c2e99c 100644 --- a/MyTracks/res/values-fi/strings.xml +++ b/MyTracks/res/values-fi/strings.xml @@ -53,11 +53,6 @@ limitations under the License. Odotetaan parempaa GPS-yhteyttä. Varmista että taivas on näkyvissä. Tallennetaan uutta reittiä. Reitin tallentaminen lopetettiin. - Uusi Google My Map on luotu osoitteeseen maps.google.com. - Uusi Google Fusion taulukko on luotu osoitteeseen google.com/fusiontables. - Reittisi on lähetetty osoitteeseen maps.google.com. - Reittisi on luotu taulukoksi osoitteeseen docs.google.com. - Reittisi on lähetetty osoitteeseen docs.google.com. Reitin näkyminen saattaa kestää muutaman minuutin. Avaa tästä Sijainti ja suojaus -asetukset ja valitse \'Käytä GPS-satelliitteja\'. Palaa ohjelmaan painamalla Takaisin-näppäintä. Huomio: Näkyvä sijainti perustuu kännykkämastoista ja WLAN-verkoista arvioituun paikkatietoon. @@ -91,8 +86,7 @@ limitations under the License. Created by My Tracks on Android. - Created by <a href=\'http://mytracks.appspot.com\'>My Tracks</a> on Android. - + Created by <a href=\'http://mytracks.appspot.com\'>My Tracks</a> on Android. Uusi kartta diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml index c4323c9cc..1c24c7f9f 100644 --- a/MyTracks/res/values-fr/strings.xml +++ b/MyTracks/res/values-fr/strings.xml @@ -51,10 +51,6 @@ limitations under the License. Attente du signal GPS. Assurez-vous que le ciel est bien visible. Parcours en cours d\'enregistrement. Enregistrement du parcours terminé. - Une nouvelle table Google Fusion vient d\'être créée sur google.com/fusiontables. - Votre parcours a été envoyé à maps.google.com. - Votre parcours a été envoyé dans un tableur à docs.google.com. - Votre parcours a été envoyé à docs.google.com. Cliquez ici et allez dans \'Paramètres\', \'Sécurité et Localisation\' et selectionnez \'Activer les satellites GPS\'. Appuyez sur le bouton de retour pour revenir au menu. Note : Votre position est approximative, elle a été déterminée par les antennes de téléphonie ou le réseau WiFi. Votre position ne peut être déterminée. Vérifiez votre configuration dans \'Paramètres\', \'Sécurité et Localisation\'. Assurez-vous également que le ciel soit bien visible. @@ -83,8 +79,7 @@ limitations under the License. Créée par My Tracks sous Android. - Créée par <a href=\'http://mytracks.appspot.com\'>My Tracks</a> sous Android. - + Enregistré Type d\'activité diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml index a7e1cee87..a42b22b53 100644 --- a/MyTracks/res/values-it/strings.xml +++ b/MyTracks/res/values-it/strings.xml @@ -48,10 +48,6 @@ limitations under the License. Sto aspettando il fix del GPS. Accertati che il cielo sia visibile. Sto registrando un nuovo percorso. Registrazione del percorso terminata. - - Il tuo percorso è stato inviato a maps.google.com. - Il tuo percorso è stato inviato ad un nuovo foglio di calcolo su docs.google.com. - Il tuo percorso è stato inviato a docs.google.com. Premi qui per andare a «Impostazioni di posizione e protezione» e attiva «Utilizza satelliti GPS». Poi premi il tasto di ritorno per tornare qui. Nota: la posizione indicata è un\'approssimazione determinata in base alle antenne cellulari e reti WIFI vicine. La posizione non può essere determinata. Attiva più fonti di posizione (vedi «Impostazioni di posizione e protezione») e eccertati che il cielo sia visibile. Riprova più tardi. @@ -80,8 +76,7 @@ limitations under the License. Creato da My Tracks su Android. - Creato da <a href=\'http://mytracks.appspot.com\'>My Tracks</a> su Android. - + Punti Registrato diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml index e6db12ed4..6cee9c199 100644 --- a/MyTracks/res/values-ja/strings.xml +++ b/MyTracks/res/values-ja/strings.xml @@ -51,11 +51,6 @@ limitations under the License. GPS位置精度がよくなるまで待機しています.空が見えるところにいて下さい. 新しいトラックを記録中です. トラック記録を停止しました. - 新しいマイマップをmap.google.comに作成しました. - 新しいGoogle Fusion Tableをgoogle.com/fusiontablesに作成しました. - トラックをmaps.google.comに送信しました. - トラックをdocs.google.comの新しいスプレッドシートに送信しました. - トラックをdocs.google.comに送信しました. 新しいトラックが表示されるまでに数分かかることがあります. ここをタップして「位置情報とセキュリティの設定」を開いて「GPS機能を使用」にチェックを入れて下さい.バックボタンで戻ってください. ご注意: 携帯電話中継局とWi-Fiネットワークから大まかな位置を特定します. @@ -88,8 +83,7 @@ limitations under the License. Android用My Tracksで作成 - Android用<a href=\'http://mytracks.appspot.com\'>My Tracks</a>で作成しました. - + Android用<a href=\'http://mytracks.appspot.com\'>My Tracks</a>で作成しました. 新規マップ diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml index 04476e5ab..83f19cfe9 100644 --- a/MyTracks/res/values-pl/strings.xml +++ b/MyTracks/res/values-pl/strings.xml @@ -49,10 +49,6 @@ limitations under the License. Oczekiwanie na lepsze ustalenie pozycji GPS. Upewnij się, że niebo jest widoczne. Rejestrowanie nowej trasy. Zatrzymano rejestrowanie nowej trasy. - - Twoja trasa został wysłana do maps.google.com. - Twoja trasa została wysłana do nowego arkusza na docs.google.com. - Twoja trasa została wysłana do docs.google.com. Tapnij tutaj, aby przejść do ustawień Lokalizacji i zabezpieczeń, a następnie zaznacz Użyj satelitów GPS. Naciśnij klawisz Wstecz, aby powrócić. Uwaga: używana jest przybliżona lokalizacja ustalona za pomocą stacji komórkowych i sieci WIFI. Lokalizacja nie może być obecnie ustalona. Włącz wiecej źródeł (zobacz ustawienia Lokalizacji i zabezpieczeń) i upewnij się, że niebo jest widoczne. Spróbuj później. @@ -81,8 +77,7 @@ limitations under the License. Utworzono za pomocą My Tracks na Android. - Utworzona przez <a href=\'http://mytracks.appspot.com\'>My Tracks</a> na Android. - + Punkty Zapisana diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml index cafacd775..a7cceee2e 100644 --- a/MyTracks/res/values-pt-rBR/strings.xml +++ b/MyTracks/res/values-pt-rBR/strings.xml @@ -48,10 +48,6 @@ limitations under the License. Esperando por um sinal melhor do GPS. Assegure-se de que o céu está visível. Gravando um novo caminho. Gravação interrompida. - Uma nova Fusion Table Google foi criada em google.com/fusiontables. - Seu caminho foi enviado para maps.google.com. - Seu caminho foi enviado para uma nova planilha em docs.google.com. - Seu caminho foi enviado para docs.google.com. "Por favor pressione aqui para ir aos ajustes de segurança e localização e verifique que o GPS esteja habilitado. Pressione o botão de voltar para retornar. Nota: Uma localização aproximada, determinada por torres de telefonia celular, está sendo mostrada. Sua localização não pôde ser determinada. Habilite fontes adicionais de localização (veja configurações de Segurança e Localização) e assegure-se de que o céu está visível. @@ -80,8 +76,7 @@ limitations under the License. "Criado por My Tracks no Android. - "Criado por <a href='http://mytracks.appspot.com'>My Tracks</a> no Android. - + Pontos Gravado diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml index 58ed69fce..bbffe8b44 100644 --- a/MyTracks/res/values-ru/strings.xml +++ b/MyTracks/res/values-ru/strings.xml @@ -52,11 +52,6 @@ limitations under the License. Ожидание сигнала GPS. Убедитесь в том, что вы находитесь под открытым небом. Записывается новый трек. Запись вашего трека остановлена. - Новая Google \"Мои карты\" была создана на maps.google.com. - Новая таблица Google Fusion была создана на google.com/fusiontables. - Твой трек был отправлен на maps.google.com. - Ваш трек был отправлен в новую электронную таблицу на docs.google.com. - Ваш трек был отправлен в docs.google.com. Это может занять несколько минут, прежде чем появятся новые треки. Пожалуйста, нажмите здесь для перехода к разделу настроек Координаты и отметьте пункт \"Спутники GPS\". Для возвращения нажмите кнопку Назад. Примечание: приблизительное местоположение определено относительно вышек сотовой связи и беспроводных сетей. @@ -90,8 +85,7 @@ limitations under the License. Создано My Tracks на Android. - Создано <a href=\'http://mytracks.appspot.com\'>My Tracks</a> на Android. - + Создано <a href=\'http://mytracks.appspot.com\'>My Tracks</a> на Android. Новая карта diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml index f94b0c575..52140ee94 100644 --- a/MyTracks/res/values-sv/strings.xml +++ b/MyTracks/res/values-sv/strings.xml @@ -49,10 +49,6 @@ limitations under the License. Väntar på bättre GPS-position. Se till att himlen är synlig. Spelar nu in ett nytt spår. Stoppade inspelning av ditt spår. - - Ditt spår har skickats till maps.google.com. - Ditt spår har skickats till ett nytt kalkylblad på docs.google.com. - Ditt spår har skickats till docs.google.com. Klicka här för att gå till Säkerhet och Platsinställningar och kryssa i \'aktivera gps-satteliter\'. Tryck på tillbakaknappen för att återgå. OBS: En ungefärlig position som avgörs från mobilmaster och WIFI-nät visas. En position kan för närvarande inte fastställas. Aktivera mer platskällor (se Säkerhet och Platsinställningar) och se till att himlen är synlig. Försök igen senare. @@ -81,7 +77,6 @@ limitations under the License. Skapad av My Tracks på Android. - Skapad av <a href=\'http://mytracks.appspot.com\'>My Tracks</a> på Android. Punkter diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml index 238a9afa2..e4f49eb52 100644 --- a/MyTracks/res/values-zh-rCN/strings.xml +++ b/MyTracks/res/values-zh-rCN/strings.xml @@ -53,11 +53,6 @@ limitations under the License. 等待更准确的 GPS 定位. 请确定可以看见天空. 现在开始记录新的轨迹. 停止记录你的轨迹. - 已在 maps.google.com 创建了新的 Google My Map. - 已在 google.com/fusiontables 创建新 Google Fusion Table. - 你的轨迹已经发送到 maps.google.com. - 你的轨迹已经作为新的电子表格发送到 docs.google.com. - 你的轨迹已经发送到 docs.google.com. 可能需要等待几分钟才能看见新的轨迹. 请点击这里进入\'安全和位置设置\'并勾选上\'启用 GPS 卫星\'. 然后用后退键返回. 注意: 当前显示的位置是根据无线信号和无线网络计算的近似位置. @@ -91,10 +86,6 @@ limitations under the License. 由 Android 平台的 My Tracks 创建. - 由 Android 平台的 <a href=\'http://mytracks.appspot.com\'>My Tracks</a> 创建. - - - 由 Android 上的 <a href=\'http://mytracks.appspot.com\'>My Tracks</a> 创建. 新地图 diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml index 1236d6bd1..630fcea0c 100644 --- a/MyTracks/res/values/do_not_translate.xml +++ b/MyTracks/res/values/do_not_translate.xml @@ -18,9 +18,10 @@ limitations under the License. My Tracks + mytracks.appspot.com + mytracks@googlegroups.com - mytracks.appspot.com m.google.com/privacy Copyright 2009 Google Inc. Bartłomiej Niechwiej @@ -45,9 +46,9 @@ limitations under the License. - - google.com/fusiontables - maps.google.com - docs.google.com + google.com/fusiontables + maps.google.com + docs.google.com UA-7222692-2 diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index dd405810d..edb758862 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -168,32 +168,37 @@ limitations under the License. the result page."> It may take a few minutes before new tracks appear. - - A new Google My Map has been created at maps.google.com. + + Your track has been sent to %s. - - Your track has been sent to maps.google.com. + + A new spreadsheet is created at %s. - - A new Google Fusion table has been created at google.com/fusiontables. + page indicating success. E.g., 'A new Google Fusion table has been created at + google.com/fusiontables.'"> + A new Google Fusion table has been created at %s. - - A new spreadsheet is created at docs.google.com. + + Your track has been sent to %s. - - Your track has been sent to docs.google.com. + + A new Google My Map has been created at %s. - + - Created by <a href=\'http://mytracks.appspot.com\'>My Tracks</a> on Android. + My Tracks on Android. The two string placeholders are used to insert the html link tags around + 'My Tracks'. E.g., 'Created by <a href=\'http://mytracks.appspot.com\'>My Tracks + </a> on Android.'."> + Created by %1$sMy Tracks%2$s on Android. diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java index 472d1db0c..2ba84887f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java @@ -22,6 +22,7 @@ import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.io.docs.DocsHelper; import com.google.android.apps.mytracks.io.gdata.GDataClientFactory; import com.google.android.apps.mytracks.io.gdata.GDataWrapper; +import com.google.android.apps.mytracks.io.sendtogoogle.SendType; import com.google.android.common.gdata.AndroidXmlParserFactory; import com.google.android.maps.mytracks.R; import com.google.wireless.gdata.client.GDataClient; @@ -115,13 +116,11 @@ public class SendToDocs { Log.d(Constants.TAG, "SendToDocs: Uploading to spreadsheet"); success = uploadToDocs(track); if (success) { - if (createdNewSpreadSheet) { - statusMessage = activity.getString( - R.string.sending_to_docs_success_new_doc); - } else { - statusMessage = activity.getString( - R.string.sending_to_docs_success_existing_doc); - } + String format = createdNewSpreadSheet + ? activity.getString(R.string.send_google_docs_new_doc_success) + : activity.getString(R.string.send_google_docs_existing_doc_success); + String url = activity.getString(SendType.DOCS.getServiceUrl()); + statusMessage = String.format(format, url); } else { statusMessage = activity.getString(R.string.error_sending_to_docs); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java index 8b6e83be1..571ee6dfd 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java @@ -24,6 +24,7 @@ import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; import com.google.android.apps.mytracks.io.gdata.GDataWrapper; import com.google.android.apps.mytracks.io.gdata.GDataWrapper.QueryFunction; +import com.google.android.apps.mytracks.io.sendtogoogle.SendType; import com.google.android.apps.mytracks.stats.DoubleBuffer; import com.google.android.apps.mytracks.stats.TripStatistics; import com.google.android.apps.mytracks.util.ApiFeatures; @@ -71,7 +72,7 @@ public class SendToFusionTables implements Runnable { * Listener invoked when sending to fusion tables completes. */ public interface OnSendCompletedListener { - void onSendCompleted(String tableId, boolean success, int statusMessage); + void onSendCompleted(String tableId, boolean success, String statusMessage); } /** The GData service id for Fusion Tables. */ @@ -168,7 +169,7 @@ public class SendToFusionTables implements Runnable { } private void doUpload() { - int statusMessageId = R.string.error_sending_to_fusion_tables; + String statusMessage = context.getString(R.string.error_sending_to_fusion_tables); boolean success = true; try { progressIndicator.setProgressValue(PROGRESS_INITIALIZATION); @@ -205,17 +206,18 @@ public class SendToFusionTables implements Runnable { return; } - statusMessageId = R.string.sending_to_fusion_tables_success; + String format = context.getString(R.string.send_google_fusion_tables_success); + String url = context.getString(SendType.FUSION_TABLES.getServiceUrl()); + statusMessage = String.format(format, url); Log.d(Constants.TAG, "SendToFusionTables: Done: " + success); progressIndicator.setProgressValue(PROGRESS_COMPLETE); } finally { final boolean finalSuccess = success; - final int finalStatusMessageId = statusMessageId; + final String finalStatusMessage = statusMessage; context.runOnUiThread(new Runnable() { public void run() { if (onCompletion != null) { - onCompletion.onSendCompleted( - tableId, finalSuccess, finalStatusMessageId); + onCompletion.onSendCompleted(tableId, finalSuccess, finalStatusMessage); } } }); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java index 84a6cb0de..9c38d9b8a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java @@ -23,6 +23,7 @@ import com.google.android.apps.mytracks.content.MyTracksProviderUtils; import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Waypoint; import com.google.android.apps.mytracks.io.mymaps.MapsFacade; +import com.google.android.apps.mytracks.io.sendtogoogle.SendType; import com.google.android.apps.mytracks.stats.DoubleBuffer; import com.google.android.apps.mytracks.stats.TripStatistics; import com.google.android.apps.mytracks.util.LocationUtils; @@ -75,7 +76,7 @@ public class SendToMyMaps implements Runnable { private int totalSegmentsUploaded; public interface OnSendCompletedListener { - void onSendCompleted(String mapId, boolean success, int statusMessage); + void onSendCompleted(String mapId, boolean success, String statusMessage); } public SendToMyMaps(Activity context, String mapId, AuthManager auth, @@ -98,7 +99,7 @@ public class SendToMyMaps implements Runnable { } private void doUpload() { - int statusMessageId = R.string.error_sending_to_my_maps; + String statusMessage = context.getString(R.string.error_sending_to_my_maps); boolean success = true; try { progressIndicator.setProgressMessage( @@ -173,9 +174,11 @@ public class SendToMyMaps implements Runnable { } if (success) { - statusMessageId = isNewMap - ? R.string.sending_to_my_maps_success_new_map - : R.string.sending_to_my_maps_success_existing_map; + String format = isNewMap + ? context.getString(R.string.send_google_my_maps_new_map_success) + : context.getString(R.string.send_google_my_maps_existing_map_success); + String url = context.getString(SendType.MYMAPS.getServiceUrl()); + statusMessage = String.format(format, url); } Log.d(TAG, "SendToMyMaps: Done: " + success); progressIndicator.setProgressValue(100); @@ -185,12 +188,11 @@ public class SendToMyMaps implements Runnable { } final boolean finalSuccess = success; - final int finalStatusMessageId = statusMessageId; + final String finalStatusMessage = statusMessage; context.runOnUiThread(new Runnable() { public void run() { if (onCompletion != null) { - onCompletion.onSendCompleted( - mapId, finalSuccess, finalStatusMessageId); + onCompletion.onSendCompleted(mapId, finalSuccess, finalStatusMessage); } } }); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java index a5b817dc1..722f614c1 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java @@ -3,6 +3,7 @@ package com.google.android.apps.mytracks.io.mymaps; import com.google.android.apps.mytracks.content.Waypoint; import com.google.android.apps.mytracks.io.AuthManager; +import com.google.android.apps.mytracks.util.StringUtils; import com.google.android.maps.GeoPoint; import com.google.android.maps.mytracks.R; import com.google.wireless.gdata.client.HttpException; @@ -119,7 +120,7 @@ public class MapsFacade { MyMapsMapMetadata metaData = new MyMapsMapMetadata(); metaData.setTitle(title); metaData.setDescription(description + " - " - + category + " - " + context.getString(R.string.send_to_google_by_mytracks)); + + category + " - " + StringUtils.getCreatedByMyTracks(context, false)); metaData.setSearchable(isPublic); Entry entry = MyMapsGDataConverter.getMapEntryForMetadata(metaData); Log.d(MyMapsConstants.TAG, "Title: " + entry.getTitle()); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java index 573e95765..395688c92 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java @@ -429,9 +429,9 @@ public class SendActivity extends Activity implements ProgressIndicator { SendToMyMaps.OnSendCompletedListener onCompletion = new SendToMyMaps.OnSendCompletedListener() { @Override - public void onSendCompleted(String mapId, boolean success, int statusMessage) { + public void onSendCompleted(String mapId, boolean success, String statusMessage) { // TODO: Use this message - sendToMyMapsMessage = getString(statusMessage); + sendToMyMapsMessage = statusMessage; sendToMyMapsSuccess = success; if (sendToMyMapsSuccess) { sendToMyMapsMapId = mapId; @@ -491,10 +491,9 @@ public class SendActivity extends Activity implements ProgressIndicator { OnSendCompletedListener onCompletion = new OnSendCompletedListener() { @Override - public void onSendCompleted(String tableId, boolean success, - int statusMessage) { + public void onSendCompleted(String tableId, boolean success, String statusMessage) { // TODO: Use this message - sendToFusionTablesMessage = getString(statusMessage); + sendToFusionTablesMessage = statusMessage; sendToFusionTablesSuccess = success; if (sendToFusionTablesSuccess) { sendToFusionTablesTableId = tableId; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java index 66feccf41..37d382a63 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java @@ -24,11 +24,11 @@ import com.google.android.maps.mytracks.R; */ public enum SendType { MYMAPS(R.string.sendtogoogle_google_mymaps, - R.string.sendtogoogle_google_mymaps_url), + R.string.send_google_my_maps_url), FUSION_TABLES(R.string.sendtogoogle_google_fusiontables, - R.string.sendtogoogle_google_fusiontables_url), + R.string.send_google_fusion_tables_url), DOCS(R.string.sendtogoogle_google_docs, - R.string.sendtogoogle_google_docs_url); + R.string.send_google_docs_url); private int serviceName; private int serviceUrl; diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java index e28445469..d774662b0 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java @@ -303,7 +303,7 @@ public class StringUtils implements DescriptionGenerator { + "", // Line 1 - context.getString(R.string.send_to_google_by_mytracks), + getCreatedByMyTracks(context, true), // Line 2 context.getString(R.string.total_distance_label), @@ -353,6 +353,22 @@ public class StringUtils implements DescriptionGenerator { ChartURLGenerator.getChartUrl(distances, elevations, track, context)); } + /** + * Returns the 'Created by My Tracks on Android' string. + * + * @param context the context + * @param addLink true to add a link to the My Tracks web site + */ + public static String getCreatedByMyTracks(Context context, boolean addLink) { + String format = context.getString(R.string.send_google_by_my_tracks); + if (addLink) { + String url = context.getString(R.string.my_tracks_web_url); + return String.format(format, "", ""); + } else { + return String.format(format, "", ""); + } + } + private String getSpeedString(double speed, int speedLabel, int paceLabel, boolean displaySpeed) { double speedInKph = speed * 3.6;