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

Commit 62daa729 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android Git Automerger
Browse files

am aacced6b: Provide localized strings for <input> labels. 

Merge commit 'aacced6b' into eclair-mr2-plus-aosp

* commit 'aacced6b':
  Provide localized strings for <input> labels.
parents 5a374f94 aacced6b

core/java/android/webkit/BrowserFrame.java

+16 −1
Original line number Diff line number Diff line
@@ -782,10 +782,13 @@ class BrowserFrame extends Handler { 
        return mSettings.getUserAgentString();

    }



    // these ids need to be in sync with enum RAW_RES_ID in WebFrame

    // These ids need to be in sync with enum rawResId in PlatformBridge.h

    private static final int NODOMAIN = 1;

    private static final int LOADERROR = 2;

    private static final int DRAWABLEDIR = 3;

    private static final int FILE_UPLOAD_LABEL = 4;

    private static final int RESET_LABEL = 5;

    private static final int SUBMIT_LABEL = 6;



    String getRawResFilename(int id) {

        int resid;
@@ -803,6 +806,18 @@ class BrowserFrame extends Handler { 
                resid = com.android.internal.R.drawable.btn_check_off;

                break;



            case FILE_UPLOAD_LABEL:

                return mContext.getResources().getString(

                        com.android.internal.R.string.upload_file);



            case RESET_LABEL:

                return mContext.getResources().getString(

                        com.android.internal.R.string.reset);



            case SUBMIT_LABEL:

                return mContext.getResources().getString(

                        com.android.internal.R.string.submit);



            default:

                Log.e(LOGTAG, "getRawResFilename got incompatible resource ID");

                return "";

core/res/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -2097,6 +2097,12 @@ 
    <string name="l2tp_vpn_description">Layer 2 Tunneling Protocol</string>

    <string name="l2tp_ipsec_psk_vpn_description">Pre-shared key based L2TP/IPSec VPN</string>

    <string name="l2tp_ipsec_crt_vpn_description">Certificate based L2TP/IPSec VPN</string>



    <!-- Localized strings for WebView -->

    <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->

    <string name="upload_file">Choose file</string>

    <!-- Label for <input type="reset"> button in html -->

    <string name="reset">Reset</string>

    <!-- Label for <input type="submit"> button in html -->

    <string name="submit">Submit</string>

</resources>