mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix lint issue: Default locale

Browse source
This commit is contained in:
maskara 2017-03-10 23:37:22 +05:30
parent 36b6715fad
commit 5ccd24eb33
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/fr/free/nrw/commons/LicenseList.java
View file

@ -7,6 +7,7 @@ import org.xmlpull.v1.XmlPullParser;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -54,7 +55,7 @@ public class LicenseList {
public String nameIdForTemplate(String template) { public String nameIdForTemplate(String template) {
// hack :D (converts dashes and periods to underscores) // hack :D (converts dashes and periods to underscores)
// cc-by-sa-3.0 -> cc_by_sa_3_0 // cc-by-sa-3.0 -> cc_by_sa_3_0
return "license_name_" + template.toLowerCase().replace("-", "_").replace(".", "_"); return "license_name_" + template.toLowerCase(Locale.US).replace("-", "_").replace(".", "_");
} }
private int stringIdByName(String stringId) { private int stringIdByName(String stringId) {

7
app/src/main/java/fr/free/nrw/commons/Utils.java
View file

@ -27,6 +27,7 @@ import java.security.NoSuchAlgorithmException;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.Locale;
import java.util.TimeZone; import java.util.TimeZone;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -201,7 +202,7 @@ public class Utils {
} }
public static String capitalize(String string) { public static String capitalize(String string) {
return string.substring(0,1).toUpperCase() + string.substring(1); return string.substring(0,1).toUpperCase(Locale.getDefault()) + string.substring(1);
} }
public static String licenseTemplateFor(String license) { public static String licenseTemplateFor(String license) {
@ -303,11 +304,11 @@ public class Utils {
Pattern jpegPattern = Pattern.compile("\\.jpeg$", Pattern.CASE_INSENSITIVE); Pattern jpegPattern = Pattern.compile("\\.jpeg$", Pattern.CASE_INSENSITIVE);
// People are used to ".jpg" more than ".jpeg" which the system gives us. // People are used to ".jpg" more than ".jpeg" which the system gives us.
if (extension != null && extension.toLowerCase().equals("jpeg")) { if (extension != null && extension.toLowerCase(Locale.US).equals("jpeg")) {
extension = "jpg"; extension = "jpg";
} }
title = jpegPattern.matcher(title).replaceFirst(".jpg"); title = jpegPattern.matcher(title).replaceFirst(".jpg");
if (extension != null && !title.toLowerCase().endsWith("." + extension.toLowerCase())) { if (extension != null && !title.toLowerCase(Locale.US).endsWith("." + extension.toLowerCase(Locale.US))) {
title += "." + extension; title += "." + extension;
} }
return title; return title;

3
app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
View file

@ -26,6 +26,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import java.io.IOException; import java.io.IOException;
import java.util.Locale;
import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.EventLog; import fr.free.nrw.commons.EventLog;
@ -220,7 +221,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
private void performLogin() { private void performLogin() {
String username = usernameEdit.getText().toString(); String username = usernameEdit.getText().toString();
// Because Mediawiki is upercase-first-char-then-case-sensitive :) // Because Mediawiki is upercase-first-char-then-case-sensitive :)
String canonicalUsername = username.substring(0,1).toUpperCase() + username.substring(1); String canonicalUsername = username.substring(0,1).toUpperCase(Locale.getDefault()) + username.substring(1);
String password = passwordEdit.getText().toString(); String password = passwordEdit.getText().toString();