twitter_cldr 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c98dcf19490f99d16be160956f9398cecd73f9ae
-  data.tar.gz: a2f9f7696e6a7faf40ab9c7861b1ec26f35a8177
+  metadata.gz: cc6c6c92fe5dec780cafeb5fd8930add773c46d7
+  data.tar.gz: a7f4a52136cacf6e26d1b9bf0057dd19f9b852a8
 SHA512:
-  metadata.gz: 3a74e79f927faeef96b86d119a0596e7345e3be9c9dd7f16adf32f55e68184e66ab7377fb9bb42471204ca4954c6ac28d4eaccb1af5bf078dd1ad9723da05b17
-  data.tar.gz: f176da6b6eac7b64ac012f8e9cae2566ef4525192716612668d24ecb4a0ba1a9cfdf3f50c75e664d7c2f98188ef65578157f96895548e0dc14b151162e217cbf
+  metadata.gz: 1192dfcd1168d55d7c30c586a8ece42f49d5d854e99a4ccb35e167c4cf7aa12c2b0c6040db5b08375acbc0532afbdad1888a62fa7a2c1ed57ae301706cbb8366
+  data.tar.gz: cc0b77e683c92a52af0ecb76a77192e93bb1157e1c428651822f3b713b844abe1ada7aa21b635663da67ac68606bdb88a15e7662594fff09a55c6b74c5c27736

data/Gemfile

@@ -4,21 +4,17 @@ gemspec
 
 group :development, :test do
   gem 'rake'
-
-  gem 'pry'
   gem 'pry-nav'
-
   gem 'ruby-prof' unless RUBY_PLATFORM == 'java'
-
   gem 'regexp_parser', '~> 0.1'
 end
 
 group :development do
   gem 'nokogiri', "~> 1.5.9"
 
-  gem 'ruby-cldr', github: 'svenfuchs/ruby-cldr'
+  gem 'ruby-cldr', github: 'camertron/ruby-cldr', branch: 'fields'
   gem 'i18n', '~> 0.6.11'
-  gem 'cldr-plurals', '~> 1.0.0'
+  gem 'cldr-plurals', '~> 1.0'
 
   gem 'rest-client', '~> 1.8'
 end
@@ -28,6 +24,7 @@ group :test do
   gem 'rr',    '~> 1.1.2'
 
   gem 'rubyzip'
+  gem 'term-ansicolor', '~> 1.3.0'        # 1.4 breaks ruby 1.9 support
   gem 'coveralls', require: false
   gem 'tins', '~> 1.6.0', require: false  # 1.7 breaks ruby 1.9 support
 

data/History.txt

@@ -1,3 +1,6 @@
+== 3.6.0
+* Override South Korean postal code format, which changed recently.
+
 == 3.5.0
 * Only add JSON as a dependency if running under Ruby < 2 (#191).
 

data/README.md

@@ -268,29 +268,29 @@ In addition to formatting full dates and times, TwitterCLDR supports relative ti
 (DateTime.now - 1).localize.ago.to_s        # "1 day ago"
 (DateTime.now - 0.5).localize.ago.to_s      # "12 hours ago"  (i.e. half a day)
 
-(DateTime.now + 1).localize.until.to_s      # "In 1 day"
-(DateTime.now + 0.5).localize.until.to_s    # "In 12 hours"
+(DateTime.now + 1).localize.until.to_s      # "in 1 day"
+(DateTime.now + 0.5).localize.until.to_s    # "in 12 hours"
 ```
 
 Specify other locales:
 
 ```ruby
-(DateTime.now - 1).localize(:de).ago.to_s        # "Vor 1 Tag"
-(DateTime.now + 1).localize(:de).until.to_s      # "In 1 Tag"
+(DateTime.now - 1).localize(:de).ago.to_s        # "vor 1 Tag"
+(DateTime.now + 1).localize(:de).until.to_s      # "in 1 Tag"
 ```
 
 Force TwitterCLDR to use a specific time unit by including the `:unit` option:
 
 ```ruby
-(DateTime.now - 1).localize(:de).ago.to_s(:unit => :hour)        # "Vor 24 Stunden"
-(DateTime.now + 1).localize(:de).until.to_s(:unit => :hour)      # "In 24 Stunden"
+(DateTime.now - 1).localize(:de).ago.to_s(:unit => :hour)        # "vor 24 Stunden"
+(DateTime.now + 1).localize(:de).until.to_s(:unit => :hour)      # "in 24 Stunden"
 ```
 
 Specify a different reference point for the time span calculation:
 
 ```ruby
 # 86400 = 1 day in seconds, 259200 = 3 days in seconds
-(Time.now + 86400).localize(:de).ago(:base_time => (Time.now + 259200)).to_s(:unit => :hour)  # "Vor 48 Stunden"
+(Time.now + 86400).localize(:de).ago(:base_time => (Time.now + 259200)).to_s(:unit => :hour)  # "vor 48 Stunden"
 ```
 
 Behind the scenes, these convenience methods are creating instances of `LocalizedTimespan`, whose constructor accepts a number of seconds as the first argument.  You can do the same thing if you're feeling adventurous:
@@ -298,21 +298,21 @@ Behind the scenes, these convenience methods are creating instances of `Localize
 ```ruby
 
 ts = TwitterCldr::Localized::LocalizedTimespan.new(86400, :locale => :de)
-ts.to_s                         # "In 1 Tag"
-ts.to_s(:unit => :hour)         # "In 24 Stunden"
+ts.to_s                         # "in 1 Tag"
+ts.to_s(:unit => :hour)         # "in 24 Stunden"
 
 
 ts = TwitterCldr::Localized::LocalizedTimespan.new(-86400, :locale => :de)
-ts.to_s                         # "Vor 1 Tag"
-ts.to_s(:unit => :hour)         # "Vor 24 Stunden"
+ts.to_s                         # "vor 1 Tag"
+ts.to_s(:unit => :hour)         # "vor 24 Stunden"
 ```
 
 By default, timespans are exact representations of a given unit of elapsed time.  TwitterCLDR also supports approximate timespans which round up to the nearest larger unit.  For example, "44 seconds" remains "44 seconds" while "45 seconds" becomes "1 minute".  To approximate, pass the `:approximate => true` option into `to_s`:
 
 ```ruby
-TwitterCldr::Localized::LocalizedTimespan.new(44).to_s(:approximate => true)  # "In 44 seconds"
-TwitterCldr::Localized::LocalizedTimespan.new(45).to_s(:approximate => true)  # "In 1 minute"
-TwitterCldr::Localized::LocalizedTimespan.new(52).to_s(:approximate => true)  # "In 1 minute"
+TwitterCldr::Localized::LocalizedTimespan.new(44).to_s(:approximate => true)  # "in 44 seconds"
+TwitterCldr::Localized::LocalizedTimespan.new(45).to_s(:approximate => true)  # "in 1 minute"
+TwitterCldr::Localized::LocalizedTimespan.new(52).to_s(:approximate => true)  # "in 1 minute"
 ```
 
 ### Calendar Data
@@ -548,7 +548,7 @@ postal_code.regexp  # /(\d{5})(?:[ \-](\d{4}))?/
 Get a sample of valid postal codes with the `#sample` method:
 
 ```ruby
-postal_code.sample(5)  # ["04937-1403", "24033-3284", "40707-3618", "56564", "53993"]
+postal_code.sample(5)  # ["40741-8626", "87304", "02763-2183", "78302", "37171"]
 ```
 
 ### Phone Codes

data/lib/twitter_cldr/data_readers/data_reader.rb

@@ -10,7 +10,7 @@ module TwitterCldr
       attr_reader :locale
 
       def initialize(locale)
-        @locale = locale
+        @locale = TwitterCldr.convert_locale(locale)
       end
 
       def pattern_at_path(path)
@@ -29,4 +29,4 @@ module TwitterCldr
 
     end
   end
-end
+end

data/lib/twitter_cldr/data_readers/timespan_data_reader.rb

@@ -6,48 +6,12 @@
 module TwitterCldr
   module DataReaders
     class TimespanDataReader < DataReader
-
-      DEFAULT_DIRECTION = :none
+      DEFAULT_DIRECTION = :ago
       DEFAULT_TYPE = :default
       VALID_FIELDS = [:second, :minute, :hour, :day, :week, :month, :year]
       BASE_PATH = [:fields]
 
-      PATHS = {
-        ago: {
-          default: :'hour-past',
-          second:  :'second-past',
-          minute:  :'minute-past',
-          hour:    :'hour-past',
-          day:     :'day-past',
-          week:    :'week-past',
-          month:   :'month-past',
-          year:    :'year-past'
-        },
-
-        until: {
-          default: :'hour-future',
-          second:  :'second-future',
-          minute:  :'minute-future',
-          hour:    :'hour-future',
-          day:     :'day-future',
-          week:    :'week-future',
-          month:   :'month-future',
-          year:    :'year-future'
-        },
-
-        none: {
-          default: :second,
-          second:  :second,
-          minute:  :minute,
-          hour:    :hour,
-          day:     :day,
-          week:    :week,
-          month:   :month,
-          year:    :year
-        }
-      }
-
-      attr_reader :direction, :unit, :type, :rule
+      attr_reader :direction, :unit, :type, :plural_rule
 
       def initialize(locale, seconds, options = {})
         super(locale)
@@ -56,67 +20,48 @@ module TwitterCldr
         @direction = options[:direction] || DEFAULT_DIRECTION
         @unit = options[:unit]
 
-        @rule = options[:rule] ||
+        @plural_rule = options[:plural_rule] ||
           TwitterCldr::Formatters::Plurals::Rules.rule_for(seconds, locale)
       end
 
-      # type is stuff like :abbreviated, etc
       def pattern
-        path = full_path_for(direction, unit, type)
-        available = traverse(path)
-        pluralization = pluralization_for(rule, available)
-
-        if available.include?(pluralization)
-          path << pluralization
-        else
-          return [] unless available.keys.first
-          path << available.keys.first
-        end
-
         traverse(path)
       end
 
       def tokenizer
-        TwitterCldr::Tokenizers::TimespanTokenizer.new(self)
+        @tokenizer ||= TwitterCldr::Tokenizers::TimespanTokenizer.new(self)
       end
 
       def formatter
-        TwitterCldr::Formatters::TimespanFormatter.new(self)
+        @formatter ||= TwitterCldr::Formatters::TimespanFormatter.new(self)
       end
 
-      protected
+      private
+
+      def path
+        BASE_PATH + [type_field, :relative_time, direction_field, plural_rule]
+      end
 
-      def pluralization_for(rule, available)
-        # sometimes the plural rule will return ":one" when the resource only contains a path with "1"
-        case rule
-          when :zero
-            available.include?(0) ? 0 : rule
-          when :one
-            available.include?(1) ? 1 : rule
-          when :two
-            available.include?(2) ? 2 : rule
+      def direction_field
+        case direction
+          when :ago
+            :past
           else
-            rule
+            :future
         end
       end
 
-      def full_path_for(direction, unit, type)
-        BASE_PATH + [PATHS[direction][unit], type]
+      def type_field
+        case type
+          when :default
+            unit
+          else
+            :"#{unit}-#{type}"
+        end
       end
 
       def resource
-        @resource ||= self.class.resource_for_locale(locale)
-      end
-
-      class << self
-        def all_types_for(locale, unit, direction)
-          TwitterCldr::Utils.traverse_hash(resource_for_locale(locale), BASE_PATH + [PATHS[direction][unit]]).keys
-        end
-
-        def resource_for_locale(locale)
-          @resources ||= {}
-          @resources[locale] ||= TwitterCldr.get_locale_resource(locale, :fields)[TwitterCldr.convert_locale(locale)]
-        end
+        @resource ||= TwitterCldr.get_locale_resource(locale, :fields)[locale]
       end
     end
   end

data/lib/twitter_cldr/formatters/numbers/rbnf.rb

@@ -37,7 +37,7 @@ module TwitterCldr
 
         def format(number, options = {})
           rule_group_name, rule_set_name = *if options[:rule_group].nil? && options[:rule_set].nil?
-            [DEFAULT_CARDINAL_OPTIONS[:rule_group], DEFAULT_CARDINAL_OPTIONS[:rule_set]]
+            [DEFAULT_SPELLOUT_OPTIONS[:rule_group], DEFAULT_SPELLOUT_OPTIONS[:rule_set]]
           else
             [options[:rule_group], options[:rule_set]]
           end

data/lib/twitter_cldr/resources/locales_resources_importer.rb

@@ -14,8 +14,6 @@ module TwitterCldr
 
     class LocalesResourcesImporter
 
-      # NOTE: units.yml was NOT updated to cldr 24 (too many significant changes) - add back in when appropriate.
-      #       Meanwhile, use ruby-cldr v0.0.2 and CLDR 22.1 to update units.yml files.
       LOCALE_COMPONENTS = %w[
         calendars
         languages
@@ -24,7 +22,9 @@ module TwitterCldr
         lists
         territories
         rbnf
-      ]  # units
+        units
+        fields
+      ]
 
       SHARED_COMPONENTS = %w[
         currency_digits_and_rounding

data/lib/twitter_cldr/tokenizers/numbers/rbnf_tokenizer.rb

@@ -15,9 +15,6 @@ module TwitterCldr
 
       def tokenizer
         @tokenizer ||= begin
-          # i.e. %spellout-numbering, %%2d-year
-          rule_regex = Regexp.new("%%?[[:word:]\-]+")
-
           recognizers = [
             # special rule descriptors
             TokenRecognizer.new(:negative, /-x/),
@@ -27,7 +24,7 @@ module TwitterCldr
 
             # normal rule descriptors
             TokenRecognizer.new(:equals, /=/),
-            TokenRecognizer.new(:rule, rule_regex),
+            TokenRecognizer.new(:rule, /%%?[[:word:]-]+/),  # i.e. %spellout-numbering, %%2d-year
             TokenRecognizer.new(:right_arrow, />/),
             TokenRecognizer.new(:left_arrow, /</),
             TokenRecognizer.new(:open_bracket, /\[/),

data/lib/twitter_cldr/version.rb

@@ -4,5 +4,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 module TwitterCldr
-  VERSION = '3.5.0'
+  VERSION = '3.6.0'
 end

data/resources/custom/shared/postal_codes.yml

@@ -0,0 +1,8 @@
+# Override South Korean format, which hasn't been updated in i18napis.appspot.com's data yet.
+:kr:
+  :regex: !ruby/regexp /\d{5}/
+  :ast: |
+    BAhvOihUd2l0dGVyQ2xkcjo6VXRpbHM6OlJlZ2V4cEFzdDo6Um9vdAc6EUBl
+    eHByZXNzaW9uc1sGbzopVHdpdHRlckNsZHI6OlV0aWxzOjpSZWdleHBBc3Q6
+    OkRpZ2l0BzsGWwA6EEBxdWFudGlmaWVybzouVHdpdHRlckNsZHI6OlV0aWxz
+    OjpSZWdleHBBc3Q6OlF1YW50aWZpZXIHOglAbWF4aQo6CUBtaW5pCjsIMA==

data/resources/locales/af/fields.yml

@@ -2,107 +2,334 @@
 :af: 
   :fields: 
     :day: 
-      :default: 
-        :one: "{0} dag"
-        :other: "{0} dae"
-      :short: 
-        :one: "{0} dag"
-        :other: "{0} dae"
-    :day-future: 
-      :default: 
-        :one: "In {0} dag"
-        :other: "In {0} dae"
-    :day-past: 
-      :default: 
-        :one: "{0} dag gelede"
-        :other: "{0} dae gelede"
+      :display_name: Dag
+      :relative: 
+        -1: gister
+        -2: eergister
+        0: vandag
+        1: môre
+        2: oormôre
+      :relative_time: 
+        :future: 
+          :one: "Oor {0} dag"
+          :other: "Oor {0} dae"
+        :past: 
+          :one: "{0} dag gelede"
+          :other: "{0} dae gelede"
+    :day-narrow: 
+      :display_name: d.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} dag"
+          :other: "oor {0} dae"
+        :past: 
+          :one: "{0} dag gelede"
+          :other: "{0} dae gelede"
+    :day-short: 
+      :display_name: d.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} dag"
+          :other: "oor {0} dae"
+        :past: 
+          :one: "{0} dag gelede"
+          :other: "{0} dae gelede"
+    :dayperiod: 
+      :display_name: VM/NM
+    :era: 
+      :display_name: Era
+    :fri: 
+      :relative: 
+        -1: "verlede Vrydag"
+        0: "hierdie Vrydag"
+        1: "volgende Vrydag"
+    :fri-short: 
+      :relative: 
+        -1: "verlede Vr."
     :hour: 
-      :default: 
-        :one: "{0} uur"
-        :other: "{0} uur"
-      :short: 
-        :one: "{0} uur"
-        :other: "{0} uur"
-    :hour-future: 
-      :default: 
-        :one: "In {0} uur"
-        :other: "In {0} uur"
-    :hour-past: 
-      :default: 
-        :one: "{0} uur gelede"
-        :other: "{0} uur gelede"
+      :display_name: Uur
+      :relative_time: 
+        :future: 
+          :one: "Oor {0} uur"
+          :other: "Oor {0} uur"
+        :past: 
+          :one: "{0} uur gelede"
+          :other: "{0} uur gelede"
+    :hour-narrow: 
+      :display_name: u.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} uur"
+          :other: "oor {0} uur"
+        :past: 
+          :one: "{0} uur gelede"
+          :other: "{0} uur gelede"
+    :hour-short: 
+      :display_name: u.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} uur"
+          :other: "oor {0} uur"
+        :past: 
+          :one: "{0} uur gelede"
+          :other: "{0} uur gelede"
     :minute: 
-      :default: 
-        :one: "{0} minuut"
-        :other: "{0} minute"
-      :short: 
-        :one: "{0} min"
-        :other: "{0} min"
-    :minute-future: 
-      :default: 
-        :one: "In {0} minuut"
-        :other: "In {0} minute"
-    :minute-past: 
-      :default: 
-        :one: "{0} minuut gelede"
-        :other: "{0} minute gelede"
+      :display_name: Minuut
+      :relative_time: 
+        :future: 
+          :one: "Oor {0} minuut"
+          :other: "Oor {0} minute"
+        :past: 
+          :one: "{0} minuut gelede"
+          :other: "{0} minute gelede"
+    :minute-narrow: 
+      :display_name: m.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} min."
+          :other: "oor {0} min."
+        :past: 
+          :one: "{0} min. gelede"
+          :other: "{0} min. gelede"
+    :minute-short: 
+      :display_name: min.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} min."
+          :other: "oor {0} min."
+        :past: 
+          :one: "{0} min. gelede"
+          :other: "{0} min. gelede"
+    :mon: 
+      :relative: 
+        -1: "verlede Maandag"
+        0: "hierdie Maandag"
+        1: "volgende Maandag"
+    :mon-narrow: 
+      :relative: 
+        -1: "verlede Ma."
+        0: "hierdie Ma."
+        1: "volgende Ma."
+    :mon-short: 
+      :relative: 
+        -1: "verlede Ma."
+        0: "hierdie Ma."
+        1: "volgende Ma."
     :month: 
-      :default: 
-        :one: "{0} maand"
-        :other: "{0} maande"
-      :short: 
-        :one: "{0} mnd"
-        :other: "{0} mnde"
-    :month-future: 
-      :default: 
-        :one: "In {0} maand"
-        :other: "In {0} maande"
-    :month-past: 
-      :default: 
-        :one: "{0} maand gelede"
-        :other: "{0} maande gelede"
+      :display_name: Maand
+      :relative: 
+        -1: "verlede maand"
+        0: vandeesmaand
+        1: "volgende maand"
+      :relative_time: 
+        :future: 
+          :one: "Oor {0} maand"
+          :other: "Oor {0} maande"
+        :past: 
+          :one: "{0} maand gelede"
+          :other: "{0} maande gelede"
+    :month-narrow: 
+      :display_name: md.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} md."
+          :other: "oor {0} md."
+        :past: 
+          :one: "{0} md. gelede"
+          :other: "{0} md. gelede"
+    :month-short: 
+      :display_name: md.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} md."
+          :other: "oor {0} md."
+        :past: 
+          :one: "{0} md. gelede"
+          :other: "{0} md. gelede"
+    :quarter: 
+      :display_name: Kwartaal
+      :relative_time: 
+        :future: 
+          :one: "oor {0} kwartaal"
+          :other: "oor {0} kwartale"
+        :past: 
+          :one: "{0} kwartaal gelede"
+          :other: "{0} kwartale gelede"
+    :quarter-narrow: 
+      :display_name: kw.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} kwartale"
+          :other: "oor {0} kwartale"
+        :past: 
+          :one: "{0} kwartale gelede"
+          :other: "{0} kwartale gelede"
+    :quarter-short: 
+      :display_name: kw.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} kwartaal"
+          :other: "oor {0} kwartale"
+        :past: 
+          :one: "{0} kwartaal gelede"
+          :other: "{0} kwartale gelede"
+    :sat: 
+      :relative: 
+        -1: "verlede Saterdag"
+        0: "hierdie Saterdag"
+        1: "volgende Saterdag"
     :second: 
-      :default: 
-        :one: "{0} sekonde"
-        :other: "{0} sekondes"
-      :short: 
-        :one: "{0} sek"
-        :other: "{0} sek"
-    :second-future: 
-      :default: 
-        :one: "In {0} sekond"
-        :other: "In {0} sekondes"
-    :second-past: 
-      :default: 
-        :one: "{0} sekonde gelede"
-        :other: "{0} sekondes gelede"
+      :display_name: Sekonde
+      :relative: 
+        0: nou
+      :relative_time: 
+        :future: 
+          :one: "Oor {0} sekonde"
+          :other: "Oor {0} sekondes"
+        :past: 
+          :one: "{0} sekonde gelede"
+          :other: "{0} sekondes gelede"
+    :second-narrow: 
+      :display_name: s.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} sek."
+          :other: "oor {0} sek."
+        :past: 
+          :one: "{0} sek. gelede"
+          :other: "{0} sek. gelede"
+    :second-short: 
+      :display_name: sek.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} sek."
+          :other: "oor {0} sek."
+        :past: 
+          :one: "{0} sek. gelede"
+          :other: "{0} sek. gelede"
+    :sun: 
+      :relative: 
+        -1: "verlede Sondag"
+        0: "hierdie Sondag"
+        1: "volgende Sondag"
+    :sun-narrow: 
+      :relative: 
+        -1: "verlede Son."
+        0: "hierdie Son."
+        1: "volgende Son."
+    :sun-short: 
+      :relative: 
+        -1: "verlede Son."
+        0: "hierdie Son."
+        1: "volgende Son."
+    :thu: 
+      :relative: 
+        -1: "verlede Donderdag"
+        0: "hierdie Donderdag"
+        1: "volgende Donderdag"
+    :thu-narrow: 
+      :relative: 
+        -1: "verlede Do."
+        0: "hierdie Do."
+        1: "volgende Do."
+    :thu-short: 
+      :relative: 
+        -1: "verlede Do."
+        0: "hierdie Do."
+        1: "volgende Do."
+    :tue: 
+      :relative: 
+        -1: "verlede Dinsdag"
+        0: "hierdie Dinsdag"
+        1: "volgende Dinsdag"
+    :tue-narrow: 
+      :relative: 
+        -1: "verlede Di."
+        0: "hierdie Di."
+        1: "volgende Di."
+    :tue-short: 
+      :relative: 
+        -1: "verlede Di."
+        0: "hierdie Di."
+        1: "volgende Di."
+    :wed: 
+      :relative: 
+        -1: "verlede Woensdag"
+        0: "hierdie Woensdag"
+        1: "volgende Woensdag"
+    :wed-narrow: 
+      :relative: 
+        -1: "verlede Wo."
+        0: "hierdie Wo."
+        1: "volgende Wo."
+    :wed-short: 
+      :relative: 
+        -1: "verlede Wo."
+        0: "hierdie Wo."
+        1: "volgende Wo."
     :week: 
-      :default: 
-        :one: "{0} week"
-        :other: "{0} weke"
-      :short: 
-        :one: "{0} week"
-        :other: "{0} weke"
-    :week-future: 
-      :default: 
-        :one: "In {0} week"
-        :other: "In {0} weke"
-    :week-past: 
-      :default: 
-        :one: "{0} week gelede"
-        :other: "{0} weke gelede"
+      :display_name: Week
+      :relative: 
+        -1: "verlede week"
+        0: vandeesweek
+        1: "volgende week"
+      :relative_time: 
+        :future: 
+          :one: "Oor {0} week"
+          :other: "Oor {0} weke"
+        :past: 
+          :one: "{0} week gelede"
+          :other: "{0} weke gelede"
+    :week-narrow: 
+      :display_name: wk.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} w."
+          :other: "oor {0} w."
+        :past: 
+          :one: "{0} w. gelede"
+          :other: "{0} w. gelede"
+    :week-short: 
+      :display_name: wk.
+      :relative_time: 
+        :future: 
+          :one: "oor {0} w."
+          :other: "oor {0} w."
+        :past: 
+          :one: "{0} w. gelede"
+          :other: "{0} w. gelede"
+    :weekday: 
+      :display_name: "Dag van die Week"
     :year: 
-      :default: 
-        :one: "{0} jaar"
-        :other: "{0} jaar"
-      :short: 
-        :one: "{0} jr"
-        :other: "{0} jr"
-    :year-future: 
-      :default: 
-        :one: "In {0} jaar"
-        :other: "In {0} jaar"
-    :year-past: 
-      :default: 
-        :one: "{0} jaar gelede"
-        :other: "{0} jaar gelede"
+      :display_name: Jaar
+      :relative: 
+        -1: "verlede jaar"
+        0: "hierdie jaar"
+        1: "volgende jaar"
+      :relative_time: 
+        :future: 
+          :one: "Oor {0} jaar"
+          :other: "Oor {0} jaar"
+        :past: 
+          :one: "{0} jaar gelede"
+          :other: "{0} jaar gelede"
+    :year-narrow: 
+      :display_name: j.
+      :relative_time: 
+        :future: 
+          :one: "Oor {0} jaar"
+          :other: "Oor {0} jaar"
+        :past: 
+          :one: "{0} jaar gelede"
+          :other: "{0} jaar gelede"
+    :year-short: 
+      :display_name: j.
+      :relative_time: 
+        :future: 
+          :one: "Oor {0} jaar"
+          :other: "Oor {0} jaar"
+        :past: 
+          :one: "{0} jaar gelede"
+          :other: "{0} jaar gelede"
+    :zone: 
+      :display_name: Tydsone