mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

More German updates from Malte, Swedish updates from professional translation

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2438 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2012-10-01 09:50:22 +00:00
parent 65e3d10b52
commit 2ab85327d5
4 changed files with 99 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -54,6 +54,7 @@ Kevin Xue (NetDragon Websoft Inc., China)
Lachezar Dobrev Lachezar Dobrev
Luiz Silva Luiz Silva
Luka Finžgar Luka Finžgar
Malte Starostik
Manuel Kasten Manuel Kasten
Marcelo Marcelo
Mateusz Jędrasik Mateusz Jędrasik

28
android/res/values-de/strings.xml
View file

@ -51,16 +51,16 @@
<string name="contents_sms">SMS Adresse</string> <string name="contents_sms">SMS Adresse</string>
<string name="contents_text">Text</string> <string name="contents_text">Text</string>
<string name="history_clear_one_history_text">Löschen</string> <string name="history_clear_one_history_text">Löschen</string>
<string name="history_clear_text">Historie löschen</string> <string name="history_clear_text">Verlauf löschen</string>
<string name="history_email_title">Barcode Scanner Historie</string> <string name="history_email_title">Barcode Scanner Verlauf</string>
<string name="history_empty">Leer</string> <string name="history_empty">Leer</string>
<string name="history_empty_detail">Es wurden keine Barcodes aufgezeichnet.</string> <string name="history_empty_detail">Es wurden keine Barcodes aufgezeichnet.</string>
<string name="history_send">Historie senden</string> <string name="history_send">Verlauf senden</string>
<string name="history_title">Historie</string> <string name="history_title">Verlauf</string>
<string name="menu_encode_mecard">MECARD verwenden</string> <string name="menu_encode_mecard">MECARD verwenden</string>
<string name="menu_encode_vcard">vCard verwenden</string> <string name="menu_encode_vcard">vCard verwenden</string>
<string name="menu_help">Hilfe</string> <string name="menu_help">Hilfe</string>
<string name="menu_history">Historie</string> <string name="menu_history">Verlauf</string>
<string name="menu_settings">Einstellungen</string> <string name="menu_settings">Einstellungen</string>
<string name="menu_share">Senden</string> <string name="menu_share">Senden</string>
<string name="msg_bulk_mode_scanned">Bulk-Modus: Barcode gescannt und gespeichert</string> <string name="msg_bulk_mode_scanned">Bulk-Modus: Barcode gescannt und gespeichert</string>
@ -88,33 +88,33 @@
<string name="msg_sbc_unknown_page">Unbekannte Seite</string> <string name="msg_sbc_unknown_page">Unbekannte Seite</string>
<string name="msg_share_explanation">Sie können Daten weitergeben, indem Sie einen Barcode auf Ihrem Bilschirm erzeugen und mit einem anderen Handy einscannen.</string> <string name="msg_share_explanation">Sie können Daten weitergeben, indem Sie einen Barcode auf Ihrem Bilschirm erzeugen und mit einem anderen Handy einscannen.</string>
<string name="msg_share_subject_line">Hier ist der gescannte Barcode-Inhalt</string> <string name="msg_share_subject_line">Hier ist der gescannte Barcode-Inhalt</string>
<string name="msg_share_text">Oder geben Sie einen Text ein.</string> <string name="msg_share_text">Oder geben Sie einen Text hier</string>
<string name="msg_sure">Sind Sie sicher?</string> <string name="msg_sure">Sind Sie sicher?</string>
<string name="msg_unmount_usb">Leider kann nicht auf die SD-Karte zugegriffen werden.</string> <string name="msg_unmount_usb">Leider kann nicht auf die SD-Karte zugegriffen werden.</string>
<string name="preferences_actions_title">Wenn ein Barcode erkannt wurde\u2026</string> <string name="preferences_actions_title">Wenn ein Barcode erkannt wurde\u2026</string>
<string name="preferences_auto_focus_title">Autofokus benutzen</string> <string name="preferences_auto_focus_title">Autofokus verwenden</string>
<string name="preferences_bulk_mode_summary">Scannt und speichert mehrere Barcodes nacheinander</string> <string name="preferences_bulk_mode_summary">Scannt und speichert mehrere Barcodes nacheinander</string>
<string name="preferences_bulk_mode_title">Bulk-Scan-Modus</string> <string name="preferences_bulk_mode_title">Massenscan</string>
<string name="preferences_copy_to_clipboard_title">In Zwischenablage kopieren</string> <string name="preferences_copy_to_clipboard_title">In die Zwischenablage kopieren</string>
<string name="preferences_custom_product_search_summary" formatted="false">Ersetzen: %s = Inhalt, %f = Format, %t = Typ des Inhalts</string> <string name="preferences_custom_product_search_summary" formatted="false">Platzhalter: %s = Inhalt, %f = Format, %t = Typ</string>
<string name="preferences_custom_product_search_title">Eigene Such-URL</string> <string name="preferences_custom_product_search_title">Eigene Such-URL</string>
<string name="preferences_decode_1D_title">1D Barcodes</string> <string name="preferences_decode_1D_title">1D Barcodes</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string> <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_QR_title">QR Codes</string> <string name="preferences_decode_QR_title">QR Codes</string>
<string name="preferences_device_bug_workarounds_title">Geräteabhängige Problemumgehung</string> <string name="preferences_device_bug_workarounds_title">Geräteabhängige Problemumgehung</string>
<string name="preferences_disable_continuous_focus_summary">Nur Standard-Fokus-Modus verwenden</string> <string name="preferences_disable_continuous_focus_summary">Nur Standard-Fokus-Modus verwenden</string>
<string name="preferences_disable_continuous_focus_title">kein kontinuierlicher Fokus</string> <string name="preferences_disable_continuous_focus_title">Kein kontinuierlicher Fokus</string>
<string name="preferences_disable_exposure_title">keine Belichtungsmessung </string> <string name="preferences_disable_exposure_title">Keine Belichtungsmessung </string>
<string name="preferences_front_light_summary">Verbessert bei einigen Mobiltelefonen das Scannen bei schwachem Licht, kann aber Überbelichtung verursachen. Funktioniert nicht mit allen Handys.</string> <string name="preferences_front_light_summary">Verbessert bei einigen Mobiltelefonen das Scannen bei schwachem Licht, kann aber Überbelichtung verursachen. Funktioniert nicht mit allen Handys.</string>
<string name="preferences_front_light_title">Foto LED einschalten</string> <string name="preferences_front_light_title">Foto LED einschalten</string>
<string name="preferences_general_title">Allgemeine Einstellungen</string> <string name="preferences_general_title">Allgemeine Einstellungen</string>
<string name="preferences_name">Einstellungen</string> <string name="preferences_name">Einstellungen</string>
<string name="preferences_play_beep_title">Piepsen</string> <string name="preferences_play_beep_title">Piepsen</string>
<string name="preferences_remember_duplicates_summary">Speichern mehrerer Scans des gleichen Barcodes in der Historie</string> <string name="preferences_remember_duplicates_summary">Speichern mehrerer Scans des gleichen Barcodes im Verlauf</string>
<string name="preferences_remember_duplicates_title">Duplikate speichern</string> <string name="preferences_remember_duplicates_title">Duplikate speichern</string>
<string name="preferences_result_title">Ergebnis-Einstellungen</string> <string name="preferences_result_title">Ergebnis-Einstellungen</string>
<string name="preferences_scanning_title">Beim Scannen von Barcodes, dekodieren\u2026</string> <string name="preferences_scanning_title">Beim Scannen von Barcodes, dekodieren\u2026</string>
<string name="preferences_search_country">Land auswählen</string> <string name="preferences_search_country">Land für die Suche</string>
<string name="preferences_supplemental_summary">Erfahren Sie mehr über Barcode</string> <string name="preferences_supplemental_summary">Erfahren Sie mehr über Barcode</string>
<string name="preferences_supplemental_title">Weitere Informationen abrufen</string> <string name="preferences_supplemental_title">Weitere Informationen abrufen</string>
<string name="preferences_try_bsplus">Barcode Scanner+ testen</string> <string name="preferences_try_bsplus">Barcode Scanner+ testen</string>

102
android/res/values-sv/strings.xml
View file

@ -18,43 +18,43 @@
<string name="app_name">Barcode Scanner</string> <string name="app_name">Barcode Scanner</string>
<string name="app_picker_name">Applikationer</string> <string name="app_picker_name">Applikationer</string>
<string name="bookmark_picker_name">Bokmärken</string> <string name="bookmark_picker_name">Bokmärken</string>
<string name="button_add_calendar">Lägg till i kalendern</string> <string name="button_add_calendar">Lägg till i kalender</string>
<string name="button_add_contact">Lägg till kontakt</string> <string name="button_add_contact">Lägg till kontakt</string>
<string name="button_back">Tillbaka</string> <string name="button_back">Tillbaka</string>
<string name="button_book_search">Boksökning</string> <string name="button_book_search">Boksökning</string>
<string name="button_cancel">Avbryt</string> <string name="button_cancel">Avbryt</string>
<string name="button_custom_product_search">Anpassad sökning</string> <string name="button_custom_product_search">Anpassad sökning</string>
<string name="button_dial">Ring nummer</string> <string name="button_dial">Slå nummer</string>
<string name="button_done">Klar</string> <string name="button_done">Klar</string>
<string name="button_email">Skicka email</string> <string name="button_email">Skicka e-post</string>
<string name="button_get_directions">Hämta instruktioner</string> <string name="button_get_directions">Få anvisningar</string>
<string name="button_google_shopper">Shopper</string> <string name="button_google_shopper">Shopper</string>
<string name="button_mms">Skicka MMS</string> <string name="button_mms">Skicka MMS</string>
<string name="button_ok">OK</string> <string name="button_ok">OK</string>
<string name="button_open_browser">Öppna webbläsare</string> <string name="button_open_browser">Öppna webbläsare</string>
<string name="button_product_search">Produktsökning</string> <string name="button_product_search">Produktsök</string>
<string name="button_search_book_contents">Sök bokinnehåll</string> <string name="button_search_book_contents">Sökinnehåll</string>
<string name="button_share_app">Applikation</string> <string name="button_share_app">Applikation</string>
<string name="button_share_bookmark">Bokmärke</string> <string name="button_share_bookmark">Bokmärke</string>
<string name="button_share_by_email">Dela via email</string> <string name="button_share_by_email">Dela via e-post</string>
<string name="button_share_by_sms">Dela via SMS</string> <string name="button_share_by_sms">Dela via SMS</string>
<string name="button_share_clipboard">Klippbord</string> <string name="button_share_clipboard">Klippbord</string>
<string name="button_share_contact">Kontakt</string> <string name="button_share_contact">Kontakt</string>
<string name="button_show_map">Visa karta</string> <string name="button_show_map">Visa karta</string>
<string name="button_sms">Skicka SMS</string> <string name="button_sms">Skicka SMS</string>
<string name="button_web_search">Webbsökning</string> <string name="button_web_search">Webbsök</string>
<string name="button_wifi">Anslut till nätverk</string> <string name="button_wifi">Anslut till nätverk</string>
<string name="contents_contact">Kontaktinfo</string> <string name="contents_contact">Kontaktinfo</string>
<string name="contents_email">Emailadress</string> <string name="contents_email">E-postadress</string>
<string name="contents_location">Geografiska koordinater</string> <string name="contents_location">Geografiska koordinater</string>
<string name="contents_phone">Telefonnummer</string> <string name="contents_phone">Telefonnummer</string>
<string name="contents_sms">SMS-adress</string> <string name="contents_sms">SMS-adress</string>
<string name="contents_text">Ren text</string> <string name="contents_text">Vanlig text</string>
<string name="history_clear_one_history_text">Rensa</string> <string name="history_clear_one_history_text">Rensa</string>
<string name="history_clear_text">Rensa historik</string> <string name="history_clear_text">Rensa historik</string>
<string name="history_email_title">Streckkodsläsarens historik</string> <string name="history_email_title">Historik inskannade streckkoder</string>
<string name="history_empty">Tomma</string> <string name="history_empty">Tom</string>
<string name="history_empty_detail">Ingen streckkod skannar har registrerats</string> <string name="history_empty_detail">Inga inskannade streckkoder har registrerats</string>
<string name="history_send">Skicka historik</string> <string name="history_send">Skicka historik</string>
<string name="history_title">Historik</string> <string name="history_title">Historik</string>
<string name="menu_encode_mecard">Använd MECARD</string> <string name="menu_encode_mecard">Använd MECARD</string>
@ -63,77 +63,77 @@
<string name="menu_history">Historik</string> <string name="menu_history">Historik</string>
<string name="menu_settings">Inställningar</string> <string name="menu_settings">Inställningar</string>
<string name="menu_share">Dela</string> <string name="menu_share">Dela</string>
<string name="msg_bulk_mode_scanned">Bulk-läge: streckkod skannas och sparas</string> <string name="msg_bulk_mode_scanned">Bulk-läge: streckkod har inskannats och sparats</string>
<string name="msg_camera_framework_bug">Tyvärr, Androidens kamera fick problem. Du kan behöva starta om enheten.</string> <string name="msg_camera_framework_bug">Det uppstod tyvärr ett fel med Androidkameran.</string>
<string name="msg_default_format">Format</string> <string name="msg_default_format">Format</string>
<string name="msg_default_meta">Metadata</string> <string name="msg_default_meta">Metadata</string>
<string name="msg_default_mms_subject">Hej</string> <string name="msg_default_mms_subject">Hej</string>
<string name="msg_default_status">Placera steckkoden inom sökarens rektangel för att läsa den.</string> <string name="msg_default_status">Placera steckkoden inom sökarens rektangel för att läsa den.</string>
<string name="msg_default_time">Tid</string> <string name="msg_default_time">Tid</string>
<string name="msg_default_type">Typ</string> <string name="msg_default_type">Typ</string>
<string name="msg_encode_contents_failed">Kunde inte skapa en streckkod från de givna uppgifterna.</string> <string name="msg_encode_contents_failed">Det gick inte att avkoda en streckkod från den erhållna informationen.</string>
<string name="msg_google_books">Google Books</string> <string name="msg_google_books">Google Books</string>
<string name="msg_google_product">Google Product Search</string> <string name="msg_google_product">Google Product Search</string>
<string name="msg_google_shopper_missing">Google Shopper är inte installerat</string> <string name="msg_google_shopper_missing">Google Shopper är inte installerad</string>
<string name="msg_install_google_shopper">Google Shopper kombinerar streckkodsskanning med priser, recensioner och mer utan att öppna webbläsaren. Vill du prova det?</string> <string name="msg_install_google_shopper">Google Shopper kombinerar inkodning av streckkoder med lokala priser och priser på nätet, recensioner och mycket mer utan att du behöver öppna webbläsaren. Vill du testa det?</string>
<string name="msg_intent_failed">Tyvärr, den önskade applikationen kunde inte startas. Streckkodens innehåll är kanske ogiltigt.</string> <string name="msg_intent_failed">Den begärda applikationen kunde tyvärr inte startas. Streckkodens innehåll kan vara ogiltigt.</string>
<string name="msg_redirect">Omdirigera</string> <string name="msg_redirect">Omdirigering</string>
<string name="msg_sbc_book_not_searchable">Tyvärr, denna bok är inte sökbar.</string> <string name="msg_sbc_book_not_searchable">Den här boken är tyvärr inte sökbar.</string>
<string name="msg_sbc_failed">Tyvärr, sökningen stötte på problem.</string> <string name="msg_sbc_failed">Det uppstod tyvärr ett fel vid sökning. </string>
<string name="msg_sbc_no_page_returned">Ingen sida mottagen</string> <string name="msg_sbc_no_page_returned">Ingen sida funnen</string>
<string name="msg_sbc_page">Sida</string> <string name="msg_sbc_page">Sida</string>
<string name="msg_sbc_results">Resultaten</string> <string name="msg_sbc_results">Resultat</string>
<string name="msg_sbc_searching_book">Söker bok\u2026</string> <string name="msg_sbc_searching_book">Söker bok\u2026</string>
<string name="msg_sbc_snippet_unavailable">Klippet finns inte</string> <string name="msg_sbc_snippet_unavailable">Utdrag ej tillgängligt</string>
<string name="msg_sbc_unknown_page">Okänd sida</string> <string name="msg_sbc_unknown_page">Okänd sida</string>
<string name="msg_share_explanation">Du kan dela data genom att visa en streckkod på din skärm och läsa den med en annan telefon.</string> <string name="msg_share_explanation">Du kan dela information genom att visa en streckkod på din skärm och sedan skanna in den med en annan telefon.</string>
<string name="msg_share_subject_line">Detta är vad en streckkod jag skannade innehöll</string> <string name="msg_share_subject_line">Här är innehållet i en streckkod som jag har skannat in</string>
<string name="msg_share_text">Eller skriv in text</string> <string name="msg_share_text">Eller skriv in text och tryck Enter</string>
<string name="msg_sure">Är du säker?</string> <string name="msg_sure">Är du säker?</string>
<string name="msg_unmount_usb">Tyvärr är SD-kortet inte tillgänglig.</string> <string name="msg_unmount_usb">SD-kortet är tyvärr inte tillgängligt.</string>
<string name="preferences_actions_title">När en streckkod hittats\u2026</string> <string name="preferences_actions_title">När en streckkod hittas\u2026</string>
<string name="preferences_auto_focus_title">Använd autofokus</string> <string name="preferences_auto_focus_title">Använd autofokus</string>
<string name="preferences_bulk_mode_summary">Skanna och spara många streckkoder kontinuerligt</string> <string name="preferences_bulk_mode_summary">Skanna och spara flera streckkoder samtidigt</string>
<string name="preferences_bulk_mode_title">Bulk skanningsläget</string> <string name="preferences_bulk_mode_title">Bulk-inskanningläge</string>
<string name="preferences_copy_to_clipboard_title">Kopiera till klippbordet</string> <string name="preferences_copy_to_clipboard_title">Kopiera till urklipp</string>
<string name="preferences_custom_product_search_summary" formatted="false">Ersättare: %s = innehåll, %f = format, %t = typ</string> <string name="preferences_custom_product_search_summary" formatted="false">Ersättningar: %s = innehåll, %f = format, %t = typ</string>
<string name="preferences_custom_product_search_title">Anpassad sök-URL</string> <string name="preferences_custom_product_search_title">Anpassad sökning URL</string>
<string name="preferences_decode_1D_title">1D steckkod</string> <string name="preferences_decode_1D_title">1D steckkod</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string> <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_QR_title">QR-koder</string> <string name="preferences_decode_QR_title">QR Code</string>
<string name="preferences_device_bug_workarounds_title">Device Bug Lösningar</string> <string name="preferences_device_bug_workarounds_title">Bugglösningar för enhet</string>
<string name="preferences_disable_continuous_focus_summary">Använd endast standard fokusläge</string> <string name="preferences_disable_continuous_focus_summary">Använd endast standardfokusläge</string>
<string name="preferences_disable_continuous_focus_title">Ingen kontinuerlig fokus</string> <string name="preferences_disable_continuous_focus_title">Ingen kontinuerlig fokus</string>
<string name="preferences_disable_exposure_title">Ingen exponering</string> <string name="preferences_disable_exposure_title">Ingen exponering</string>
<string name="preferences_front_light_summary">Aktivera ljuset framför, om det finns. Fungerar inte på alla telefoner.</string> <string name="preferences_front_light_summary">Förbättrar inskanning i svag belysing på vissa telefoner, men kan orsaka bländning. Ej tillgängligt på vissa enheter.</string>
<string name="preferences_front_light_title">Ljuset framför</string> <string name="preferences_front_light_title">Använd frontljus</string>
<string name="preferences_general_title">Grundläggande inställningar</string> <string name="preferences_general_title">Grundläggande inställningar</string>
<string name="preferences_name">Inställningar</string> <string name="preferences_name">Inställningar</string>
<string name="preferences_play_beep_title">Pip</string> <string name="preferences_play_beep_title">Ton</string>
<string name="preferences_remember_duplicates_summary">Lagra flera skanningar av samma streckkod i historiken</string> <string name="preferences_remember_duplicates_summary">Lagra flera inskanningar av samma streckkod i historik</string>
<string name="preferences_remember_duplicates_title">Kom ihåg dubbletter</string> <string name="preferences_remember_duplicates_title">Kom ihåg dubletter</string>
<string name="preferences_result_title">Resultatinställningar</string> <string name="preferences_result_title">Resultatinställningar</string>
<string name="preferences_scanning_title">När du skannar för streckkoder, avkoda\u2026</string> <string name="preferences_scanning_title">När du skannar in streckkoder, avkoda\u2026</string>
<string name="preferences_search_country">Sök land</string> <string name="preferences_search_country">Sök land</string>
<string name="preferences_supplemental_summary">Försök att hämta mer information om streckkodens innehåll</string> <string name="preferences_supplemental_summary">Försök hämta mer information om streckkodens innehåll</string>
<string name="preferences_supplemental_title">Hämta mer info</string> <string name="preferences_supplemental_title">Hämta mer info</string>
<string name="preferences_try_bsplus">Prova Barcode Scanner+</string> <string name="preferences_try_bsplus">Prova Barcode Scanner+</string>
<string name="preferences_try_bsplus_summary">Förstärkt med nya funktioner och gränssnitt</string> <string name="preferences_try_bsplus_summary">Förstärkt med nya funktioner och gränssnitt</string>
<string name="preferences_vibrate_title">Vibrera</string> <string name="preferences_vibrate_title">Vibrera</string>
<string name="result_address_book">Hittade kontaktinformation</string> <string name="result_address_book">Hittade kontaktinformation</string>
<string name="result_calendar">Hittade kalenderpost</string> <string name="result_calendar">Hittade kalenderhändelser</string>
<string name="result_email_address">Hittade emailadress</string> <string name="result_email_address">Hittade e-postadress</string>
<string name="result_geo">Hittade geografiska koordinater</string> <string name="result_geo">Hittade geografiska koordinater</string>
<string name="result_isbn">Hittade bok</string> <string name="result_isbn">Hittade bok</string>
<string name="result_product">Hittade produkt</string> <string name="result_product">Hittade produkt</string>
<string name="result_sms">Hittade SMS-adress</string> <string name="result_sms">Hittade SMS-adress</string>
<string name="result_tel">Hittade telefonnummer</string> <string name="result_tel">Hittade telefonnummer</string>
<string name="result_text">Hittade ren text</string> <string name="result_text">Hittade vanlig text</string>
<string name="result_uri">Hittade URL</string> <string name="result_uri">Hittade URL</string>
<string name="result_wifi">Hittade Wi-Fi inställningar</string> <string name="result_wifi">Hittade WLAN-konfiguration</string>
<string name="sbc_name">Google boksökning</string> <string name="sbc_name">Google Book Search</string>
<string name="share_name">Dela via streckkod</string> <string name="share_name">Dela via streckkod</string>
<string name="wifi_changing_network">Begära anslutning till nätverk\u2026</string> <string name="wifi_changing_network">Begär anslutning till nätverk\u2026</string>
<string name="wifi_ssid_label">Nätverksnamn</string> <string name="wifi_ssid_label">Nätverksnamn</string>
<string name="wifi_type_label">Typ</string> <string name="wifi_type_label">Typ</string>
</resources> </resources>

60
android/src/com/google/zxing/client/android/LocaleManager.java
View file

@ -37,19 +37,6 @@ public final class LocaleManager {
private static final String DEFAULT_COUNTRY = "US"; private static final String DEFAULT_COUNTRY = "US";
private static final String DEFAULT_LANGUAGE = "en"; private static final String DEFAULT_LANGUAGE = "en";
private static final String COUNTRY;
private static final String LANGUAGE;
static {
Locale locale = Locale.getDefault();
COUNTRY = locale == null ? DEFAULT_COUNTRY : locale.getCountry();
String language = locale == null ? DEFAULT_LANGUAGE : locale.getLanguage();
// Special case Chinese
if (Locale.SIMPLIFIED_CHINESE.getLanguage().equals(language)) {
language += "-r" + COUNTRY;
}
LANGUAGE = language;
}
/** /**
* Locales (well, countries) where Google web search is available. * Locales (well, countries) where Google web search is available.
* These should be kept in sync with our translations. * These should be kept in sync with our translations.
@ -142,19 +129,6 @@ public final class LocaleManager {
return doGetTLD(GOOGLE_BOOK_SEARCH_COUNTRY_TLD, context); return doGetTLD(GOOGLE_BOOK_SEARCH_COUNTRY_TLD, context);
} }
private static String doGetTLD(Map<String,String> map, Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
String countryOverride = prefs.getString(PreferencesActivity.KEY_SEARCH_COUNTRY, null);
if (countryOverride != null && countryOverride.length() > 0 && !"-".equals(countryOverride)) {
String tld = map.get(countryOverride);
if (tld != null) {
return tld;
}
}
String tld = map.get(COUNTRY);
return tld == null ? DEFAULT_TLD : tld;
}
/** /**
* Does a given URL point to Google Book Search, regardless of domain. * Does a given URL point to Google Book Search, regardless of domain.
* *
@ -165,8 +139,40 @@ public final class LocaleManager {
return url.startsWith("http://google.com/books") || url.startsWith("http://books.google."); return url.startsWith("http://google.com/books") || url.startsWith("http://books.google.");
} }
private static String getSystemCountry() {
Locale locale = Locale.getDefault();
return locale == null ? DEFAULT_COUNTRY : locale.getCountry();
}
private static String getSystemLanguage() {
Locale locale = Locale.getDefault();
if (locale == null) {
return DEFAULT_LANGUAGE;
}
String language = locale.getLanguage();
// Special case Chinese
if (Locale.SIMPLIFIED_CHINESE.getLanguage().equals(language)) {
return language + "-r" + getSystemCountry();
}
return language;
}
public static String getTranslatedAssetLanguage() { public static String getTranslatedAssetLanguage() {
return TRANSLATED_HELP_ASSET_LANGUAGES.contains(LANGUAGE) ? LANGUAGE : DEFAULT_LANGUAGE; String language = getSystemLanguage();
return TRANSLATED_HELP_ASSET_LANGUAGES.contains(language) ? language : DEFAULT_LANGUAGE;
}
private static String doGetTLD(Map<String,String> map, Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
String countryOverride = prefs.getString(PreferencesActivity.KEY_SEARCH_COUNTRY, null);
if (countryOverride != null && countryOverride.length() > 0 && !"-".equals(countryOverride)) {
String tld = map.get(countryOverride);
if (tld != null) {
return tld;
}
}
String tld = map.get(getSystemCountry());
return tld == null ? DEFAULT_TLD : tld;
} }
} }