tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use default locale when formatting strings

Browse source
This commit is contained in:
Eugene Cheung 2018-09-05 22:09:58 -04:00
commit 2e7dd7b62e
No known key found for this signature in database
GPG key ID: E1FD745328866B0A
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/kabouzeid/gramophone/helper/StopWatch.java
View file

@ -1,5 +1,7 @@
package com.kabouzeid.gramophone.helper; package com.kabouzeid.gramophone.helper;
import java.util.Locale;
/** /**
* Simple thread safe stop watch. * Simple thread safe stop watch.
* *
@ -77,6 +79,6 @@ public class StopWatch {
@Override @Override
public String toString() { public String toString() {
return String.format("%d millis", getElapsedTime()); return String.format(Locale.getDefault(), "%d millis", getElapsedTime());
} }
} }

3
app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java
View file

@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
import com.kabouzeid.gramophone.lastfm.rest.service.LastFMService; import com.kabouzeid.gramophone.lastfm.rest.service.LastFMService;
import java.io.File; import java.io.File;
import java.util.Locale;
import okhttp3.Cache; import okhttp3.Cache;
import okhttp3.Call; import okhttp3.Call;
@ -54,7 +55,7 @@ public class LastFMRestClient {
public static Interceptor createCacheControlInterceptor() { public static Interceptor createCacheControlInterceptor() {
return chain -> { return chain -> {
Request modifiedRequest = chain.request().newBuilder() Request modifiedRequest = chain.request().newBuilder()
.addHeader("Cache-Control", String.format("max-age=%d, max-stale=%d", 31536000, 31536000)) .addHeader("Cache-Control", String.format(Locale.getDefault(), "max-age=%d, max-stale=%d", 31536000, 31536000))
.build(); .build();
return chain.proceed(modifiedRequest); return chain.proceed(modifiedRequest);
}; };

5
app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
View file

@ -35,6 +35,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** /**
@ -156,11 +157,11 @@ public class MusicUtil {
long minutes = (songDurationMillis / 1000) / 60; long minutes = (songDurationMillis / 1000) / 60;
long seconds = (songDurationMillis / 1000) % 60; long seconds = (songDurationMillis / 1000) % 60;
if (minutes < 60) { if (minutes < 60) {
return String.format("%01d:%02d", minutes, seconds); return String.format(Locale.getDefault(), "%01d:%02d", minutes, seconds);
} else { } else {
long hours = minutes / 60; long hours = minutes / 60;
minutes = minutes % 60; minutes = minutes % 60;
return String.format("%d:%02d:%02d", hours, minutes, seconds); return String.format(Locale.getDefault(), "%d:%02d:%02d", hours, minutes, seconds);
} }
} }