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

Commit 48fa06f3 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales" 

* commit 'f6a67139':
  Correct Date format for el_GR, sv_SE and tr_TR locales
parents b87e6138 f6a67139

core/java/android/text/format/DateFormat.java

100644 → 100755
+3 −7
Original line number Diff line number Diff line
@@ -280,13 +280,9 @@ public class DateFormat { 
            }

        }



        /*

         * The setting is not set; use the default.

         * We use a resource string here instead of just DateFormat.SHORT

         * so that we get a four-digit year instead a two-digit year.

         */

        value = context.getString(R.string.numeric_date_format);

        return value;

        // The setting is not set; use the locale's default.

        LocaleData d = LocaleData.get(context.getResources().getConfiguration().locale);

        return d.shortDateFormat4;

    }



    /**

core/res/res/values-af/donottranslate-cldr.xml

100644 → 100755
+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
    <string name="hour_minute_ampm">%-l:%M %p</string>

    <string name="hour_minute_cap_ampm">%-l:%M %^p</string>

    <string name="numeric_date">%Y/%m/%d</string>

    <string name="numeric_date_format">yyyy/MM/dd</string>

    <string name="numeric_date_template">"%s/%s/%s"</string>

    <string name="month_day_year">%d %B %Y</string>

    <string name="time_of_day">%-l:%M:%S %p</string>

core/res/res/values-am/donottranslate-cldr.xml

100644 → 100755
+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
    <string name="hour_minute_ampm">%-l:%M %p</string>

    <string name="hour_minute_cap_ampm">%-l:%M %p</string>

    <string name="numeric_date">%d/%m/%Y</string>

    <string name="numeric_date_format">dd/MM/yyyy</string>

    <string name="numeric_date_template">"%s/%s/%s"</string>

    <string name="month_day_year">%d %B %Y</string>

    <string name="time_of_day">%-l:%M:%S %p</string>

core/res/res/values-ar-rEG/donottranslate-cldr.xml

100644 → 100755
+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
    <string name="hour_minute_ampm">%-l:%M %p</string>

    <string name="hour_minute_cap_ampm">%-l:%M %p</string>

    <string name="numeric_date">%-e‏/%-m‏/%Y</string>

    <string name="numeric_date_format">d‏/M‏/yyyy</string>

    <string name="numeric_date_template">"%s‏/%s‏/%s"</string>

    <string name="month_day_year">%-e %B، %Y</string>

    <string name="time_of_day">%-l:%M:%S %p</string>

core/res/res/values-ar/donottranslate-cldr.xml

100644 → 100755
+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
    <string name="hour_minute_ampm">%-l:%M %p</string>

    <string name="hour_minute_cap_ampm">%-l:%M %p</string>

    <string name="numeric_date">%-e‏/%-m‏/%Y</string>

    <string name="numeric_date_format">d‏/M‏/yyyy</string>

    <string name="numeric_date_template">"%s‏/%s‏/%s"</string>

    <string name="month_day_year">%-e %B، %Y</string>

    <string name="time_of_day">%-l:%M:%S %p</string>