twitter_cldr 3.0.10 → 3.1.0

data/lib/twitter_cldr/localized/localized_number.rb

@@ -28,23 +28,10 @@ module TwitterCldr
       end
 
       def to_s(options = {})
-        data_reader = TwitterCldr::DataReaders::NumberDataReader.new(locale, {
+        TwitterCldr::DataReaders::NumberDataReader.new(locale, {
           :type => @type,
           :format => @format
-        })
-
-        pattern = data_reader.pattern(base_obj)
-
-        if pattern == 0
-          # can't format the number for current locale
-          base_obj.to_s
-        else
-          data_reader.formatter.format(
-            data_reader.tokenizer.tokenize(pattern),
-            base_obj,
-            options.merge(:type => @type)
-          )
-        end
+        }).format_number(base_obj, options.merge(:type => @type))
       end
 
       def plural_rule

data/lib/twitter_cldr/resources/download.rb

@@ -6,8 +6,8 @@
 module TwitterCldr
   module Resources
 
-    CLDR_URL = 'http://unicode.org/Public/cldr/24/core.zip'
-    ICU4J_URL = 'http://download.icu-project.org/files/icu4j/52.1/icu4j-52_1.jar'
+    CLDR_URL = 'http://unicode.org/Public/cldr/26/core.zip'
+    ICU4J_URL = 'http://download.icu-project.org/files/icu4j/54.1/icu4j-54_1.jar'
 
     # Use these instead to update collation and tailoring data
     # CLDR_URL = 'http://unicode.org/Public/cldr/23.1/core.zip'
@@ -54,4 +54,4 @@ module TwitterCldr
     end
 
   end
-end
+end

data/lib/twitter_cldr/resources/locales_resources_importer.rb

@@ -4,6 +4,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 require 'fileutils'
+require 'cldr-plurals'
 require 'cldr/export'
 
 require 'twitter_cldr/resources/download'
@@ -15,7 +16,7 @@ module TwitterCldr
 
       # 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 numbers plurals lists layout currencies territories rbnf]  # units
+      LOCALE_COMPONENTS = %w[calendars languages numbers plural_rules lists layout currencies territories rbnf]  # units
       SHARED_COMPONENTS = %w[currency_digits_and_rounding rbnf_root numbering_systems segments_root territories_containment]
 
       # Arguments:
@@ -40,15 +41,6 @@ module TwitterCldr
         Cldr::Export::Data.dir = File.join(@input_path, 'common')
       end
 
-      # Copies zh plurals to zh-Hant (they can share, but locale code needs to be different).
-      #
-      def copy_zh_hant_plurals
-        File.open(File.join(@output_path, 'locales', 'zh-Hant', 'plurals.yml'), 'w:utf-8') do |output|
-          data = YAML.load(File.read(File.join(@output_path, 'locales', 'zh', 'plurals.yml')))
-          output.write(YAML.dump(:'zh-Hant' => data[:zh].gsub(":'zh'", ":'zh-Hant'")))
-        end
-      end
-
       def move_segments_root_file
         file_path = File.join(@output_path, 'shared', 'segments_root.yml')
 
@@ -65,11 +57,15 @@ module TwitterCldr
           :merge => true  # fill in the gaps, eg fill in sub-locales like en_GB with en
         }
 
+        locales = Set.new
+
         Cldr::Export.export(export_args) do |component, locale, path|
           add_buddhist_calendar(component, locale, path)
           process_plurals(component, locale, path)
           downcase_territory_codes(component, locale, path)
           deep_symbolize(component, locale, path)
+          locales.add(locale)
+          STDOUT.write "\r#{locale}, #{locales.size} of #{TwitterCldr.supported_locales.size} total"
         end
 
         export_args = {
@@ -83,7 +79,6 @@ module TwitterCldr
         end
 
         move_segments_root_file
-        copy_zh_hant_plurals
       end
 
       def deep_symbolize(component, locale, path)
@@ -124,15 +119,28 @@ module TwitterCldr
       end
 
       def process_plurals(component, locale, path)
-        return unless component == 'Plurals'
+        return unless component == 'PluralRules'
 
-        plural_rules = File.read(path)
+        output_file = File.join(File.dirname(path), 'plurals.yml')
 
-        File.open(path.gsub(/rb$/, 'yml'), 'w:utf-8') do |output|
-          output.write(YAML.dump({ locale => plural_rules }))
+        plurals = YAML.load(File.read(path))[locale.to_s].inject({}) do |ret, (rule_type, rule_data)|
+          rule_list = CldrPlurals::Compiler::RuleList.new(locale)
+
+          rule_data.each_pair do |name, rule_text|
+            rule_list.add_rule(name.to_sym, rule_text) unless name == 'other'
+          end
+
+          ret[rule_type.to_sym] = {
+            :rule => rule_list.to_code(:ruby),
+            :names => rule_list.rules.map(&:name) + [:other]
+          }
+
+          ret
         end
 
-        FileUtils.rm(path)
+        File.open(output_file, 'w:utf-8') do |output|
+          output.write(YAML.dump(locale => plurals))
+        end
       end
 
       # TODO: export buddhist calendar from CLDR data instead of using BUDDHIST_CALENDAR constant.

data/lib/twitter_cldr/resources/uli/segment_exceptions_importer.rb

@@ -12,7 +12,7 @@ module TwitterCldr
     module Uli
       class SegmentExceptionsImporter
 
-        URL = "http://unicode.org/uli/trac/export/38/trunk/abbrs/json/%{locale}.json"
+        URL = "http://unicode.org/uli/trac/export/58/trunk/abbrs/json/%{locale}.json"
 
         attr_reader :input_path, :output_path
 

data/lib/twitter_cldr/shared/postal_codes.rb

@@ -41,16 +41,32 @@ module TwitterCldr
 
       end
 
-      attr_reader :territory, :regexp, :ast
+      attr_reader :territory, :regexp, :single_regexp, :multi_regexp, :ast
 
       def initialize(territory, regexp, ast)
         @territory = territory
         @regexp = regexp
+        if @regexp
+          @single_regexp = build_regexp "\\A#{regexp.source}\\z"
+          @multi_regexp = build_regexp "\\b#{regexp.source}\\b"
+        end
         @ast = ast
       end
 
       def valid?(postal_code)
-        !!(regexp && regexp =~ postal_code)
+        !!(single_regexp && single_regexp =~ postal_code)
+      end
+
+      def find_all(postal_codes)
+        # we cannot use String#scan here as some of the CLDR regular
+        # expressions have capture groups while others don't making
+        # it completely unpredictable what that method might return
+        offset = 0; matches = []
+        while match = multi_regexp.match(postal_codes, offset)
+          matches << match[0]
+          offset += match.offset(0)[1]
+        end
+        matches
       end
 
       def sample(sample_size = 1)
@@ -59,6 +75,18 @@ module TwitterCldr
 
       private
 
+      def build_regexp(regexp_str, modifiers = '')
+        if RUBY_VERSION <= "1.8.7"
+          begin
+            Oniguruma::ORegexp.new(regexp_str, modifiers)
+          rescue NameError
+            raise "Postal codes require the Oniguruma gem when using Ruby 1.8. Please install, require, and retry."
+          end
+        else
+          Regexp.new(regexp_str, modifiers)
+        end
+      end
+
       def generator
         generator_cache[territory] ||= PostalCodeGenerator.new(ast)
       end

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

@@ -37,6 +37,7 @@ module TwitterCldr
             TokenRecognizer.new(:open_bracket, /\[/),
             TokenRecognizer.new(:close_bracket, /\]/),
             TokenRecognizer.new(:decimal, /[0#][0#,\.]+/),
+            TokenRecognizer.new(:plural, /\$\(.*\)\$/),
 
             # ending
             TokenRecognizer.new(:semicolon, /;/),
@@ -55,4 +56,4 @@ module TwitterCldr
 
     end
   end
-end
+end

data/lib/twitter_cldr/version.rb

@@ -4,5 +4,5 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 module TwitterCldr
-  VERSION = "3.0.10"
+  VERSION = "3.1.0"
 end

data/resources/locales/af/calendars.yml

@@ -3,27 +3,28 @@
   :calendars: 
     :gregorian: 
       :additional_formats: 
+        :E: "ccc"
         :EHm: "E HH:mm"
         :EHms: "E HH:mm:ss"
         :Ed: "E d"
-        :Ehm: "E h:mm a"
-        :Ehms: "E h:mm:ss a"
+        :Ehm: "E hh:mm a"
+        :Ehms: "E hh:mm:ss a"
         :Gy: "y G"
         :GyMMM: "MMM y G"
-        :GyMMMEd: "E, d MMM y G"
-        :GyMMMd: "d MMM y G"
+        :GyMMMEd: "E, dd MMM y G"
+        :GyMMMd: "dd MMM y G"
         :H: "HH"
         :Hm: "HH:mm"
         :Hms: "HH:mm:ss"
         :M: "L"
-        :MEd: "E, M/d"
+        :MEd: "E, d/M"
         :MMM: "LLL"
-        :MMMEd: "E, MMM d"
-        :MMMMEd: "E, MMMM d"
-        :MMMMd: "MMMM d"
+        :MMMEd: "E d MMM"
+        :MMMMEd: "E d MMMM"
+        :MMMMd: "d MMM"
         :MMMMdd: "dd MMMM"
-        :MMMd: "MMM d"
-        :Md: "M/d"
+        :MMMd: "d MMM"
+        :Md: "dd-MM"
         :d: "d"
         :h: "h a"
         :hm: "h:mm a"
@@ -31,13 +32,13 @@
         :ms: "mm:ss"
         ? !ruby/symbol "y"
         : "y"
-        :yM: "M/y"
-        :yMEd: "E, d/M/y"
+        :yM: "MM-y"
+        :yMEd: "E y-MM-dd"
         :yMMM: "MMM y"
         :yMMMEd: "E, d MMM y"
         :yMMMM: "MMMM y"
         :yMMMd: "d MMM y"
-        :yMd: "M/d/y"
+        :yMd: "y-MM-dd"
         :yQQQ: "QQQ y"
         :yQQQQ: "QQQQ y"
       :days: 
@@ -112,27 +113,44 @@
           0: "v.g.j."
           1: "g.j."
         :name: 
-          0: "voor Christus"
-          1: "na Christus"
+          0: "v.g.j."
+          1: "g.j."
         :narrow: 
           0: "vgj"
           1: "vg"
       :fields: 
         :day: "Dag"
+        :day-narrow: "d."
+        :day-short: "d."
         :dayperiod: "VM/NM"
         :era: "Era"
         :hour: "Uur"
+        :hour-narrow: "u."
+        :hour-short: "u."
         :minute: "Minuut"
+        :minute-narrow: "m."
+        :minute-short: "min."
         :month: "Maand"
+        :month-narrow: "md."
+        :month-short: "md."
+        :quarter: "Kwartaal"
+        :quarter-narrow: "kw."
+        :quarter-short: "kw."
         :second: "Sekonde"
+        :second-narrow: "s."
+        :second-short: "sek."
         :week: "Week"
+        :week-narrow: "wk."
+        :week-short: "wk."
         :weekday: "Dag van die Week"
         :year: "Jaar"
+        :year-narrow: "j."
+        :year-short: "j."
         :zone: "Tydsone"
       :formats: 
         :date: 
           :full: 
-            :pattern: "EEEE dd MMMM y"
+            :pattern: "EEEE, dd MMMM y"
           :long: 
             :pattern: "dd MMMM y"
           :medium: 
@@ -160,12 +178,12 @@
       :months: 
         :format: 
           :abbreviated: 
-            1: "Jan"
+            1: "Jan."
             10: "Okt"
             11: "Nov"
             12: "Des"
-            2: "Feb"
-            3: "Mar"
+            2: "Feb."
+            3: "Mrt."
             4: "Apr"
             5: "Mei"
             6: "Jun"
@@ -200,12 +218,12 @@
             9: "September"
         :stand-alone: 
           :abbreviated: 
-            1: "Jan"
+            1: "Jan."
             10: "Okt"
             11: "Nov"
             12: "Des"
-            2: "Feb"
-            3: "Mar"
+            2: "Feb."
+            3: "Mrt."
             4: "Apr"
             5: "Mei"
             6: "Jun"
@@ -242,16 +260,13 @@
         :format: 
           :abbreviated: :calendars.gregorian.dayPeriods.format.wide
           :narrow: 
-            :am: "a"
-            :noon: "n"
-            :pm: "p"
+            :am: "v"
+            :noon: "m"
+            :pm: "n"
           :wide: 
             :am: "vm."
-            :noon: "noon"
+            :noon: "middag"
             :pm: "nm."
-            :variant: 
-              :am: "a.m."
-              :pm: "p.m."
         :stand-alone: {}
       :quarters: 
         :format: 

data/resources/locales/af/currencies.yml

@@ -1,954 +1,651 @@
 --- 
 :af: 
   :currencies: 
-    :ADP: 
-      :one: "Andorran peseta"
-      :other: "Andorran pesetas"
     :AED: 
       :one: "Verenigde Arabiese Emirate dirham"
-      :other: "UAE dirhams"
-    :AFA: 
-      :one: "Afghan afghani (1927–2002)"
-      :other: "Afghan afghanis (1927–2002)"
+      :other: "Verenigde Arabiese Emirate dirham"
+      :symbol: "AED"
     :AFN: 
       :one: "Afgaanse afgani"
-      :other: "Afghan Afghanis"
-    :ALK: 
-      :one: "Albanian lek (1946–1965)"
-      :other: "Albanian lekë (1946–1965)"
+      :other: "Afgaanse afgani"
+      :symbol: "AFN"
     :ALL: 
       :one: "Albanese lek"
-      :other: "Albanian lekë"
+      :other: "Albanese lek"
+      :symbol: "ALL"
     :AMD: 
       :one: "Armeense dram"
-      :other: "Armenian drams"
+      :other: "Armeense dram"
+      :symbol: "AMD"
     :ANG: 
       :one: "Nederlands-Antilliaanse gulde"
-      :other: "Netherlands Antillean guilders"
+      :other: "Nederlands-Antilliaanse gulde"
+      :symbol: "ANG"
     :AOA: 
       :one: "Angolese kwanza"
-      :other: "Angolan kwanzas"
-    :AOK: 
-      :one: "Angolan kwanza (1977–1991)"
-      :other: "Angolan kwanzas (1977–1991)"
-    :AON: 
-      :one: "Angolan new kwanza (1990–2000)"
-      :other: "Angolan new kwanzas (1990–2000)"
-    :AOR: 
-      :one: "Angolan readjusted kwanza (1995–1999)"
-      :other: "Angolan readjusted kwanzas (1995–1999)"
-    :ARA: 
-      :one: "Argentine austral"
-      :other: "Argentine australs"
-    :ARL: 
-      :one: "Argentine peso ley (1970–1983)"
-      :other: "Argentine pesos ley (1970–1983)"
-    :ARM: 
-      :one: "Argentine peso (1881–1970)"
-      :other: "Argentine pesos (1881–1970)"
-    :ARP: 
-      :one: "Argentine peso (1983–1985)"
-      :other: "Argentine pesos (1983–1985)"
+      :other: "Angolese kwanza"
+      :symbol: "AOA"
     :ARS: 
       :one: "Argentynse peso"
-      :other: "Argentine pesos"
-      :symbol: "$"
-    :ATS: 
-      :one: "Austrian schilling"
-      :other: "Austrian schillings"
+      :other: "Argentynse peso"
+      :symbol: "ARS"
     :AUD: 
       :one: "Australiese dollar"
       :other: "Australiese dollar"
       :symbol: "A$"
     :AWG: 
       :one: "Arubaanse floryn"
-      :other: "Aruban florin"
-    :AZM: 
-      :one: "Azerbaijani manat (1993–2006)"
-      :other: "Azerbaijani manats (1993–2006)"
+      :other: "Arubaanse floryn"
+      :symbol: "AWG"
     :AZN: 
       :one: "Azerbeidjaanse manat"
-      :other: "Azerbaijani manats"
-    :BAD: 
-      :one: "Bosnia-Herzegovina dinar (1992–1994)"
-      :other: "Bosnia-Herzegovina dinars (1992–1994)"
+      :other: "Azerbeidjaanse manat"
+      :symbol: "AZN"
     :BAM: 
-      :one: "Bosnië en Herzegowina omskakelbare marka"
-      :other: "Bosnia-Herzegovina convertible marks"
-    :BAN: 
-      :one: "Bosnia-Herzegovina new dinar (1994–1997)"
-      :other: "Bosnia-Herzegovina new dinars (1994–1997)"
+      :one: "Bosnies-Herzegowiniese omskakelbare marka"
+      :other: "Bosnies-Herzegowiniese omskakelbare marka"
+      :symbol: "BAM"
     :BBD: 
       :one: "Barbados-dollar"
-      :other: "Barbadian dollars"
-      :symbol: "$"
+      :other: "Barbados-dollar"
+      :symbol: "BBD"
     :BDT: 
       :one: "Bangladesjiese taka"
-      :other: "Bangladeshi takas"
-      :symbol: "৳"
-    :BEC: 
-      :one: "Belgian franc (convertible)"
-      :other: "Belgian francs (convertible)"
-    :BEF: 
-      :one: "Belgian franc"
-      :other: "Belgian francs"
-    :BEL: 
-      :one: "Belgian franc (financial)"
-      :other: "Belgian francs (financial)"
-    :BGL: 
-      :one: "Bulgarian hard lev"
-      :other: "Bulgarian hard leva"
-    :BGM: 
-      :one: "Bulgarian socialist lev"
-      :other: "Bulgarian socialist leva"
+      :other: "Bangladesjiese taka"
+      :symbol: "BDT"
     :BGN: 
       :one: "Bulgaarse lev"
-      :other: "Bulgarian leva"
-    :BGO: 
-      :one: "Bulgarian lev (1879–1952)"
-      :other: "Bulgarian leva (1879–1952)"
+      :other: "Bulgaarse lev"
+      :symbol: "BGN"
     :BHD: 
-      :one: "Bahrainse dinar"
-      :other: "Bahraini dinars"
+      :one: "Bahreinse dinar"
+      :other: "Bahreinse dinar"
+      :symbol: "BHD"
     :BIF: 
       :one: "Burundiese frank"
-      :other: "Burundian francs"
+      :other: "Burundiese frank"
+      :symbol: "BIF"
     :BMD: 
       :one: "Bermuda-dollar"
-      :other: "Bermudan dollars"
-      :symbol: "$"
+      :other: "Bermuda-dollar"
+      :symbol: "BMD"
     :BND: 
       :one: "Broeneise dollar"
-      :other: "Brunei dollars"
-      :symbol: "$"
+      :other: "Broeneise dollar"
+      :symbol: "BND"
     :BOB: 
       :one: "Boliviaanse boliviano"
-      :other: "Bolivian bolivianos"
-    :BOL: 
-      :one: "Bolivian boliviano (1863–1963)"
-      :other: "Bolivian bolivianos (1863–1963)"
-    :BOP: 
-      :one: "Bolivian peso"
-      :other: "Bolivian pesos"
-    :BOV: 
-      :one: "Bolivian mvdol"
-      :other: "Bolivian mvdols"
-    :BRB: 
-      :one: "Brazilian new cruzeiro (1967–1986)"
-      :other: "Brazilian new cruzeiros (1967–1986)"
-    :BRC: 
-      :one: "Brazilian cruzado (1986–1989)"
-      :other: "Brazilian cruzados (1986–1989)"
-    :BRE: 
-      :one: "Brazilian cruzeiro (1990–1993)"
-      :other: "Brazilian cruzeiros (1990–1993)"
+      :other: "Boliviaanse boliviano"
+      :symbol: "BOB"
     :BRL: 
-      :one: "Brasiliaanse real"
-      :other: "Brazilian reals"
+      :one: "Brasillianse reaal"
+      :other: "Brasillianse reaal"
       :symbol: "R$"
-    :BRN: 
-      :one: "Brazilian new cruzado (1989–1990)"
-      :other: "Brazilian new cruzados (1989–1990)"
-    :BRR: 
-      :one: "Brazilian cruzeiro (1993–1994)"
-      :other: "Brazilian cruzeiros (1993–1994)"
-    :BRZ: 
-      :one: "Brazilian cruzeiro (1942–1967)"
-      :other: "Brazilian cruzeiros (1942–1967)"
     :BSD: 
       :one: "Bahamiaanse dollar"
-      :other: "Bahamian dollars"
-      :symbol: "$"
+      :other: "Bahamiaanse dollar"
+      :symbol: "BSD"
     :BTN: 
       :one: "Bhoetanese ngoeltroem"
-      :other: "Bhutanese ngultrums"
-    :BUK: 
-      :one: "Burmese kyat"
-      :other: "Burmese kyats"
+      :other: "Bhoetanese ngoeltroem"
+      :symbol: "BTN"
     :BWP: 
       :one: "Botswana pula"
-      :other: "Botswanan pulas"
-    :BYB: 
-      :one: "Belarusian new ruble (1994–1999)"
-      :other: "Belarusian new rubles (1994–1999)"
+      :other: "Botswana pula"
+      :symbol: "BWP"
     :BYR: 
       :one: "Belo-Russiese roebel"
-      :other: "Belarusian rubles"
-      :symbol: "р."
+      :other: "Belo-Russiese roebel"
+      :symbol: "BYR"
     :BZD: 
       :one: "Beliziese dollar"
-      :other: "Belize dollars"
-      :symbol: "$"
+      :other: "Beliziese dollar"
+      :symbol: "BZD"
     :CAD: 
       :one: "Kanadese dollar"
-      :other: "Canadian dollars"
+      :other: "Kanadese dollar"
       :symbol: "CA$"
     :CDF: 
       :one: "Kongolese frank"
-      :other: "Congolese francs"
-    :CHE: 
-      :one: "WIR euro"
-      :other: "WIR euros"
+      :other: "Kongolese frank"
+      :symbol: "CDF"
     :CHF: 
       :one: "Switserse frank"
-      :other: "Swiss francs"
-    :CHW: 
-      :one: "WIR franc"
-      :other: "WIR francs"
-    :CLE: 
-      :one: "Chilean escudo"
-      :other: "Chilean escudos"
-    :CLF: 
-      :one: "Chilean unit of account (UF)"
-      :other: "Chilean units of account (UF)"
+      :other: "Switserse frank"
+      :symbol: "CHF"
     :CLP: 
       :one: "Chileense peso"
-      :other: "Chilean pesos"
-      :symbol: "$"
-    :CNX: 
-      :one: "Chinese People’s Bank dollar"
-      :other: "Chinese People’s Bank dollars"
+      :other: "Chileense peso"
+      :symbol: "CLP"
     :CNY: 
       :one: "Sjinese joean renminbi"
-      :other: "Chinese yuan"
+      :other: "Sjinese joean renminbi"
       :symbol: "CN¥"
     :COP: 
       :one: "Colombiaanse peso"
-      :other: "Colombian pesos"
-      :symbol: "$"
-    :COU: 
-      :one: "Colombian real value unit"
-      :other: "Colombian real value units"
+      :other: "Colombiaanse peso"
+      :symbol: "COP"
     :CRC: 
       :one: "Costa Ricaanse colón"
-      :other: "Costa Rican colóns"
-      :symbol: "₡"
-    :CSD: 
-      :one: "Serbian dinar (2002–2006)"
-      :other: "Serbian dinars (2002–2006)"
-    :CSK: 
-      :one: "Czechoslovak hard koruna"
-      :other: "Czechoslovak hard korunas"
+      :other: "Costa Ricaanse colón"
+      :symbol: "CRC"
     :CUC: 
       :one: "Kubaanse omskakelbare peso"
-      :other: "Cuban convertible pesos"
+      :other: "Kubaanse omskakelbare peso"
+      :symbol: "CUC"
     :CUP: 
       :one: "Kubaanse peso"
-      :other: "Cuban pesos"
-      :symbol: "$"
+      :other: "Kubaanse peso"
+      :symbol: "CUP"
     :CVE: 
       :one: "Kaap Verdiese escudo"
-      :other: "Cape Verdean escudos"
-    :CYP: 
-      :one: "Cypriot pound"
-      :other: "Cypriot pounds"
+      :other: "Kaap Verdiese escudo"
+      :symbol: "CVE"
     :CZK: 
       :one: "Tsjeggiese kroon"
-      :other: "Czech Republic korunas"
-    :DDM: 
-      :one: "East German mark"
-      :other: "East German marks"
-    :DEM: 
-      :one: "German mark"
-      :other: "German marks"
+      :other: "Tsjeggiese kroon"
+      :symbol: "CZK"
     :DJF: 
       :one: "Djiboeti frank"
-      :other: "Djiboutian francs"
+      :other: "Djiboeti frank"
+      :symbol: "DJF"
     :DKK: 
       :one: "Deense kroon"
-      :other: "Danish kroner"
+      :other: "Deense kroon"
+      :symbol: "DKK"
     :DOP: 
       :one: "Dominikaanse peso"
       :other: "Dominikaanse peso"
-      :symbol: "$"
+      :symbol: "DOP"
     :DZD: 
       :one: "Algeriese dinar"
-      :other: "Algerian dinars"
-    :ECS: 
-      :one: "Ecuadorian sucre"
-      :other: "Ecuadorian sucres"
-    :ECV: 
-      :one: "Ecuadorian unit of constant value"
-      :other: "Ecuadorian units of constant value"
-    :EEK: 
-      :one: "Estonian kroon"
-      :other: "Estonian kroons"
+      :other: "Algeriese dinar"
+      :symbol: "DZD"
     :EGP: 
       :one: "Egiptiese pond"
-      :other: "Egyptian pounds"
+      :other: "Egiptiese pond"
+      :symbol: "EGP"
     :ERN: 
       :one: "Eritrese nakfa"
-      :other: "Eritrean nakfas"
-    :ESA: 
-      :one: "Spanish peseta (A account)"
-      :other: "Spanish pesetas (A account)"
-    :ESB: 
-      :one: "Spanish peseta (convertible account)"
-      :other: "Spanish pesetas (convertible account)"
+      :other: "Eritrese nakfa"
+      :symbol: "ERN"
     :ESP: 
-      :one: "Spanish peseta"
-      :other: "Spanish pesetas"
       :symbol: "₧"
     :ETB: 
       :one: "Etiopiese birr"
-      :other: "Ethiopian birrs"
+      :other: "Etiopiese birr"
+      :symbol: "ETB"
     :EUR: 
-      :one: "Euro"
-      :other: "euros"
+      :one: "euro"
+      :other: "euro"
       :symbol: "€"
-    :FIM: 
-      :one: "Finnish markka"
-      :other: "Finnish markkas"
     :FJD: 
       :one: "Fidjiaanse dollar"
-      :other: "Fijian dollars"
-      :symbol: "$"
+      :other: "Fidjiaanse dollar"
+      :symbol: "FJD"
     :FKP: 
       :one: "Falkland-eilande pond"
-      :other: "Falkland Islands pounds"
-    :FRF: 
-      :one: "French franc"
-      :other: "French francs"
+      :other: "Falkland-eilande pond"
+      :symbol: "FKP"
     :GBP: 
       :one: "Britse pond"
-      :other: "British pounds sterling"
+      :other: "Britse pond"
       :symbol: "£"
-    :GEK: 
-      :one: "Georgian kupon larit"
-      :other: "Georgian kupon larits"
     :GEL: 
       :one: "Georgiese lari"
-      :other: "Georgian laris"
+      :other: "Georgiese lari"
+      :symbol: "GEL"
     :GHC: 
       :one: "Ghanese cedi (1979–2007)"
-      :other: "Ghanaian cedis (1979–2007)"
     :GHS: 
       :one: "Ghanese cedi"
-      :other: "Ghanaian cedis"
-      :symbol: "₵"
+      :other: "Ghanese cedi"
+      :symbol: "GHS"
     :GIP: 
       :one: "Gibraltarese pond"
-      :other: "Gibraltar pounds"
-      :symbol: "£"
+      :other: "Gibraltarese pond"
+      :symbol: "GIP"
     :GMD: 
       :one: "Gambiese dalasi"
-      :other: "Gambian dalasis"
+      :other: "Gambiese dalasi"
+      :symbol: "GMD"
     :GNF: 
       :one: "Guinese frank"
-      :other: "Guinean francs"
+      :other: "Guinese frank"
+      :symbol: "GNF"
     :GNS: 
       :one: "Guinese syli"
-      :other: "Guinean sylis"
-    :GQE: 
-      :one: "Equatorial Guinean ekwele"
-      :other: "Equatorial Guinean ekwele"
-    :GRD: 
-      :one: "Greek drachma"
-      :other: "Greek drachmas"
     :GTQ: 
       :one: "Guatemalaanse quetzal"
-      :other: "Guatemalan quetzals"
-    :GWE: 
-      :one: "Portuguese Guinea escudo"
-      :other: "Portuguese Guinea escudos"
-    :GWP: 
-      :one: "Guinea-Bissau peso"
-      :other: "Guinea-Bissau pesos"
+      :other: "Guatemalaanse quetzal"
+      :symbol: "GTQ"
     :GYD: 
       :one: "Guyanese dollar"
-      :other: "Guyanaese dollars"
-      :symbol: "$"
+      :other: "Guyanese dollar"
+      :symbol: "GYD"
     :HKD: 
       :one: "Hong Kong dollar"
-      :other: "Hong Kong dollars"
+      :other: "Hong Kong dollar"
       :symbol: "HK$"
     :HNL: 
       :one: "Hondurese lempira"
-      :other: "Honduran lempiras"
-    :HRD: 
-      :one: "Croatian dinar"
-      :other: "Croatian dinars"
+      :other: "Hondurese lempira"
+      :symbol: "HNL"
     :HRK: 
       :one: "Kroatiese kuna"
-      :other: "Croatian kunas"
+      :other: "Kroatiese kuna"
+      :symbol: "HRK"
     :HTG: 
       :one: "Haïtiaanse gourde"
-      :other: "Haitian gourdes"
+      :other: "Haïtiaanse gourde"
+      :symbol: "HTG"
     :HUF: 
-      :one: "Hungarian forint"
-      :other: "Hungarian forints"
+      :one: "Hongaarse florint"
+      :other: "Hongaarse florint"
+      :symbol: "HUF"
     :IDR: 
       :one: "Indonesiese roepia"
-      :other: "Indonesian rupiahs"
-    :IEP: 
-      :one: "Irish pound"
-      :other: "Irish pounds"
-    :ILP: 
-      :one: "Israeli pound"
-      :other: "Israeli pounds"
-    :ILR: 
-      :one: "Israeli sheqel (1980–1985)"
-      :other: "Israeli sheqels (1980–1985)"
+      :other: "Indonesiese roepia"
+      :symbol: "IDR"
     :ILS: 
       :one: "Israeliese nuwe sikkel"
-      :other: "Israeli new sheqels"
+      :other: "Israeliese nuwe sikkel"
       :symbol: "₪"
     :INR: 
       :one: "Indiese rupee"
-      :other: "Indian rupees"
+      :other: "Indiese rupee"
       :symbol: "₹"
     :IQD: 
       :one: "Irakse dinar"
-      :other: "Iraqi dinars"
+      :other: "Irakse dinar"
+      :symbol: "IQD"
     :IRR: 
       :one: "Iranse rial"
-      :other: "Iranian rials"
-    :ISJ: 
-      :one: "Icelandic króna (1918–1981)"
-      :other: "Icelandic krónur (1918–1981)"
+      :other: "Iranse rial"
+      :symbol: "IRR"
     :ISK: 
       :one: "Yslandse kroon"
-      :other: "Icelandic krónur"
+      :other: "Yslandse kroon"
+      :symbol: "ISK"
     :ITL: 
       :one: "Italiaanse lier"
-      :other: "Italian liras"
     :JMD: 
       :one: "Jamaikaanse dollar"
-      :other: "Jamaican dollars"
-      :symbol: "$"
+      :other: "Jamaikaanse dollar"
+      :symbol: "JMD"
     :JOD: 
       :one: "Jordaniese dinar"
-      :other: "Jordanian dinars"
+      :other: "Jordaniese dinar"
+      :symbol: "JOD"
     :JPY: 
       :one: "Japannese jen"
-      :other: "Japanese yen"
+      :other: "Japannese jen"
       :symbol: "JP¥"
     :KES: 
       :one: "Keniaanse sjieling"
-      :other: "Kenyan shillings"
+      :other: "Keniaanse sjieling"
+      :symbol: "KES"
     :KGS: 
       :one: "Kirgisiese som"
-      :other: "Kyrgystani soms"
+      :other: "Kirgisiese som"
+      :symbol: "KGS"
     :KHR: 
       :one: "Kambodjaanse riel"
-      :other: "Cambodian riels"
-      :symbol: "៛"
+      :other: "Kambodjaanse riel"
+      :symbol: "KHR"
     :KMF: 
-      :one: "Comoriese frank"
-      :other: "Comorian francs"
+      :one: "Comoraanse frank"
+      :other: "Comoraanse frank"
+      :symbol: "KMF"
     :KPW: 
       :one: "Noord-Koreaanse won"
-      :other: "North Korean won"
-    :KRH: 
-      :one: "South Korean hwan (1953–1962)"
-      :other: "South Korean hwan (1953–1962)"
-    :KRO: 
-      :one: "South Korean won (1945–1953)"
-      :other: "South Korean won (1945–1953)"
+      :other: "Noord-Koreaanse won"
+      :symbol: "KPW"
     :KRW: 
       :one: "Suid-Koreaanse won"
-      :other: "South Korean won"
+      :other: "Suid-Koreaanse won"
       :symbol: "₩"
     :KWD: 
       :one: "Koeweitse dinar"
-      :other: "Kuwaiti dinars"
+      :other: "Koeweitse dinar"
+      :symbol: "KWD"
     :KYD: 
       :one: "Cayman-eilande dollar"
-      :other: "Cayman Islands dollars"
-      :symbol: "$"
+      :other: "Cayman-eilande dollar"
+      :symbol: "KYD"
     :KZT: 
       :one: "Kazakse tenge"
-      :other: "Kazakhstani tenges"
-      :symbol: "₸"
+      :other: "Kazakse tenge"
+      :symbol: "KZT"
     :LAK: 
       :one: "Laosiaanse kip"
-      :other: "Laotian kips"
-      :symbol: "₭"
+      :other: "Laosiaanse kip"
+      :symbol: "LAK"
     :LBP: 
       :one: "Lebanese pond"
-      :other: "Lebanese pounds"
+      :other: "Lebanese pond"
+      :symbol: "LBP"
     :LKR: 
       :one: "Sri Lankaanse roepee"
-      :other: "Sri Lankan rupees"
+      :other: "Sri Lankaanse roepee"
+      :symbol: "LKR"
     :LRD: 
       :one: "Liberiese dollar"
-      :other: "Liberian dollars"
-      :symbol: "$"
+      :other: "Liberiese dollar"
+      :symbol: "LRD"
     :LSL: 
       :one: "Lesotho loti"
-      :other: "Lesotho lotis"
     :LTL: 
       :one: "Litause litas"
-      :other: "Lithuanian litai"
-    :LTT: 
-      :one: "Lithuanian talonas"
-      :other: "Lithuanian talonases"
-    :LUC: 
-      :one: "Luxembourgian convertible franc"
-      :other: "Luxembourgian convertible francs"
-    :LUF: 
-      :one: "Luxembourgian franc"
-      :other: "Luxembourgian francs"
-    :LUL: 
-      :one: "Luxembourg financial franc"
-      :other: "Luxembourg financial francs"
+      :other: "Litause litas"
+      :symbol: "LTL"
     :LVL: 
       :one: "Lettiese lats"
-      :other: "Latvian lati"
-    :LVR: 
-      :one: "Latvian ruble"
-      :other: "Latvian rubles"
+      :symbol: "Ls"
     :LYD: 
       :one: "Libiese dinar"
-      :other: "Libyan dinars"
+      :other: "Libiese dinar"
+      :symbol: "LYD"
     :MAD: 
       :one: "Marokkaanse dirham"
-      :other: "Moroccan dirhams"
-    :MAF: 
-      :one: "Moroccan franc"
-      :other: "Moroccan francs"
-    :MCF: 
-      :one: "Monegasque franc"
-      :other: "Monegasque francs"
-    :MDC: 
-      :one: "Moldovan cupon"
-      :other: "Moldovan cupon"
+      :other: "Marokkaanse dirham"
+      :symbol: "MAD"
     :MDL: 
       :one: "Moldowiese leu"
-      :other: "Moldovan lei"
+      :other: "Moldowiese leu"
+      :symbol: "MDL"
     :MGA: 
       :one: "Malgassiese ariary"
-      :other: "Malagasy Ariaries"
-    :MGF: 
-      :one: "Malagasy franc"
-      :other: "Malagasy francs"
+      :other: "Malgassiese ariary"
+      :symbol: "MGA"
     :MKD: 
       :one: "Macedoniese denar"
-      :other: "Macedonian denari"
-    :MKN: 
-      :one: "Macedonian denar (1992–1993)"
-      :other: "Macedonian denari (1992–1993)"
-    :MLF: 
-      :one: "Malian franc"
-      :other: "Malian francs"
+      :other: "Macedoniese denar"
+      :symbol: "MKD"
     :MMK: 
-      :one: "Myanma kyat"
-      :other: "Myanmar kyats"
+      :one: "Mianmese kyat"
+      :other: "Mianmese kyat"
+      :symbol: "MMK"
     :MNT: 
       :one: "Mongoolse toegrik"
-      :other: "Mongolian tugriks"
-      :symbol: "₮"
+      :other: "Mongoolse toegrik"
+      :symbol: "MNT"
     :MOP: 
       :one: "Macaose pataca"
-      :other: "Macanese patacas"
+      :other: "Macaose pataca"
+      :symbol: "MOP"
     :MRO: 
       :one: "Mauritaniese ouguiya"
-      :other: "Mauritanian ouguiyas"
-    :MTL: 
-      :one: "Maltese lira"
-      :other: "Maltese lira"
-    :MTP: 
-      :one: "Maltese pound"
-      :other: "Maltese pounds"
+      :other: "Mauritaniese ouguiya"
+      :symbol: "MRO"
     :MUR: 
       :one: "Mauritiaanse rupee"
-      :other: "Mauritian rupees"
-    :MVP: 
-      :one: "Maldivian rupee"
-      :other: "Maldivian rupees"
+      :other: "Mauritiaanse rupee"
+      :symbol: "MUR"
     :MVR: 
       :one: "Malediviese rufia"
-      :other: "Maldivian rufiyaas"
+      :other: "Malediviese rufia"
+      :symbol: "MVR"
     :MWK: 
       :one: "Malawiese kwacha"
-      :other: "Malawian Kwachas"
+      :other: "Malawiese kwacha"
+      :symbol: "MWK"
     :MXN: 
       :one: "Meksikaanse peso"
-      :other: "Mexican pesos"
-      :symbol: "MX$"
-    :MXP: 
-      :one: "Mexican silver peso (1861–1992)"
-      :other: "Mexican silver pesos (1861–1992)"
-    :MXV: 
-      :one: "Mexican investment unit"
-      :other: "Mexican investment units"
+      :other: "Meksikaanse peso"
+      :symbol: "MXN"
     :MYR: 
       :one: "Maleisiese ringgit"
-      :other: "Malaysian ringgits"
-    :MZE: 
-      :one: "Mozambican escudo"
-      :other: "Mozambican escudos"
+      :other: "Maleisiese ringgit"
+      :symbol: "MYR"
     :MZM: 
       :one: "Mosambiekse metical (1980–2006)"
-      :other: "Mozambican meticals (1980–2006)"
     :MZN: 
       :one: "Mosambiekse metical"
-      :other: "Mozambican meticals"
+      :other: "Mosambiekse metical"
+      :symbol: "MZN"
     :NAD: 
       :one: "Namibiese dollar"
-      :other: "Namibian dollars"
-      :symbol: "$"
+      :other: "Namibiese dollar"
+      :symbol: "NAD"
     :NGN: 
       :one: "Nigeriese naira"
-      :other: "Nigerian nairas"
-      :symbol: "₦"
-    :NIC: 
-      :one: "Nicaraguan córdoba (1988–1991)"
-      :other: "Nicaraguan córdobas (1988–1991)"
+      :other: "Nigeriese naira"
+      :symbol: "NGN"
     :NIO: 
       :one: "Nicaraguaanse córdoba"
-      :other: "Nicaraguan córdobas"
-    :NLG: 
-      :one: "Dutch guilder"
-      :other: "Dutch guilders"
+      :other: "Nicaraguaanse córdoba"
+      :symbol: "NIO"
     :NOK: 
       :one: "Noorse kroon"
-      :other: "Norwegian kroner"
+      :other: "Noorse kroon"
+      :symbol: "NOK"
     :NPR: 
       :one: "Nepalese roepee"
-      :other: "Nepalese rupees"
+      :other: "Nepalese roepee"
+      :symbol: "NPR"
     :NZD: 
       :one: "Nieu-Seeland dollar"
-      :other: "New Zealand dollars"
+      :other: "Nieu-Seeland dollar"
       :symbol: "NZ$"
     :OMR: 
       :one: "Omaanse rial"
-      :other: "Omani rials"
+      :other: "Omaanse rial"
+      :symbol: "OMR"
     :PAB: 
       :one: "Panamese balboa"
-      :other: "Panamanian balboas"
-    :PEI: 
-      :one: "Peruvian inti"
-      :other: "Peruvian intis"
+      :other: "Panamese balboa"
+      :symbol: "PAB"
     :PEN: 
       :one: "Peruaanse nuwe sol"
-      :other: "Peruvian nuevos soles"
-    :PES: 
-      :one: "Peruvian sol (1863–1965)"
-      :other: "Peruvian soles (1863–1965)"
+      :other: "Peruaanse nuwe sol"
+      :symbol: "PEN"
     :PGK: 
-      :one: "Papoease kina"
-      :other: "Papua New Guinean kina"
+      :one: "Papoea-Nieu-Guinese kina"
+      :other: "Papoea-Nieu-Guinese kina"
+      :symbol: "PGK"
     :PHP: 
       :one: "Filippynse peso"
-      :other: "Philippine pesos"
-      :symbol: "₱"
+      :other: "Filippynse peso"
+      :symbol: "PHP"
     :PKR: 
       :one: "Pakistanse roepee"
-      :other: "Pakistani rupees"
+      :other: "Pakistanse roepee"
+      :symbol: "PKR"
     :PLN: 
       :one: "Poolse zloty"
-      :other: "Polish zlotys"
-    :PLZ: 
-      :one: "Polish zloty (PLZ)"
-      :other: "Polish zlotys (PLZ)"
-    :PTE: 
-      :one: "Portuguese escudo"
-      :other: "Portuguese escudos"
+      :other: "Poolse zloty"
+      :symbol: "PLN"
     :PYG: 
       :one: "Paraguaanse guarani"
-      :other: "Paraguayan guaranis"
-      :symbol: "₲"
+      :other: "Paraguaanse guarani"
+      :symbol: "PYG"
     :QAR: 
       :one: "Katarese rial"
-      :other: "Qatari rials"
-    :RHD: 
-      :one: "Rhodesian dollar"
-      :other: "Rhodesian dollars"
-    :ROL: 
-      :one: "Romanian leu (1952–2006)"
-      :other: "Romanian Lei (1952–2006)"
+      :other: "Katarese rial"
+      :symbol: "QAR"
     :RON: 
       :one: "Roemeense leu"
       :other: "Roemeense leu"
+      :symbol: "RON"
     :RSD: 
       :one: "Serbiese dinar"
-      :other: "Serbian dinars"
+      :other: "Serbiese dinar"
+      :symbol: "RSD"
     :RUB: 
       :one: "Russiese roebel"
-      :other: "Russian rubles"
+      :other: "Russiese roebel"
+      :symbol: "RUB"
     :RUR: 
-      :one: "Russian ruble (1991–1998)"
-      :other: "Russian rubles (1991–1998)"
       :symbol: "р."
     :RWF: 
       :one: "Rwandiese frank"
-      :other: "Rwandan francs"
+      :other: "Rwandiese frank"
+      :symbol: "RWF"
     :SAR: 
       :one: "Saoedi-Arabiese riyal"
-      :other: "Saudi riyals"
+      :other: "Saoedi-Arabiese riyal"
+      :symbol: "SAR"
     :SBD: 
       :one: "Salomonseilande dollar"
       :other: "Salomonseilande dollar"
-      :symbol: "$"
+      :symbol: "SBD"
     :SCR: 
       :one: "Seychellese rupee"
-      :other: "Seychellois rupees"
-    :SDD: 
-      :one: "Sudanese dinar (1992–2007)"
-      :other: "Sudanese dinars (1992–2007)"
+      :other: "Seychellese rupee"
+      :symbol: "SCR"
     :SDG: 
       :one: "Soedannese pond"
-      :other: "Sudanese pounds"
+      :other: "Soedannese pond"
+      :symbol: "SDG"
     :SDP: 
       :one: "Soedannese pond (1957–1998)"
-      :other: "Sudanese pounds (1957–1998)"
     :SEK: 
       :one: "Sweedse kroon"
-      :other: "Swedish kronor"
+      :other: "Sweedse kroon"
+      :symbol: "SEK"
     :SGD: 
-      :one: "Singapoer-dollar"
-      :other: "Singapore dollars"
-      :symbol: "$"
+      :one: "Singapoer dollar"
+      :other: "Singapoer dollar"
+      :symbol: "SGD"
     :SHP: 
       :one: "Sint Helena pond"
-      :other: "Saint Helena pounds"
-    :SIT: 
-      :one: "Slovenian tolar"
-      :other: "Slovenian tolars"
-    :SKK: 
-      :one: "Slovak koruna"
-      :other: "Slovak korunas"
+      :other: "Sint Helena pond"
+      :symbol: "SHP"
     :SLL: 
-      :one: "Sierra Leonese leone"
-      :other: "Sierra Leonean leones"
+      :one: "Sierra Leoniese leone"
+      :other: "Sierra Leoniese leone"
+      :symbol: "SLL"
     :SOS: 
       :one: "Somaliese sjieling"
-      :other: "Somali shillings"
+      :other: "Somaliese sjieling"
+      :symbol: "SOS"
     :SRD: 
       :one: "Surinaamse dollar"
-      :other: "Surinamese dollars"
-      :symbol: "$"
-    :SRG: 
-      :one: "Surinamese guilder"
-      :other: "Surinamese guilders"
+      :other: "Surinaamse dollar"
+      :symbol: "SRD"
     :SSP: 
       :one: "Suid-Soedanese pond"
       :other: "Suid-Soedanese pond"
-      :symbol: "£"
+      :symbol: "SSP"
     :STD: 
       :one: "São Tomé en Príncipe dobra"
-      :other: "São Tomé and Príncipe dobras"
-    :SUR: 
-      :one: "Soviet rouble"
-      :other: "Soviet roubles"
-    :SVC: 
-      :one: "Salvadoran colón"
-      :other: "Salvadoran colones"
+      :other: "São Tomé en Príncipe dobra"
+      :symbol: "STD"
     :SYP: 
       :one: "Siriese pond"
-      :other: "Syrian pounds"
+      :other: "Siriese pond"
+      :symbol: "SYP"
     :SZL: 
       :one: "Swazilandse lilangeni"
-      :other: "Swazi emalangeni"
+      :other: "Swazilandse lilangeni"
+      :symbol: "SZL"
     :THB: 
       :one: "Thaise baht"
-      :other: "Thai baht"
+      :other: "Thaise baht"
       :symbol: "฿"
-    :TJR: 
-      :one: "Tajikistani ruble"
-      :other: "Tajikistani rubles"
     :TJS: 
       :one: "Tadjikse roebel"
-      :other: "Tajikistani somonis"
-    :TMM: 
-      :one: "Turkmenistani manat (1993–2009)"
-      :other: "Turkmenistani manat (1993–2009)"
+      :other: "Tadjikse roebel"
+      :symbol: "TJS"
     :TMT: 
-      :one: "Toerkmeense manat"
-      :other: "Turkmenistani manat"
+      :one: "Turkmeense manat"
+      :other: "Turkmeense manat"
+      :symbol: "TMT"
     :TND: 
       :one: "Tunisiese dinar"
-      :other: "Tunisian dinars"
+      :other: "Tunisiese dinar"
+      :symbol: "TND"
     :TOP: 
-      :one: "Tongaanse pa'anga"
-      :other: "Tongan paʻanga"
-    :TPE: 
-      :one: "Timorese escudo"
-      :other: "Timorese escudos"
+      :one: "Tongaanse pa’anga"
+      :other: "Tongaanse pa’anga"
+      :symbol: "TOP"
     :TRL: 
       :one: "Turkse lier (1922–2005)"
-      :other: "Turkish Lira (1922–2005)"
     :TRY: 
       :one: "Turkse lier"
-      :other: "Turkish Lira"
-      :symbol: "₺"
+      :other: "Turkse lier"
+      :symbol: "TRY"
     :TTD: 
       :one: "Trinidad en Tobago dollar"
-      :other: "Trinidad and Tobago dollars"
-      :symbol: "$"
+      :other: "Trinidad en Tobago dollar"
+      :symbol: "TTD"
     :TWD: 
       :one: "Nuwe Taiwanese dollar"
-      :other: "New Taiwan dollars"
+      :other: "Nuwe Taiwanese dollar"
       :symbol: "NT$"
     :TZS: 
       :one: "Tanzaniese sjieling"
-      :other: "Tanzanian shillings"
+      :other: "Tanzaniese sjieling"
+      :symbol: "TZS"
     :UAH: 
       :one: "Oekraïnse hriwna"
-      :other: "Ukrainian hryvnias"
-      :symbol: "₴"
-    :UAK: 
-      :one: "Ukrainian karbovanets"
-      :other: "Ukrainian karbovantsiv"
-    :UGS: 
-      :one: "Ugandan shilling (1966–1987)"
-      :other: "Ugandan shillings (1966–1987)"
+      :other: "Oekraïnse hriwna"
+      :symbol: "UAH"
     :UGX: 
       :one: "Ugandese sjieling"
-      :other: "Ugandan shillings"
+      :other: "Ugandese sjieling"
+      :symbol: "UGX"
     :USD: 
       :one: "Amerikaanse dollar"
-      :other: "US dollars"
+      :other: "Amerikaanse dollar"
       :symbol: "US$"
-    :USN: 
-      :one: "US dollar (next day)"
-      :other: "US dollars (next day)"
-    :USS: 
-      :one: "US dollar (same day)"
-      :other: "US dollars (same day)"
-    :UYI: 
-      :one: "Uruguayan peso (indexed units)"
-      :other: "Uruguayan pesos (indexed units)"
-    :UYP: 
-      :one: "Uruguayan peso (1975–1993)"
-      :other: "Uruguayan pesos (1975–1993)"
     :UYU: 
       :one: "Uruguaanse peso"
-      :other: "Uruguayan pesos"
-      :symbol: "$"
+      :other: "Uruguaanse peso"
+      :symbol: "UYU"
     :UZS: 
       :one: "Oezbekiese som"
-      :other: "Uzbekistan som"
-    :VEB: 
-      :one: "Venezuelan bolívar (1871–2008)"
-      :other: "Venezuelan bolívars (1871–2008)"
+      :other: "Oezbekiese som"
+      :symbol: "UZS"
     :VEF: 
       :one: "Venezolaanse bolivar"
-      :other: "Venezuelan bolívars"
+      :other: "Venezolaanse bolivar"
+      :symbol: "VEF"
     :VND: 
       :one: "Viëtnamese dong"
-      :other: "Vietnamese dong"
+      :other: "Viëtnamese dong"
       :symbol: "₫"
-    :VNN: 
-      :one: "Vietnamese dong (1978–1985)"
-      :other: "Vietnamese dong (1978–1985)"
     :VUV: 
-      :one: "Vanuatu vatu"
-      :other: "Vanuatu vatus"
+      :one: "Vanuatuse vatu"
+      :other: "Vanuatuse vatu"
+      :symbol: "VUV"
     :WST: 
       :one: "Samoaanse tala"
-      :other: "Samoan tala"
+      :other: "Samoaanse tala"
+      :symbol: "WST"
     :XAF: 
       :one: "CFA frank BEAC"
-      :other: "CFA francs BEAC"
+      :other: "CFA frank BEAC"
       :symbol: "FCFA"
-    :XAG: 
-      :one: "troy ounce of silver"
-      :other: "troy ounces of silver"
-    :XAU: 
-      :one: "troy ounce of gold"
-      :other: "troy ounces of gold"
-    :XBA: 
-      :one: "European composite unit"
-      :other: "European composite units"
-    :XBB: 
-      :one: "European monetary unit"
-      :other: "European monetary units"
-    :XBC: 
-      :one: "European unit of account (XBC)"
-      :other: "European units of account (XBC)"
-    :XBD: 
-      :one: "European unit of account (XBD)"
-      :other: "European units of account (XBD)"
     :XCD: 
       :one: "Oos-Karibbiese dollar"
-      :other: "East Caribbean dollars"
+      :other: "Oos-Karibbiese dollar"
       :symbol: "EC$"
-    :XDR: 
-      :one: "special drawing rights"
-      :other: "special drawing rights"
-    :XEU: 
-      :one: "European currency unit"
-      :other: "European currency units"
-    :XFO: 
-      :one: "French gold franc"
-      :other: "French gold francs"
-    :XFU: 
-      :one: "French UIC-franc"
-      :other: "French UIC-francs"
     :XOF: 
       :one: "CFA frank BCEAO"
-      :other: "CFA francs BCEAO"
+      :other: "CFA frank BCEAO"
       :symbol: "CFA"
-    :XPD: 
-      :one: "troy ounce of palladium"
-      :other: "troy ounces of palladium"
     :XPF: 
       :one: "CFP-frank"
-      :other: "CFP francs"
+      :other: "CFP-frank"
       :symbol: "CFPF"
-    :XPT: 
-      :one: "troy ounce of platinum"
-      :other: "troy ounces of platinum"
-    :XRE: 
-      :one: "RINET Funds unit"
-      :other: "RINET Funds units"
-    :XSU: 
-      :one: "Sucre"
-      :other: "Sucres"
-    :XTS: 
-      :one: "Testing Currency unit"
-      :other: "Testing Currency units"
-    :XUA: 
-      :one: "ADB unit of account"
-      :other: "ADB units of account"
     :XXX: 
-      :one: "Onbekende geldeenheid"
-      :other: "(unknown currency)"
-    :YDD: 
-      :one: "Yemeni dinar"
-      :other: "Yemeni dinars"
+      :one: "(onbekende geldeenheid)"
+      :other: "(onbekende geldeenheid)"
     :YER: 
       :one: "Jemenitiese rial"
-      :other: "Yemeni rials"
-    :YUD: 
-      :one: "Yugoslavian hard dinar (1966–1990)"
-      :other: "Yugoslavian hard dinars (1966–1990)"
-    :YUM: 
-      :one: "Yugoslavian new dinar (1994–2002)"
-      :other: "Yugoslavian new dinars (1994–2002)"
-    :YUN: 
-      :one: "Yugoslavian convertible dinar (1990–1992)"
-      :other: "Yugoslavian convertible dinars (1990–1992)"
-    :YUR: 
-      :one: "Yugoslavian reformed dinar (1992–1993)"
-      :other: "Yugoslavian reformed dinars (1992–1993)"
-    :ZAL: 
-      :one: "South African rand (financial)"
-      :other: "South African rands (financial)"
+      :other: "Jemenitiese rial"
+      :symbol: "YER"
     :ZAR: 
       :one: "Suid-Afrikaanse rand"
-      :other: "South African rand"
+      :other: "Suid-Afrikaanse rand"
       :symbol: "R"
     :ZMK: 
       :one: "Zambiese kwacha (1968–2012)"
-      :other: "Zambian kwachas (1968–2012)"
     :ZMW: 
       :one: "Zambiese kwacha"
-      :other: "Zambian kwachas"
-    :ZRN: 
-      :one: "Zairean new zaire (1993–1998)"
-      :other: "Zairean new zaires (1993–1998)"
-    :ZRZ: 
-      :one: "Zairean zaire (1971–1993)"
-      :other: "Zairean zaires (1971–1993)"
+      :other: "Zambiese kwacha"
+      :symbol: "ZMW"
     :ZWD: 
       :one: "Zimbabwiese dollar"
-      :other: "Zimbabwean dollars (1980–2008)"
-    :ZWL: 
-      :one: "Zimbabwean dollar (2009)"
-      :other: "Zimbabwean dollars (2009)"
-    :ZWR: 
-      :one: "Zimbabwean dollar (2008)"
-      :other: "Zimbabwean dollars (2008)"