X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/51004dcb01e06fef634b61be77ed73dd61cb6db9..249c4c5ea9376c24572daf9c2effa7484a282f14:/icuSources/data/locales/en_NZ.txt diff --git a/icuSources/data/locales/en_NZ.txt b/icuSources/data/locales/en_NZ.txt index ba03f55c..19d72d03 100644 --- a/icuSources/data/locales/en_NZ.txt +++ b/icuSources/data/locales/en_NZ.txt @@ -1,14 +1,8 @@ -// *************************************************************************** -// * -// * Copyright (C) 2013 International Business Machines -// * Corporation and others. All Rights Reserved. -// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter -// * Source File: /common/main/en_NZ.xml -// * -// *************************************************************************** +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html#License en_NZ{ - %%Parent{"en_GB"} - Version{"2.0.82.45"} + %%Parent{"en_001"} + Version{"2.1.38.73"} calendar{ generic{ DateTimePatterns{ @@ -19,90 +13,51 @@ en_NZ{ "EEEE, d MMMM y G", "d MMMM y G", "d/MM/y G", - "d/MM/yy GGGGG", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "d/MM/y GGGGG", + "{1}, {0}", + "{1} 'at' {0}", + "{1} 'at' {0}", + "{1} 'at' {0}", + "{1}, {0}", } availableFormats{ - MMMEd{"E, d MMM"} + H{"HH"} + Hm{"HH:mm"} + Hms{"HH:mm:ss"} Md{"d/M"} - yMd{"d/MM/y"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + ms{"mm:ss"} + yyyyMd{"d/MM/y G"} } intervalFormats{ - M{ - M{"M-M"} - } MEd{ - M{"E, d/MM - E, d/MM"} - d{"E, d/MM - E, d/MM"} - } - MMM{ - M{"MMM-MMM"} + M{"E, d/MM – E, d/MM"} + d{"E, d/MM – E, d/MM"} } MMMEd{ - M{"E, d MMM - E, d MMM"} - d{"E, d - E, d MMM"} - } - MMMd{ - M{"d MMM - d MMM"} - d{"d-d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d – E, d MMM"} } Md{ - M{"d/MM - d/MM"} - d{"d/MM - d/MM"} - } - d{ - d{"d-d"} - } - fallback{"{0} - {1}"} - h{ - a{"h a - h a"} - h{"h-h a"} - } - hm{ - a{"h:mm a - h:mm a"} - h{"h:mm-h:mm a"} - m{"h:mm-h:mm a"} - } - hmv{ - a{"h:mm a - h:mm a v"} - h{"h:mm-h:mm a v"} - m{"h:mm-h:mm a v"} - } - hv{ - a{"h a - h a v"} - h{"h-h a v"} + M{"d/MM – d/MM"} + d{"d/MM – d/MM"} } + fallback{"{0} – {1}"} yM{ - M{"MM/y - MM/y"} - y{"MM/y - MM/y"} + M{"MM/y – MM/y G"} + y{"MM/y – MM/y G"} } yMEd{ - M{"E, d/MM/y - E, d/MM/y"} - d{"E, d/MM/y - E, d/MM/y"} - y{"E, d/MM/y - E, d/MM/y"} - } - yMMM{ - M{"MMM-MMM y"} - y{"MMM y - MMM y"} - } - yMMMEd{ - M{"E, d MMM - E, d MMM y"} - d{"E, d - E, d MMM y"} - y{"E, d MMM y - E, d MMM y"} - } - yMMMd{ - M{"d MMM - d MMM y"} - d{"d-d MMM y"} - y{"d MMM y - d MMM y"} + M{"E, d/MM/y – E, d/MM/y G"} + d{"E, d/MM/y – E, d/MM/y G"} + y{"E, d/MM/y – E, d/MM/y G"} } yMd{ - M{"d/MM/y - d/MM/y"} - d{"d/MM/y - d/MM/y"} - y{"d/MM/y - d/MM/y"} + M{"d/MM/y – d/MM/y G"} + d{"d/MM/y – d/MM/y G"} + y{"d/MM/y – d/MM/y G"} } } } @@ -116,89 +71,42 @@ en_NZ{ "d MMMM y", "d/MM/y", "d/MM/yy", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", - "{1} {0}", + "{1}, {0}", + "{1} 'at' {0}", + "{1} 'at' {0}", + "{1} 'at' {0}", + "{1}, {0}", } availableFormats{ - MMMEd{"E, d MMM"} Md{"d/M"} yMd{"d/MM/y"} + yw{ + one{"'week' w 'of' y"} + other{"'week' w 'of' y"} + } } intervalFormats{ - M{ - M{"M-M"} - } MEd{ - M{"E, d/MM - E, d/MM"} - d{"E, d/MM - E, d/MM"} - } - MMM{ - M{"MMM-MMM"} + M{"E, d/MM – E, d/MM"} + d{"E, d/MM – E, d/MM"} } MMMEd{ - M{"E, d MMM - E, d MMM"} - d{"E, d - E, d MMM"} - } - MMMd{ - M{"d MMM - d MMM"} - d{"d-d MMM"} + M{"E, d MMM – E, d MMM"} + d{"E, d – E, d MMM"} } Md{ - M{"d/MM - d/MM"} - d{"d/MM - d/MM"} - } - d{ - d{"d-d"} - } - fallback{"{0} - {1}"} - h{ - a{"h a - h a"} - h{"h-h a"} - } - hm{ - a{"h:mm a - h:mm a"} - h{"h:mm-h:mm a"} - m{"h:mm-h:mm a"} - } - hmv{ - a{"h:mm a - h:mm a v"} - h{"h:mm-h:mm a v"} - m{"h:mm-h:mm a v"} - } - hv{ - a{"h a - h a v"} - h{"h-h a v"} - } - yM{ - M{"MM/y - MM/y"} - y{"MM/y - MM/y"} + M{"d/MM – d/MM"} + d{"d/MM – d/MM"} } yMEd{ - M{"E, d/MM/y - E, d/MM/y"} - d{"E, d/MM/y - E, d/MM/y"} - y{"E, d/MM/y - E, d/MM/y"} - } - yMMM{ - M{"MMM-MMM y"} - y{"MMM y - MMM y"} - } - yMMMEd{ - M{"E, d MMM - E, d MMM y"} - d{"E, d - E, d MMM y"} - y{"E, d MMM y - E, d MMM y"} - } - yMMMd{ - M{"d MMM - d MMM y"} - d{"d-d MMM y"} - y{"d MMM y - d MMM y"} + M{"E, d/MM/y – E, d/MM/y"} + d{"E, d/MM/y – E, d/MM/y"} + y{"E, d/MM/y – E, d/MM/y"} } yMd{ - M{"d/MM/y - d/MM/y"} - d{"d/MM/y - d/MM/y"} - y{"d/MM/y - d/MM/y"} + M{"d/MM/y – d/MM/y"} + d{"d/MM/y – d/MM/y"} + y{"d/MM/y – d/MM/y"} } } }