Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a698e6a6 authored by Ben Murdoch's avatar Ben Murdoch Committed by Android (Google) Code Review
Browse files

Merge changes I829b5d24,I521c0989 

* changes:
  Add missing auto-fill strings.
  Merge Chromium at r12.0.742.93: Update auto-fill regular expressions.
parents 622c03e6 06da76bd

core/java/android/webkit/L10nUtils.java

+12 −1
Original line number Diff line number Diff line
@@ -75,7 +75,18 @@ public class L10nUtils { 
        com.android.internal.R.string.autofill_area_code_notext_re,         // IDS_AUTOFILL_AREA_CODE_NOTEXT_RE

        com.android.internal.R.string.autofill_phone_prefix_separator_re,   // IDS_AUTOFILL_PHONE_PREFIX_SEPARATOR_RE

        com.android.internal.R.string.autofill_phone_suffix_separator_re,   // IDS_AUTOFILL_PHONE_SUFFIX_SEPARATOR_RE

        com.android.internal.R.string.credit_card_number_preview_format     // IDS_CREDIT_CARD_NUMBER_PREVIEW_FORMAT

        com.android.internal.R.string.autofill_province,                    // IDS_AUTOFILL_DIALOG_PROVINCE

        com.android.internal.R.string.autofill_postal_code,                 // IDS_AUTOFILL_DIALOG_POSTAL_CODE

        com.android.internal.R.string.autofill_state,                       // IDS_AUTOFILL_DIALOG_STATE

        com.android.internal.R.string.autofill_zip_code,                    // IDS_AUTOFILL_DIALOG_ZIP_CODE

        com.android.internal.R.string.autofill_county,                      // IDS_AUTOFILL_DIALOG_COUNTY

        com.android.internal.R.string.autofill_island,                      // IDS_AUTOFILL_DIALOG_ISLAND

        com.android.internal.R.string.autofill_district,                    // IDS_AUTOFILL_DIALOG_DISTRICT

        com.android.internal.R.string.autofill_department,                  // IDS_AUTOFILL_DIALOG_DEPARTMENT

        com.android.internal.R.string.autofill_prefecture,                  // IDS_AUTOFILL_DIALOG_PREFECTURE

        com.android.internal.R.string.autofill_parish,                      // IDS_AUTOFILL_DIALOG_PARISH

        com.android.internal.R.string.autofill_area,                        // IDS_AUTOFILL_DIALOG_AREA

        com.android.internal.R.string.autofill_emirate                      // IDS_AUTOFILL_DIALOG_EMIRATE

    };



    private static Context mApplicationContext;

core/res/res/values/strings.xml

+40 −8
Original line number Diff line number Diff line
@@ -2038,13 +2038,13 @@ 
    <string name="autofill_phone_re">phone<!-- de-DE -->|telefonnummer<!-- es -->|telefono|teléfono<!-- fr-FR -->|telfixe<!-- ja-JP -->|電話<!-- pt-BR, pt-PT -->|telefone|telemovel<!-- ru -->|телефон<!-- zh-CN -->|电话</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_area_code_re">area code</string>

    <string name="autofill_area_code_re">area.*code|acode|area</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_phone_prefix_re">^-$|\\)$|prefix<!-- fr-FR -->|preselection<!-- pt-BR, pt-PT -->|ddd</string>

    <string name="autofill_phone_prefix_re">prefix<!-- fr-FR -->|preselection<!-- pt-BR, pt-PT -->|ddd</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_phone_suffix_re">^-$|suffix</string>

    <string name="autofill_phone_suffix_re">suffix</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_phone_extension_re">ext<!-- pt-BR, pt-PT -->|ramal</string>
@@ -2077,17 +2077,49 @@ 
    <string name="autofill_country_code_re">country.*code|ccode|_cc</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_area_code_notext_re">^\($</string>

    <string name="autofill_area_code_notext_re">^\\($</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_phone_prefix_separator_re">^-$|^\)$</string>

    <string name="autofill_phone_prefix_separator_re">^-$|^\\)$</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_phone_suffix_separator_re">^-$</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <!-- Ex: ************1234 -->

    <string name="credit_card_number_preview_format">$1</string>

    <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->

    <string name="autofill_province">Province</string>



    <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->

    <string name="autofill_postal_code">Postal code</string>



    <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->

    <string name="autofill_state">State</string>



    <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->

    <string name="autofill_zip_code">ZIP code</string>



    <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->

    <string name="autofill_county">County</string>



    <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->

    <string name="autofill_island">Island</string>



    <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->

    <string name="autofill_district">District</string>



    <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->

    <string name="autofill_department">Department</string>



    <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->

    <string name="autofill_prefecture">Prefecture</string>



    <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->

    <string name="autofill_parish">Parish</string>



    <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->

    <string name="autofill_area">Area</string>



    <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->

    <string name="autofill_emirate">Emirate</string>



    <!-- Title of an application permission, listed so the user can choose whether

        they want to allow the application to do this. -->