Change slang_names to unoffical_names

countries · Mar 20, 2016 · 526b07b · 526b07b
1 parent fcc6693
commit 526b07b
Show file tree

Hide file tree

Showing 254 changed files with 631 additions and 633 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - DATA STRUCTURE CHANGES
   -COUNTRY
     - BREAKING CHANGES
-      - names: => slang_names
+      - names: => unofficial_names
       - languages: => official_languages
       - lat/lng fields are nested under a "geo" key
     - + spoken_languages

diff --git a/README.markdown b/README.markdown
@@ -87,33 +87,31 @@ Note: searches are *case insensitive and ignore accents*.
 Country Info
 ------------
 
-Identification Codes
-``` ruby
-c.number #=> "840"
-c.alpha2 #=> "US"
-c.alpha3 #=> "USA"
-c.gec    #=> "US"
-```
-Names & Translations
+  Identification Codes
 
-``` ruby
-c.name #=> "United States"
-c.unofficial_names #=> ["United States of America", "Vereinigte Staaten von Amerika", "États-Unis", "Estados Unidos"]
-
-# Get the names for a country translated to its local languages
-c = Country[:BE]
-c.local_names #=> ["België", "Belgique", "Belgien"]
-c.local_name  #=> "België"
-
-# Get a specific translation
-c.translation('de')  #=> 'Vereinigte Staaten von Amerika'
-c.translations['fr'] #=> "États-Unis"
-
-ISO3166::Country.translations             #=> {"DE"=>"Germany",...}
-ISO3166::Country.translations('DE')       #=> {"DE"=>"Deutschland",...}
-ISO3166::Country.all_translated           #=> ['Germany', ...]
-ISO3166::Country.all_translated('DE')     #=> ['Deutschland', ...]
-```
+    c.number #=> "840"
+    c.alpha2 #=> "US"
+    c.alpha3 #=> "USA"
+    c.gec    #=> "US"
+
+  Names & Translations
+
+    c.name #=> "United States"
+    c.unofficial_names #=> ["United States of America", "Vereinigte Staaten von Amerika", "États-Unis", "Estados Unidos"]
+
+    # Get the names for a country translated to its local languages
+    c = Country[:BE]
+    c.local_names #=> ["België", "Belgique", "Belgien"]
+    c.local_name #=> "België"
+
+    # Get a specific translation
+    c.translation('de') #=> 'Vereinigte Staaten von Amerika'
+    c.translations['fr'] #=> "États-Unis"
+
+    ISO3166::Country.translations             # {"DE"=>"Germany",...}
+    ISO3166::Country.translations('DE')       # {"DE"=>"Deutschland",...}
+    ISO3166::Country.all_translated           # ['Germany', ...]
+    ISO3166::Country.all_translated('DE')     # ['Deutschland', ...]
 
   Subdivisions & States
 

diff --git a/lib/countries/country.rb b/lib/countries/country.rb
@@ -15,8 +15,8 @@ def valid?
     alias_method :zip, :postal_code
     alias_method :zip?, :postal_code
     alias_method :postal_code?, :postal_code
-    alias_method :languages, :languages_offical
-    alias_method :names, :slang_names
+    alias_method :languages, :languages_official
+    alias_method :names, :unofficial_names
 
     def ==(other)
       other == data

diff --git a/lib/countries/country/structure.rb b/lib/countries/country/structure.rb
@@ -29,7 +29,7 @@ module Structure
         national_prefix: "",
         nationality: "",
         number: "",
-        languages_offical: [
+        languages_official: [
           ""
         ],
         languages_spoken: [
@@ -39,7 +39,7 @@ module Structure
         translations: {},
         postal_code: true,
         region: "",
-        slang_names: [],
+        unofficial_names: [],
         subregion: "",
         un_locode: "",
         vat_rates: "",

diff --git a/lib/countries/data/countries/AD.yaml b/lib/countries/data/countries/AD.yaml
@@ -24,11 +24,11 @@ AD:
   un_locode: AD
   nationality: Andorran
   postal_code: true
-  slang_names:
+  unofficial_names:
   - Andorre
   - Andorra
   - "アンドラ"
-  languages_offical:
+  languages_official:
   - ca
   languages_spoken:
   - ca

diff --git a/lib/countries/data/countries/AE.yaml b/lib/countries/data/countries/AE.yaml
@@ -28,15 +28,15 @@ AE:
   un_locode: AE
   nationality: Emirian
   postal_code: false
-  slang_names:
+  unofficial_names:
   - United Arab Emirates
   - "الإمارات العربية المتحدة"
   - Vereinigte Arabische Emirate
   - "Émirats Arabes Unis"
   - Emiratos Árabes Unidos
   - "アラブ首長国連邦"
   - Verenigde Arabische Emiraten
-  languages_offical:
+  languages_official:
   - ar
   languages_spoken:
   - ar

diff --git a/lib/countries/data/countries/AF.yaml b/lib/countries/data/countries/AF.yaml
@@ -22,11 +22,11 @@ AF:
   un_locode: AF
   nationality: Afghan
   postal_code: true
-  slang_names:
+  unofficial_names:
   - Afghanistan
   - Afganistán
   - "アフガニスタン"
-  languages_offical:
+  languages_official:
   - ps
   - uz
   - tk

diff --git a/lib/countries/data/countries/AG.yaml b/lib/countries/data/countries/AG.yaml
@@ -21,14 +21,14 @@ AG:
   un_locode: AG
   nationality: Antiguan, Barbudan
   postal_code: false
-  slang_names:
+  unofficial_names:
   - Antigua and Barbuda
   - Antigua und Barbuda
   - Antigua et Barbuda
   - Antigua y Barbuda
   - "アンティグア・バーブーダ"
   - Antigua en Barbuda
-  languages_offical:
+  languages_official:
   - en
   languages_spoken:
   - en

diff --git a/lib/countries/data/countries/AI.yaml b/lib/countries/data/countries/AI.yaml
@@ -6,7 +6,7 @@ AI:
   country_code: '1'
   currency: XCD
   international_prefix: '011'
-  ioc: 
+  ioc:
   gec: AV
   name: Anguilla
   national_destination_code_lengths:
@@ -21,10 +21,10 @@ AI:
   un_locode: AI
   nationality: Anguillian
   postal_code: true
-  slang_names:
+  unofficial_names:
   - Anguilla
   - "アンギラ"
-  languages_offical:
+  languages_official:
   - en
   languages_spoken:
   - en

diff --git a/lib/countries/data/countries/AL.yaml b/lib/countries/data/countries/AL.yaml
@@ -23,13 +23,13 @@ AL:
   un_locode: AL
   nationality: Albanian
   postal_code: true
-  slang_names:
+  unofficial_names:
   - Albania
   - Albanien
   - Albanie
   - "アルバニア"
   - Albanië
-  languages_offical:
+  languages_official:
   - sq
   languages_spoken:
   - sq

diff --git a/lib/countries/data/countries/AM.yaml b/lib/countries/data/countries/AM.yaml
@@ -21,13 +21,13 @@ AM:
   un_locode: AM
   nationality: Armenian
   postal_code: true
-  slang_names:
+  unofficial_names:
   - Armenia
   - Armenien
   - Arménie
   - "アルメニア"
   - Armenië
-  languages_offical:
+  languages_official:
   - hy
   - ru
   languages_spoken:

diff --git a/lib/countries/data/countries/AN.yaml b/lib/countries/data/countries/AN.yaml
@@ -7,7 +7,7 @@ AN:
   currency: ANG
   international_prefix: '00'
   ioc: AHO
-  gec: 
+  gec:
   name: Netherlands Antilles
   national_destination_code_lengths:
   - 2
@@ -22,14 +22,14 @@ AN:
   nationality: Dutch
   dissolved_on: '2010-10-10'
   postal_code: false
-  slang_names:
+  unofficial_names:
   - Netherlands Antilles
   - Niederländische Antillen
   - Antilles néerlandaises
   - Antillas Holandesas
   - "オランダ領アンティル"
   - Nederlandse Antillen
-  languages_offical:
+  languages_official:
   - nl
   - en
   languages_spoken:

diff --git a/lib/countries/data/countries/AO.yaml b/lib/countries/data/countries/AO.yaml
@@ -21,10 +21,10 @@ AO:
   un_locode: AO
   nationality: Angolan
   postal_code: false
-  slang_names:
+  unofficial_names:
   - Angola
   - "アンゴラ"
-  languages_offical:
+  languages_official:
   - pt
   languages_spoken:
   - pt

diff --git a/lib/countries/data/countries/AQ.yaml b/lib/countries/data/countries/AQ.yaml
@@ -6,7 +6,7 @@ AQ:
   country_code: '672'
   currency: USD
   international_prefix: ''
-  ioc: 
+  ioc:
   gec: AY
   name: Antarctica
   national_destination_code_lengths: []
@@ -19,13 +19,13 @@ AQ:
   un_locode: AQ
   nationality: ''
   postal_code: true
-  slang_names:
+  unofficial_names:
   - Antarctica
   - Antarktis
   - Antarctique
   - Antártida
   - "南極"
-  languages_offical: []
+  languages_official: []
   languages_spoken: []
   geo:
     latitude: 90 00 S

diff --git a/lib/countries/data/countries/AR.yaml b/lib/countries/data/countries/AR.yaml
@@ -28,13 +28,13 @@ AR:
   un_locode: AR
   nationality: Argentinean
   postal_code: true
-  slang_names:
+  unofficial_names:
   - Argentina
   - Argentinien
   - Argentine
   - "アルゼンチン"
   - Argentinië
-  languages_offical:
+  languages_official:
   - es
   - gn
   languages_spoken:

diff --git a/lib/countries/data/countries/AS.yaml b/lib/countries/data/countries/AS.yaml
@@ -21,14 +21,14 @@ AS:
   un_locode: AS
   nationality: American Samoan
   postal_code: true
-  slang_names:
+  unofficial_names:
   - American Samoa
   - Amerikanisch-Samoa
   - Samoa américaines
   - Samoa Americana
   - "アメリカ領サモア"
   - Amerikaans Samoa
-  languages_offical:
+  languages_official:
   - en
   - sm
   languages_spoken:

diff --git a/lib/countries/data/countries/AT.yaml b/lib/countries/data/countries/AT.yaml
@@ -38,16 +38,16 @@ AT:
     standard: 20
     reduced:
     - 10
-    super_reduced: 
+    super_reduced:
     parking: 12
   postal_code: true
-  slang_names:
+  unofficial_names:
   - Austria
   - "Österreich"
   - Autriche
   - "オーストリア"
   - Oostenrijk
-  languages_offical:
+  languages_official:
   - de
   languages_spoken:
   - de

diff --git a/lib/countries/data/countries/AU.yaml b/lib/countries/data/countries/AU.yaml
@@ -26,13 +26,13 @@ AU:
   un_locode: AU
   nationality: Australian
   postal_code: true
-  slang_names:
+  unofficial_names:
   - Australia
   - Australien
   - Australie
   - "オーストラリア"
   - Australië
-  languages_offical:
+  languages_official:
   - en
   languages_spoken:
   - en

diff --git a/lib/countries/data/countries/AW.yaml b/lib/countries/data/countries/AW.yaml
@@ -21,10 +21,10 @@ AW:
   un_locode: AW
   nationality: Aruban
   postal_code: false
-  slang_names:
+  unofficial_names:
   - Aruba
   - "アルバ"
-  languages_offical:
+  languages_official:
   - nl
   languages_spoken:
   - nl

diff --git a/lib/countries/data/countries/AX.yaml b/lib/countries/data/countries/AX.yaml
@@ -6,8 +6,8 @@ AX:
   country_code: '358'
   currency: EUR
   international_prefix: ''
-  ioc: 
-  gec: 
+  ioc:
+  gec:
   name: "Åland Islands"
   national_destination_code_lengths: []
   national_number_lengths: []
@@ -16,15 +16,15 @@ AX:
   region: Europe
   subregion: Northern Europe
   world_region: EMEA
-  un_locode: 
+  un_locode:
   nationality: Swedish
   postal_code: true
-  slang_names:
+  unofficial_names:
   - "Åland Islands"
   - "Åland"
   - "オーランド諸島"
   - "Ålandeilanden"
-  languages_offical:
+  languages_official:
   - sv
   languages_spoken:
   - sv