[corlib] Update en-au pm/am designators

diff --git a/mono/metadata/culture-info-tables.h b/mono/metadata/culture-info-tables.h
index b8a12b00157382544a6dc3c1a8f938f9f928e5dd..b9a55a7b50cff23d8ab34977617cedb572f9ebef 100644 (file)
--- a/mono/metadata/culture-info-tables.h
+++ b/mono/metadata/culture-info-tables.h
@@ -209,7 +209,7 @@ static const DateTimeFormatEntry datetime_format_entries [] = {
        {3943, 243, 23, 35, 44, 55, 0, 0, {0, 0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 0}, {63, 72, 79, 99, 119, 143, 167, 174, 185, 196, 205, 223, 0}, {63, 72, 79, 99, 119, 143, 167, 174, 185, 196, 205, 223, 0}, {63, 72, 79, 99, 119, 143, 167, 174, 185, 196, 205, 223, 0}, {63, 72, 79, 99, 119, 143, 167, 174, 185, 196, 205, 223, 0}, 0, 6, 239, 241, {243,14,1210,0,0,0,0,0,0,0,0,0,0,0},{3943,254,0,0,0,0,0,0},{35,274,0,0,0,0,0,0,0,0,0,0},{23,280,0,0,0,0,0,0,0}},
        {1344, 2927, 323, 331, 1375, 1391, 1404, 1411, {1418, 1428, 1438, 1448, 1458, 1468, 1478}, {34903, 34910, 34917, 34924, 34931, 34938, 34945}, {1537, 1541, 1545, 1549, 1553, 1557, 1561}, {1655, 1660, 1665, 1670, 1675, 1680, 1685, 1690, 1695, 1700, 1706, 1712, 0}, {1655, 1660, 1665, 1670, 1675, 1680, 1685, 1690, 1695, 1700, 1706, 1712, 0}, {1655, 1660, 1665, 1670, 1675, 1680, 1685, 1690, 1695, 1700, 1706, 1712, 0}, {1655, 1660, 1665, 1670, 1675, 1680, 1685, 1690, 1695, 1700, 1706, 1712, 0}, 0, 0, 239, 241, {2927,1229,14,1765,1779,1366,1736,1210,0,0,0,0,0,0},{1344,6759,0,0,0,0,0,0},{331,274,0,0,0,0,0,0,0,0,0,0},{323,280,0,0,0,0,0,0,0}},
        {35709, 2587, 280, 274, 1906, 1916, 2598, 2604, {2611, 2619, 2626, 2635, 2644, 2655, 2663}, {2671, 2674, 2677, 2680, 2683, 2686, 2689}, {2018, 2403, 2692, 2403, 2692, 2409, 2018}, {35729, 2701, 2709, 2715, 2721, 2725, 2730, 2735, 2742, 2752, 2760, 2769, 0}, {35729, 2701, 2709, 2715, 2721, 2725, 2730, 2735, 2742, 2752, 2760, 2769, 0}, {35737, 2782, 2786, 2791, 2721, 2795, 2799, 2803, 2807, 2811, 2815, 2819, 0}, {35737, 2782, 2786, 2791, 2721, 2795, 2799, 2803, 2807, 2811, 2815, 2819, 0}, 2, 1, 754, 241, {2587,1245,35742,1210,0,0,0,0,0,0,0,0,0,0},{35709,35752,35764,10067,0,0,0,0},{274,331,35774,35786,8237,8242,8229,0,0,0,0,0},{280,323,2887,2873,2902,0,0,0,0}},
-       {2909, 14812, 2936, 2947, 1906, 3712, 7992, 21969, {3719, 3726, 3733, 3741, 3751, 3760, 3767}, {3776, 3780, 3784, 3788, 3792, 3796, 3800}, {2018, 2403, 2405, 3804, 2405, 2409, 2018}, {3806, 3814, 3823, 2715, 3829, 3833, 3838, 2735, 2742, 3843, 2760, 3851, 0}, {3806, 3814, 3823, 2715, 3829, 3833, 3838, 2735, 2742, 3843, 2760, 3851, 0}, {2778, 2782, 3860, 2791, 3829, 2795, 2799, 2803, 2807, 3864, 2815, 3868, 0}, {2778, 2782, 3860, 2791, 3829, 2795, 2799, 2803, 2807, 3864, 2815, 3868, 0}, 0, 0, 239, 241, {14812,1221,1229,2927,14,243,3899,5616,1210,1779,1736,0,0,0},{2909,3672,0,0,0,0,0,0},{2947,331,274,0,0,0,0,0,0,0,0,0},{2936,323,280,0,0,0,0,0,0}},
+       {2909, 14812, 2936, 2947, 1906, 3712, 1924, 1927, {3719, 3726, 3733, 3741, 3751, 3760, 3767}, {3776, 3780, 3784, 3788, 3792, 3796, 3800}, {2018, 2403, 2405, 3804, 2405, 2409, 2018}, {3806, 3814, 3823, 2715, 3829, 3833, 3838, 2735, 2742, 3843, 2760, 3851, 0}, {3806, 3814, 3823, 2715, 3829, 3833, 3838, 2735, 2742, 3843, 2760, 3851, 0}, {2778, 2782, 3860, 2791, 3829, 2795, 2799, 2803, 2807, 3864, 2815, 3868, 0}, {2778, 2782, 3860, 2791, 3829, 2795, 2799, 2803, 2807, 3864, 2815, 3868, 0}, 0, 0, 239, 241, {14812,1221,1229,2927,14,243,3899,5616,1210,1779,1736,0,0,0},{2909,3672,0,0,0,0,0,0},{2947,331,274,0,0,0,0,0,0,0,0,0},{2936,323,280,0,0,0,0,0,0}},
        {3957, 243, 323, 331, 947, 3985, 962, 968, {3997, 4005, 4011, 4018, 4029, 4036, 4044}, {4052, 4057, 4062, 4067, 4073, 4078, 4083}, {2692, 2411, 2403, 2403, 4089, 4091, 2018}, {4093, 4099, 4107, 4113, 4119, 4124, 4130, 4136, 4143, 4154, 4162, 4172, 0}, {4182, 4188, 4196, 1102, 4202, 4207, 4213, 4219, 4226, 1140, 4237, 4247, 0}, {4257, 4262, 4062, 4267, 4272, 4277, 4282, 4287, 4292, 4298, 4303, 4308, 0}, {4257, 4262, 4062, 4267, 4272, 4277, 4282, 4287, 4292, 4298, 4303, 4308, 0}, 2, 1, 239, 241, {243,14,1221,1229,1236,1245,1210,2823,0,0,0,0,0,0},{4313,4342,4369,0,0,0,0,0},{331,274,1312,0,0,0,0,0,0,0,0,0},{323,280,1324,0,0,0,0,0,0}},
        {3672, 1210, 280, 274, 44, 352, 1924, 1927, {4874, 4883, 4889, 4895, 4904, 4910, 4919}, {4926, 4931, 4936, 4941, 4946, 4951, 4956}, {2692, 2411, 2403, 2403, 4089, 4091, 2018}, {4961, 4969, 4978, 4983, 4989, 4993, 4998, 5006, 5012, 5022, 1148, 5030, 0}, {4961, 4969, 4978, 4983, 4989, 4993, 4998, 5006, 5012, 5022, 1148, 5030, 0}, {5040, 5046, 4978, 5053, 4989, 4993, 5058, 5006, 5064, 1195, 1200, 5070, 0}, {5040, 5046, 4978, 5053, 4989, 4993, 5058, 5006, 5064, 1195, 1200, 5070, 0}, 0, 0, 2541, 241, {1210,5993,1236,6259,14,3660,0,0,0,0,0,0,0,0},{3672,10067,0,0,0,0,0,0},{274,331,5085,5091,5101,0,0,0,0,0,0,0},{280,323,0,0,0,0,0,0,0}},
        {35797, 2261, 323, 331, 1906, 18382, 18395, 18400, {35823, 35831, 35839, 35847, 35859, 35868, 35880}, {18485, 18490, 18495, 18500, 18505, 18510, 18515}, {2018, 2403, 2692, 6354, 2692, 16359, 2411}, {18520, 18537, 18550, 18564, 18577, 18590, 18603, 18617, 18629, 18643, 18657, 18671, 0}, {18520, 18537, 18550, 18564, 18577, 18590, 18603, 18617, 18629, 18643, 18657, 18671, 0}, {35891, 35902, 35909, 35917, 35924, 35931, 35938, 35946, 35952, 35960, 35968, 35976, 0}, {35891, 35902, 35909, 35917, 35924, 35931, 35938, 35946, 35952, 35960, 35968, 35976, 0}, 2, 1, 754, 241, {2261,2587,2843,1210,0,0,0,0,0,0,0,0,0,0},{18748,0,0,0,0,0,0,0},{331,274,0,0,0,0,0,0,0,0,0,0},{323,280,0,0,0,0,0,0,0}},

diff --git a/tools/locale-builder/Driver.cs b/tools/locale-builder/Driver.cs
index 8162cc6d99aeb1ba6a6a20d17aa8679fca153d6c..4b8ae34994a3cd35f4b465a5cc11824cddb3f833 100644 (file)
--- a/tools/locale-builder/Driver.cs
+++ b/tools/locale-builder/Driver.cs
@@ -1073,17 +1073,30 @@ namespace Mono.Tools.LocaleBuilder
                                        // Apply global rule first <alias source="locale" path="../dayPeriodWidth[@type='wide']"/>
                                        el = node.SelectSingleNode ("dayPeriods/dayPeriodContext/dayPeriodWidth[@type='wide']/dayPeriod[@type='am']");
 
-                               if (el != null)
-                                       df.AMDesignator = el.InnerText;
+                               switch (ci.Name) {
+                               case "en-AU":
+                                       df.AMDesignator = "AM";
+                                       break;
+                               default:
+                                       if (el != null)
+                                               df.AMDesignator = el.InnerText;
+                                       break;
+                               }
 
                                el = node.SelectSingleNode ("dayPeriods/dayPeriodContext/dayPeriodWidth[@type='abbreviated']/dayPeriod[@type='pm']");
                                if (el == null)
                                        // Apply global rule first <alias source="locale" path="../dayPeriodWidth[@type='wide']"/>
                                        el = node.SelectSingleNode ("dayPeriods/dayPeriodContext/dayPeriodWidth[@type='wide']/dayPeriod[@type='pm']");
 
-                               // No data
-                               if (el != null)
-                                       df.PMDesignator = el.InnerText;
+                               switch (ci.Name) {
+                               case "en-AU":
+                                       df.PMDesignator = "PM";
+                                       break;
+                               default:
+                                       if (el != null)
+                                               df.PMDesignator = el.InnerText;
+                                       break;
+                               }
                        }
 
                        var ni = ci.NumberFormatEntry;