mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix country specific translations for badges.

fork-5.53.8
Cody Henthorne 2021-11-24 11:56:03 -05:00 zatwierdzone przez Greyson Parrelli
rodzic 818eb81f87
commit c5d7188dcb
1 zmienionych plików z 8 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/AcceptLanguagesUtil.java
Wyświetl plik

@ -1,5 +1,7 @@
package org.whispersystems.signalservice.internal.push.http; package org.whispersystems.signalservice.internal.push.http;
import org.whispersystems.signalservice.internal.util.Util;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
@ -8,20 +10,22 @@ import java.util.Objects;
public class AcceptLanguagesUtil { public class AcceptLanguagesUtil {
public static Map<String, String> getHeadersWithAcceptLanguage(Locale locale) { public static Map<String, String> getHeadersWithAcceptLanguage(Locale locale) {
Map<String, String> headers = new HashMap<>(); Map<String, String> headers = new HashMap<>();
headers.put("Accept-Language", formatLanguages(locale.getLanguage(), Locale.US.getLanguage())); headers.put("Accept-Language", formatLanguages(locale.getLanguage(), locale.getCountry(), Locale.US.getLanguage()));
return headers; return headers;
} }
public static String getAcceptLanguageHeader(Locale locale) { public static String getAcceptLanguageHeader(Locale locale) {
return "Accept-Language:" + formatLanguages(locale.getLanguage(), Locale.US.getLanguage()); return "Accept-Language:" + formatLanguages(locale.getLanguage(), locale.getCountry(), Locale.US.getLanguage());
} }
private static String formatLanguages(String language, String fallback) { private static String formatLanguages(String language, String country, String fallback) {
if (Objects.equals(language, fallback)) { if (Objects.equals(language, fallback)) {
return language + ";q=1"; return language + ";q=1";
} else { } else if (Util.isEmpty(country)) {
return language + ";q=1," + fallback + ";q=0.5"; return language + ";q=1," + fallback + ";q=0.5";
} else {
return language + "-" + country + ";q=1," + language + ";q=0.75," + fallback + ";q=0.5";
} }
} }
} }