French translations

This commit is contained in:
burke.davey
2010-08-07 19:49:37 +00:00
parent c1140f066d
commit 01814f7c63
3 changed files with 25 additions and 17 deletions

View File

@@ -92,7 +92,7 @@ public class C2DMReceiver extends C2DMBaseReceiver {
SharedPreferences settings = Prefs.get(context);
Intent launchIntent = getLaunchIntent(context, url, title, sel);
if (settings.getBoolean("launchBrowserOrMaps", false) && launchIntent != null) {
if (settings.getBoolean("launchBrowserOrMaps", true) && launchIntent != null) {
playNotificationSound(context);
context.startActivity(launchIntent);
} else {

View File

@@ -25,13 +25,17 @@ public class HelpActivity extends Activity {
public static String getTOSLink() {
String link = "http://m.google.com/toscountry"; // default
String country = Locale.getDefault().getCountry();
if (country.equals("US")) {
String locale = Locale.getDefault().toString();
if (locale.equals(Locale.US.toString())) {
link = "http://m.google.com/tospage";
} else if (country.equals("GB")) {
} else if (locale.equals(Locale.UK.toString())) {
link = "http://m.google.co.uk/tospage";
} else if (country.equals("CA")) {
} else if (locale.equals(Locale.CANADA.toString())) {
link = "http://m.google.ca/tospage";
} else if (locale.equals(Locale.CANADA_FRENCH.toString())) {
link = "http://m.google.ca/tospage?hl=fr";
} else if (locale.equals(Locale.FRANCE.toString())) {
link = "http://m.google.fr/tospage";
}
return link;
}
@@ -39,13 +43,17 @@ public class HelpActivity extends Activity {
public static String getPPLink() {
String link = "http://m.google.com/privacy"; // default
String country = Locale.getDefault().getCountry();
if (country.equals("US")) {
String locale = Locale.getDefault().toString();
if (locale.toString().equals(Locale.US.toString())) {
link = "http://m.google.com/privacy";
} else if (country.equals("GB")) {
} else if (locale.toString().equals(Locale.UK.toString())) {
link = "http://m.google.co.uk/privacy";
} else if (country.equals("CA")) {
} else if (locale.toString().equals(Locale.CANADA.toString())) {
link = "http://m.google.ca/privacy";
} else if (locale.toString().equals(Locale.CANADA_FRENCH.toString())) {
link = "http://m.google.ca/privacy?hl=fr";
} else if (locale.toString().equals(Locale.FRANCE.toString())) {
link = "http://m.google.fr/privacy";
}
return link;
}