Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app language now changes time formatting (3hrs ago), was system language b4

Browse source
This commit is contained in:
bopol 2020-01-09 15:51:41 +01:00
parent ed9a3517c6
commit b32935a1b0
6 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/org/schabi/newpipe/util/Localization.java
View file

@ -7,7 +7,6 @@ import android.content.res.Resources;
import android.preference.PreferenceManager;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.PluralsRes;
@ -54,8 +53,8 @@ public class Localization {
private Localization() {
}
public static void init() {
initPrettyTime();
public static void init(Context context) {
initPrettyTime(context);
}
@NonNull
@ -203,17 +202,17 @@ public class Localization {
// Pretty Time
//////////////////////////////////////////////////////////////////////////*/
private static void initPrettyTime() {
prettyTime = new PrettyTime(Locale.getDefault());
private static void initPrettyTime(Context context) {
prettyTime = new PrettyTime(getAppLocale(context));
// Do not use decades as YouTube doesn't either.
prettyTime.removeUnit(Decade.class);
}
private static PrettyTime getPrettyTime() {
// If pretty time's Locale is different, init again with the new one.
if (!prettyTime.getLocale().equals(Locale.getDefault())) {
initPrettyTime();
}
// if (!prettyTime.getLocale().equals(Locale.getDefault())) {
// initPrettyTime();
// }
return prettyTime;
}
@ -228,7 +227,7 @@ public class Localization {
res.updateConfiguration(conf, dm);
}
public static Locale getAppLanguage(Context context) {
public static Locale getAppLocale(Context context) {
SharedPreferences prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(context);
String lang = prefs.getString("newpipes_language_key", "en");
Locale loc;