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

Pass in hl to the help center url

Browse Source
This commit is contained in:
Jimmy Shih
2013-03-07 14:16:03 -08:00
parent e44d2875cc
commit 664f18c1ea
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/values/do_not_translate.xml
+1 -1
View File
@@ -73,7 +73,7 @@ Google은 이용자에 대한 위치정보의 이용∙제공사실을 위치정
<string name="maps_public_unlisted_url">support.google.com/maps/bin/answer.py?answer=144365</string> <string name="maps_public_unlisted_url">support.google.com/maps/bin/answer.py?answer=144365</string>
<string name="marker_statistics_icon_url">http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png</string> <string name="marker_statistics_icon_url">http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png</string>
<string name="marker_waypoint_icon_url">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string> <string name="marker_waypoint_icon_url">http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png</string>
<string name="my_tracks_help_url">http://support.google.com/gmm/bin/topic.py?topic=2391064</string> <string name="my_tracks_help_url">http://support.google.com/gmm/bin/topic.py?topic=2391064&amp;hl=%1$s</string>
<string name="my_tracks_privacy_url">www.google.com/policies/privacy/</string> <string name="my_tracks_privacy_url">www.google.com/policies/privacy/</string>
<string name="my_tracks_recording_service_name">My Tracks Recording Service</string> <string name="my_tracks_recording_service_name">My Tracks Recording Service</string>
<string name="my_tracks_support_url">groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks</string> <string name="my_tracks_support_url">groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks</string>
MyTracks/src/com/google/android/apps/mytracks/HelpActivity.java
+7 -1
View File
@@ -28,6 +28,8 @@ import android.view.View.OnClickListener;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
import java.util.Locale;
/** /**
* An activity that displays the help page. * An activity that displays the help page.
* *
@@ -40,7 +42,11 @@ public class HelpActivity extends AbstractMyTracksActivity implements AboutCalle
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
WebView webView = (WebView) findViewById(R.id.help_webview); WebView webView = (WebView) findViewById(R.id.help_webview);
webView.loadUrl(getString(R.string.my_tracks_help_url)); String language = Locale.getDefault().getLanguage();
if (language == null || language.equals("")) {
language = "en";
}
webView.loadUrl(getString(R.string.my_tracks_help_url, language));
webView.getSettings().setJavaScriptEnabled(true); webView.getSettings().setJavaScriptEnabled(true);
webView.setWebViewClient(new WebViewClient()); webView.setWebViewClient(new WebViewClient());