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

Commit daaeafff authored by Michael Bestas's avatar Michael Bestas Committed by Steve Kondik
Browse files

Fix translatability of External media format message 

Change-Id: I10c76ff40012f982fd7b75ac383ad29a6e698179
parent 308f2970

core/java/com/android/internal/app/ExternalMediaFormatActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class ExternalMediaFormatActivity extends AlertActivity implements Dialog 
        final AlertController.AlertParams p = mAlertParams;

        p.mTitle = getString(com.android.internal.R.string.extmedia_format_title);

        p.mMessage = String.format(

                getString(com.android.internal.R.string.extmedia_format_message),

                getString(com.android.internal.R.string.extmedia_format_message_cm),

                mStorageVolume.getPath());

        p.mPositiveButtonText = getString(com.android.internal.R.string.extmedia_format_button_format);

        p.mPositiveButtonListener = this;

core/res/res/values/cm_strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -270,4 +270,8 @@ 
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_preventpower">Allows an app to override the power key.</string>



    <!-- See EXTMEDIA_FORMAT.   This is the message. [CHAR LIMIT=NONE] -->

    <string name="extmedia_format_message_cm" product="nosdcard">All data on your USB storage (under path \'%1$s\') will be erased. This action can\'t be reversed!</string>

    <!-- See EXTMEDIA_FORMAT.   This is the message. -->

    <string name="extmedia_format_message_cm" product="default">All data on your card (under path \'%1$s\') will be erased. This action can\'t be reversed!</string>

</resources>

core/res/res/values/cm_symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -252,4 +252,5 @@ 
    <java-symbol type="string" name="storage_usb" />

    <java-symbol type="string" name="storage_uicc" />

    <java-symbol type="bool" name="config_batterySdCardAccessibility" />

    <java-symbol type="string" name="extmedia_format_message_cm" />

</resources>

core/res/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -3995,9 +3995,9 @@ 
    <!-- See EXTMEDIA_FORMAT.  EXTMEDIA_FORMAT_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to format the SD card.  This is the title. -->

    <string name="extmedia_format_title" product="default">Format SD card?</string>

    <!-- See EXTMEDIA_FORMAT.   This is the message. [CHAR LIMIT=NONE] -->

    <string name="extmedia_format_message" product="nosdcard">All files stored in your USB storage (under path \'%1$s\') will be erased. This action can\'t be reversed!</string>

    <string name="extmedia_format_message" product="nosdcard">All files stored in your USB storage will be erased. This action can\'t be reversed!</string>

    <!-- See EXTMEDIA_FORMAT.   This is the message. -->

    <string name="extmedia_format_message" product="default">All data on your card (under path \'%1$s\') will be erased. This action can\'t be reversed!</string>

    <string name="extmedia_format_message" product="default">All data on your card will be lost.</string>

    <!-- See EXTMEDIA_FORMAT.    This is the button text to format the sd card. -->

    <string name="extmedia_format_button_format">Format</string>