countries 2.0.0.pre.3 → 2.0.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b689d67277b1896cc6810ad8782f6f1584965ca
-  data.tar.gz: 49813c4c5797c0449c3adbeeef9b872288d3a387
+  metadata.gz: f97e3625400c7ea38e6c833f9db1609b27e408fa
+  data.tar.gz: ed270ac305ed0f3624f2e77c2d284925e26b35f0
 SHA512:
-  metadata.gz: 989a54adf89519d22899fec6d74fc0ba7296fee1c8797676a88095aee3fd6132f2edd9355e23733d5127f9fbf9320033950d4e6706e13f9e02b32d17a3c3bef7
-  data.tar.gz: 33fe7849f6b2d03e358a56e1228d1b43282d3e87cd6bfc273526f4dd308bdb8b3acb7c35aef115930551c5f619243e894ad6ce0917a2ef53d5eb2ec7fea21499
+  metadata.gz: c0adc052532bdaeb9a0fdbeffea898db107c73aabd41623802ead984d3fd3ca8f119cf4e142b117a1adb64665707a3b9a139da9872f675b60532335e189a4d3d
+  data.tar.gz: 991bf73b733d41dfd79b6c5e9ae50ba533f8e25f65b8ab94b8c97233f8166e18f388cfe87b6b0588ea5d802afa36023cd68de1fbfff4e46b23bda46164e520e7

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.0.0.pre.4
+- Fix crash when app introduces an unexpected locale. Much thanks to @jstenhouse
+
 ## 2.0.0.pre.2
 - Bringing in content from 1.x branch
 

data/lib/countries/data.rb

@@ -121,7 +121,8 @@ module ISO3166
       end
 
       def load_cache(file_array)
-        JSON.load(File.binread(datafile_path file_array))
+        file_path = datafile_path(file_array)
+        File.exist?(file_path) ? JSON.load(File.binread(file_path)) : {}
       end
 
       def datafile_path(file_array)

data/lib/countries/data/subdivisions/JP.yaml

@@ -5,6 +5,7 @@
   - Hokkaido
   translations:
     en: Hokkaido
+    ja: 北海道
   geo:
     latitude: 44
     longitude: 143
@@ -17,6 +18,7 @@
   unofficial_names: Aomori
   translations:
     en: Aomori
+    ja: 青森
   geo:
     latitude: 40.822072
     longitude: 140.7473647
@@ -29,6 +31,7 @@
   unofficial_names: Iwate
   translations:
     en: Iwate
+    ja: 岩手
   geo:
     latitude: 39.7036194
     longitude: 141.1526839
@@ -41,6 +44,7 @@
   unofficial_names: Miyagi
   translations:
     en: Miyagi
+    ja: 宮城
   geo:
     latitude: 38.2688373
     longitude: 140.8721
@@ -53,6 +57,7 @@
   unofficial_names: Akita
   translations:
     en: Akita
+    ja: 秋田
   geo:
     latitude: 39.7200079
     longitude: 140.1025642
@@ -65,6 +70,7 @@
   unofficial_names: Yamagata
   translations:
     en: Yamagata
+    ja: 山形
   geo:
     latitude: 38.2554388
     longitude: 140.3396017
@@ -79,6 +85,7 @@
   - Fukushima
   translations:
     en: Fukushima
+    ja: 福島
   geo:
     latitude: 37.7608337
     longitude: 140.4747282
@@ -91,6 +98,7 @@
   unofficial_names: Ibaraki
   translations:
     en: Ibaraki
+    ja: 茨城
   geo:
     latitude: 36.3418112
     longitude: 140.4467935
@@ -105,6 +113,7 @@
   - Tochigi
   translations:
     en: Tochigi
+    ja: 栃木
   geo:
     latitude: 36.565725
     longitude: 139.8835651
@@ -117,6 +126,7 @@
   unofficial_names: Gunma
   translations:
     en: Gunma
+    ja: 群馬
   geo:
     latitude: 36.3906675
     longitude: 139.0604061
@@ -129,6 +139,7 @@
   unofficial_names: Saitama
   translations:
     en: Saitama
+    ja: 埼玉
   geo:
     latitude: 35.8617292
     longitude: 139.6454822
@@ -143,6 +154,7 @@
   - Chiba
   translations:
     en: Chiba
+    ja: 千葉
   geo:
     latitude: 35.6072668
     longitude: 140.1062907
@@ -157,6 +169,7 @@
   - Tokio
   translations:
     en: Tokyo
+    ja: 東京
   geo:
     latitude: 35.7090259
     longitude: 139.7319925
@@ -169,6 +182,7 @@
   unofficial_names: Kanagawa
   translations:
     en: Kanagawa
+    ja: 神奈川
   geo:
     latitude: 35.4769011
     longitude: 139.6294307
@@ -181,6 +195,7 @@
   unofficial_names: Niigata
   translations:
     en: Niigata
+    ja: 新潟
   geo:
     latitude: 37.9161924
     longitude: 139.0364126
@@ -193,6 +208,7 @@
   unofficial_names: Toyama
   translations:
     en: Toyama
+    ja: 富山
   geo:
     latitude: 36.6959518
     longitude: 137.2136768
@@ -207,6 +223,7 @@
   - Ishikawa
   translations:
     en: Ishikawa
+    ja: 石川
   geo:
     latitude: 36.5946816
     longitude: 136.6255726
@@ -221,6 +238,7 @@
   - Fukui
   translations:
     en: Fukui
+    ja: 福井
   geo:
     latitude: 36.0640669
     longitude: 136.2194938
@@ -235,6 +253,7 @@
   - Yamanashi
   translations:
     en: Yamanashi
+    ja: 山梨
   geo:
     latitude: 35.6641575
     longitude: 138.5684486
@@ -247,6 +266,7 @@
   unofficial_names: Nagano
   translations:
     en: Nagano
+    ja: 長野
   geo:
     latitude: 36.6485496
     longitude: 138.1942432
@@ -261,6 +281,7 @@
   - Gifu
   translations:
     en: Gifu
+    ja: 岐阜
   geo:
     latitude: 35.4232984
     longitude: 136.7606537
@@ -275,6 +296,7 @@
   - Shizuoka
   translations:
     en: Shizuoka
+    ja: 静岡
   geo:
     latitude: 34.975562
     longitude: 138.3827596
@@ -289,6 +311,7 @@
   - Aichi
   translations:
     en: Aichi
+    ja: 愛知
   geo:
     latitude: 35.1801883
     longitude: 136.9065647
@@ -301,6 +324,7 @@
   unofficial_names: Mie
   translations:
     en: Mie
+    ja: 三重
   geo:
     latitude: 34.7302829
     longitude: 136.5085883
@@ -315,6 +339,7 @@
   - Shiga
   translations:
     en: Shiga
+    ja: 滋賀
   geo:
     latitude: 35.0045306
     longitude: 135.8685899
@@ -328,6 +353,7 @@
   - Kyoto
   translations:
     en: Kyoto
+    ja: 京都
   geo:
     latitude: 35.0116363
     longitude: 135.7680294
@@ -341,6 +367,7 @@
   - Osaka
   translations:
     en: Osaka
+    ja: 大阪
   geo:
     latitude: 34.6937378
     longitude: 135.5021651
@@ -354,6 +381,7 @@
   - Hyogo
   translations:
     en: Hyogo
+    ja: 兵庫
   geo:
     latitude: 34.6912688
     longitude: 135.1830706
@@ -366,6 +394,7 @@
   unofficial_names: Nara
   translations:
     en: Nara
+    ja: 奈良
   geo:
     latitude: 34.6850869
     longitude: 135.8050002
@@ -378,6 +407,7 @@
   unofficial_names: Wakayama
   translations:
     en: Wakayama
+    ja: 和歌山
   geo:
     latitude: 34.2305113
     longitude: 135.1708083
@@ -390,6 +420,7 @@
   unofficial_names: Tottori
   translations:
     en: Tottori
+    ja: 鳥取
   geo:
     latitude: 35.5011326
     longitude: 134.2350914
@@ -404,6 +435,7 @@
   - Shimane
   translations:
     en: Shimane
+    ja: 島根
   geo:
     latitude: 35.4722952
     longitude: 133.0504997
@@ -416,6 +448,7 @@
   unofficial_names: Okayama
   translations:
     en: Okayama
+    ja: 岡山
   geo:
     latitude: 34.6551456
     longitude: 133.9195019
@@ -430,6 +463,7 @@
   - Hiroshima
   translations:
     en: Hiroshima
+    ja: 広島
   geo:
     latitude: 34.3852029
     longitude: 132.4552927
@@ -444,6 +478,7 @@
   - Yamaguchi
   translations:
     en: Yamaguchi
+    ja: 山口
   geo:
     latitude: 34.178496
     longitude: 131.4737269
@@ -458,6 +493,7 @@
   - Tokushima
   translations:
     en: Tokushima
+    ja: 徳島
   geo:
     latitude: 34.0702703
     longitude: 134.5548438
@@ -470,6 +506,7 @@
   unofficial_names: Kagawa
   translations:
     en: Kagawa
+    ja: 香川
   geo:
     latitude: 34.3401491
     longitude: 134.0434436
@@ -482,6 +519,7 @@
   unofficial_names: Ehime
   translations:
     en: Ehime
+    ja: 愛媛
   geo:
     latitude: 33.8416238
     longitude: 132.7656808
@@ -495,6 +533,7 @@
   - Kochi
   translations:
     en: Kochi
+    ja: 高知
   geo:
     latitude: 33.5588035
     longitude: 133.5311675
@@ -509,6 +548,7 @@
   - Fukuoka
   translations:
     en: Fukuoka
+    ja: 福岡
   geo:
     latitude: 33.5903547
     longitude: 130.4017155
@@ -521,6 +561,7 @@
   unofficial_names: Saga
   translations:
     en: Saga
+    ja: 佐賀 
   geo:
     latitude: 33.2494416
     longitude: 130.2997942
@@ -533,6 +574,7 @@
   unofficial_names: Nagasaki
   translations:
     en: Nagasaki
+    ja: 長崎
   geo:
     latitude: 32.7502856
     longitude: 129.877667
@@ -545,6 +587,7 @@
   unofficial_names: Kumamoto
   translations:
     en: Kumamoto
+    ja: 熊本
   geo:
     latitude: 32.8031004
     longitude: 130.7078911
@@ -558,6 +601,7 @@
   - Oita
   translations:
     en: Oita
+    ja: 大分
   geo:
     latitude: 33.2395578
     longitude: 131.609272
@@ -570,6 +614,7 @@
   unofficial_names: Miyazaki
   translations:
     en: Miyazaki
+    ja: 宮崎
   geo:
     latitude: 31.9076736
     longitude: 131.4202411
@@ -584,6 +629,7 @@
   - Kagoshima
   translations:
     en: Kagoshima
+    ja: 鹿児島
   geo:
     latitude: 31.5965535
     longitude: 130.5571158
@@ -596,6 +642,7 @@
   unofficial_names: Okinawa
   translations:
     en: Okinawa
+    ja: 沖縄
   geo:
     latitude: 26.2124013
     longitude: 127.6809317

data/lib/countries/data/subdivisions/RU.yaml

@@ -3,7 +3,8 @@ AD:
   unofficial_names:
   - Adygei Republic
   - Adygeja
-  translations: Республика Адыгея
+  translations:
+    ru: Республика Адыгея
   geo:
     latitude: 44.8229155
     longitude: 40.1754463
@@ -17,7 +18,8 @@ AL:
   - Altaj
   - Altay
   - Gorno-Altaj
-  translations: Республика Алтай
+  translations:
+    ru: Республика Алтай
   geo:
     latitude: 55.7671943
     longitude: 37.606158
@@ -32,7 +34,8 @@ ALT:
   - Altajskij Kray
   - Altajskiy Kraj
   - Altaj
-  translations: Алтайский край
+  translations:
+    ru: Алтайский край
   geo:
     latitude: 51.7936298
     longitude: 82.6758596
@@ -44,7 +47,8 @@ ALT:
 AMU:
   unofficial_names:
   - Amurskaja Oblast
-  translations: Амурская область
+  translations:
+    ru: Амурская область
   geo:
     latitude: 54.60350649999999
     longitude: 127.4801721
@@ -57,7 +61,8 @@ ARK:
   unofficial_names:
   - Arhangelskaja Oblast
   - Arhangelsk
-  translations: Архангельская область
+  translations:
+    ru: Архангельская область
   geo:
     latitude: 63.2852803
     longitude: 42.5884191
@@ -70,7 +75,8 @@ AST:
   unofficial_names:
   - Astrahanska Oblast
   - Astrahan
-  translations: Астраханская область
+  translations:
+    ru: Астраханская область
   geo:
     latitude: 46.1321166
     longitude: 48.0610115
@@ -82,7 +88,8 @@ AST:
 BA:
   unofficial_names:
   - Baškortostan
-  translations: Республика Башкортостан
+  translations:
+    ru: Республика Башкортостан
   geo:
     latitude: 54.2312172
     longitude: 56.1645257
@@ -94,7 +101,8 @@ BA:
 BEL:
   unofficial_names:
   - Belgorodskaja Oblast
-  translations: Белгородская область
+  translations:
+    ru: Белгородская область
   geo:
     latitude: 50.71069259999999
     longitude: 37.7533377
@@ -107,7 +115,8 @@ BRY:
   unofficial_names:
   - Brjanskaja Oblast
   - Brjansk
-  translations: Брянская область
+  translations:
+    ru: Брянская область
   geo:
     latitude: 53.0408599
     longitude: 33.2690899
@@ -120,7 +129,8 @@ BU:
   unofficial_names:
   - Buryat Republic
   - Burjatija
-  translations: Республика Бурятия
+  translations:
+    ru: Республика Бурятия
   geo:
     latitude: 55.7685161
     longitude: 37.6425744
@@ -138,7 +148,8 @@ CE:
   - Čečens
   - Čečenskaja Respublika
   - Čečenija
-  translations: Чеченская Республика
+  translations:
+    ru: Чеченская Республика
   geo:
     latitude: 55.7521689
     longitude: 37.5886438
@@ -152,7 +163,8 @@ CHE:
   - Cheljabinsk
   - Čeljabinskaja Oblast
   - Čeljabinsk
-  translations: Челябинская область
+  translations:
+    ru: Челябинская область
   geo:
     latitude: 54.43194219999999
     longitude: 60.87889629999999
@@ -167,7 +179,8 @@ CHU:
   - Čukotskij Avtonomnyj Okrug
   - Čukči
   - Čukotka
-  translations: Чукотский автономный округ
+  translations:
+    ru: Чукотский автономный округ
   geo:
     latitude: 65.6298355
     longitude: 171.6952159
@@ -182,7 +195,8 @@ CU:
   - Chuvashskaya Respublika
   - Čuvašskaja Respublika
   - Čuvašija
-  translations: Чувашская Республика
+  translations:
+    ru: Чувашская Республика
   geo:
     latitude: 55.55959920000001
     longitude: 46.9283536
@@ -193,7 +207,8 @@ CU:
   name: Chuvashskaya Respublika
 DA:
   unofficial_names: Dagestan, Respublika
-  translations: Республика Дагестан
+  translations:
+    ru: Республика Дагестан
   geo:
     latitude: 55.7599606
     longitude: 37.6504362
@@ -206,7 +221,8 @@ IN:
   unofficial_names:
   - Ingushetija
   - Ingušetija
-  translations: Республика Ингушетия
+  translations:
+    ru: Республика Ингушетия
   geo:
     latitude: 43.4051698
     longitude: 44.82029989999999
@@ -218,7 +234,8 @@ IN:
 IRK:
   unofficial_names:
   - Irkutskaja Oblast
-  translations: Иркутская область
+  translations:
+    ru: Иркутская область
   geo:
     latitude: 56.13214199999999
     longitude: 103.948625
@@ -230,7 +247,8 @@ IRK:
 IVA:
   unofficial_names:
   - Ivanovskaja Oblast
-  translations: Ивановская область
+  translations:
+    ru: Ивановская область
   geo:
     latitude: 57.1056854
     longitude: 41.4830084
@@ -246,6 +264,7 @@ KAM:
   - Kamčatka
   translations:
     en: Kamchatskaya oblast'
+    ru: Камчатский край
   geo:
     latitude: 55.743583
     longitude: 37.5880195
@@ -259,7 +278,8 @@ KB:
   - Kabardino-Balkarian Republic
   - Kabardino-Balkarskaja Respublika
   - Kabardino-Balkarija
-  translations: Кабардино-Балкарская республика
+  translations:
+    ru: Кабардино-Балкарская республика
   geo:
     latitude: 43.3932469
     longitude: 43.5628498
@@ -273,7 +293,8 @@ KC:
   - Karachay-Cherkessian
   - Karačajevo-Čerkesskaja Respublika
   - Karačaj-Čerkessija
-  translations: Карачаево-Черкесская республика
+  translations:
+    ru: Карачаево-Черкесская республика
   geo:
     latitude: 43.8845143
     longitude: 41.730394
@@ -285,7 +306,8 @@ KC:
 KDA:
   unofficial_names:
   - Krasnodarskij Kraj
-  translations: Красноярский край
+  translations:
+    ru: Краснодарский край
   geo:
     latitude: 45.6415289
     longitude: 39.7055977
@@ -297,7 +319,8 @@ KDA:
 KEM:
   unofficial_names:
   - Kemerovskaja Oblast
-  translations: Кемеровская область
+  translations:
+    ru: Кемеровская область
   geo:
     latitude: 54.7574648
     longitude: 87.4055288
@@ -309,7 +332,8 @@ KEM:
 KGD:
   unofficial_names:
   - Kaliningradskaja Oblast
-  translations: Калининградская область
+  translations:
+    ru: Калининградская область
   geo:
     latitude: 54.8235292
     longitude: 21.4816163
@@ -321,7 +345,8 @@ KGD:
 KGN:
   unofficial_names:
   - Kurganskaja Oblast
-  translations: Курганская область
+  translations:
+    ru: Курганская область
   geo:
     latitude: 55.4481548
     longitude: 65.11809749999999
@@ -334,7 +359,8 @@ KHA:
   unofficial_names:
   - Habarovskij Kray
   - Habarovsk
-  translations: Хабаровский край
+  translations:
+    ru: Хабаровский край
   geo:
     latitude: 50.5888431
     longitude: 135
@@ -347,7 +373,8 @@ KHM:
   unofficial_names:
   - Hanty-Mansijskij Avtonomnyj Okrug
   - Hanty-Mansija
-  translations: Ханты-Мансийский автономный округ - Югра
+  translations:
+    ru: Ханты-Мансийский автономный округ - Югра
   geo:
     latitude: 62.2287062
     longitude: 70.6410058
@@ -359,7 +386,8 @@ KHM:
 KIR:
   unofficial_names:
   - Kirovskaja Oblast
-  translations: Кировская область
+  translations:
+    ru: Кировская область
   geo:
     latitude: 58.4198529
     longitude: 50.2097248
@@ -372,7 +400,8 @@ KK:
   unofficial_names:
   - Khakass Republic
   - Hakasija
-  translations: Республика Хакасия
+  translations:
+    ru: Республика Хакасия
   geo:
     latitude: 53.0452281
     longitude: 90.3982145
@@ -387,7 +416,8 @@ KL:
   - Kalmyk Republic
   - Khalmg-Tangch
   - Kalmykija
-  translations: Республика Калмыкия
+  translations:
+    ru: Республика Калмыкия
   geo:
     latitude: 46.5676845
     longitude: 45.7731614
@@ -400,7 +430,8 @@ KLU:
   unofficial_names:
   - Kaluzhskaya Oblast
   - Kalužskaja Oblast
-  translations: Калужская область
+  translations:
+    ru: Калужская область
   geo:
     latitude: 54.3872666
     longitude: 35.1889094
@@ -411,7 +442,8 @@ KLU:
   name: Kaluzhskaya oblast'
 KO:
   unofficial_names: Komi, Respublika
-  translations: Республика Коми
+  translations:
+    ru: Республика Коми
   geo:
     latitude: 63.8630539
     longitude: 54.8312689
@@ -423,7 +455,8 @@ KO:
 KOS:
   unofficial_names:
   - Kostromskaja Oblast
-  translations: Костромская область
+  translations:
+    ru: Костромская область
   geo:
     latitude: 58.5501069
     longitude: 43.9541103
@@ -436,7 +469,8 @@ KR:
   unofficial_names:
   - Karelian Republic
   - Karelija
-  translations: Республика Карелия
+  translations:
+    ru: Республика Карелия
   geo:
     latitude: 63.15587019999999
     longitude: 32.9905552
@@ -448,7 +482,8 @@ KR:
 KRS:
   unofficial_names:
   - Kurskaja Oblast
-  translations: Курская область
+  translations:
+    ru: Курская область
   geo:
     latitude: 51.76340260000001
     longitude: 35.3811812
@@ -462,7 +497,8 @@ KYA:
   - Krasnojarsk
   - Krasnojarskij Kraj
   - Krasnojarsk
-  translations: Красноярский край
+  translations:
+    ru: Красноярский край
   geo:
     latitude: 64.24797579999999
     longitude: 95.11041759999999
@@ -474,7 +510,8 @@ KYA:
 LEN:
   unofficial_names:
   - Leningradskaja Oblast
-  translations: Ленинградская область
+  translations:
+    ru: Ленинградская область
   geo:
     latitude: 60.0793208
     longitude: 31.8926644
@@ -487,7 +524,8 @@ LIP:
   unofficial_names:
   - Lipeckaja Oblast
   - Lipeck
-  translations: Липецкая область
+  translations:
+    ru: Липецкая область
   geo:
     latitude: 52.5264702
     longitude: 39.2032269
@@ -499,7 +537,8 @@ LIP:
 MAG:
   unofficial_names:
   - Magadanskaja Oblast
-  translations: Магаданская область
+  translations:
+    ru: Магаданская область
   geo:
     latitude: 62.66434169999999
     longitude: 153.9149909
@@ -512,7 +551,8 @@ ME:
   unofficial_names:
   - Mariy El
   - Marij El
-  translations: Республика Марий Эл
+  translations:
+    ru: Республика Марий Эл
   geo:
     latitude: 56.438457
     longitude: 47.9607757
@@ -525,7 +565,8 @@ MO:
   unofficial_names:
   - Mordovian Republic
   - Mordovija
-  translations: Республика Мордовия
+  translations:
+    ru: Республика Мордовия
   geo:
     latitude: 54.2369441
     longitude: 44.0683969
@@ -536,11 +577,9 @@ MO:
   name: Mordoviya, Respublika
 MOS:
   unofficial_names:
-  - Moskva
-  - Moskau
-  - Moscou
-  - Moscú
-  translations: Московская область
+  - Moskovskaja Oblast
+  translations:
+    ru: Московская область
   geo:
     latitude: 55.340396
     longitude: 38.2917651
@@ -551,8 +590,12 @@ MOS:
   name: Moskovskaya oblast'
 MOW:
   unofficial_names:
-  - Moskovskaja Oblast
-  translations: Москва
+  - Moskva
+  - Moskau
+  - Moscou
+  - Moscú
+  translations:
+    ru: Москва
   geo:
     latitude: 55.755826
     longitude: 37.6173
@@ -564,7 +607,8 @@ MOW:
 MUR:
   unofficial_names:
   - Murmanskaja Oblast
-  translations: Мурманская область
+  translations:
+    ru: Мурманская область
   geo:
     latitude: 67.84426739999999
     longitude: 35.0884101
@@ -576,7 +620,8 @@ MUR:
 NEN:
   unofficial_names:
   - Nenetskij Avtonomnyj Okrug
-  translations: Ненецкий автономный округ
+  translations:
+    ru: Ненецкий автономный округ
   geo:
     latitude: 67.6078337
     longitude: 57.63383309999999
@@ -588,7 +633,8 @@ NEN:
 NGR:
   unofficial_names:
   - Novgorodskaja Oblast
-  translations: Новгородская область
+  translations:
+    ru: Новгородская область
   geo:
     latitude: 58.2427552
     longitude: 32.5665191
@@ -605,7 +651,8 @@ NIZ:
   - Nizhegorodskaya Oblast
   - Nižegorodskaja Oblast
   - Nižnij Novgorod
-  translations: Нижегородская область
+  translations:
+    ru: Нижегородская область
   geo:
     latitude: 55.7995159
     longitude: 44.0296769
@@ -617,7 +664,8 @@ NIZ:
 NVS:
   unofficial_names:
   - Novosibirskaja Oblast
-  translations: Новосибирская область
+  translations:
+    ru: Новосибирская область
   geo:
     latitude: 55.4467133
     longitude: 80.1043924
@@ -629,7 +677,8 @@ NVS:
 OMS:
   unofficial_names:
   - Omskaja Oblast
-  translations: Омская область
+  translations:
+    ru: Омская область
   geo:
     latitude: 55.0554669
     longitude: 73.3167343
@@ -641,7 +690,8 @@ OMS:
 ORE:
   unofficial_names:
   - Orenburgskaja Oblast
-  translations: Оренбургская область
+  translations:
+    ru: Оренбургская область
   geo:
     latitude: 51.76340260000001
     longitude: 54.6188188
@@ -654,7 +704,8 @@ ORL:
   unofficial_names:
   - Orlovskaja Oblast
   - Orjol
-  translations: Орловская область
+  translations:
+    ru: Орловская область
   geo:
     latitude: 52.7450189
     longitude: 36.4849627
@@ -668,6 +719,7 @@ PER:
   - Permskaja Oblast
   translations:
     en: Perm
+    ru: Пермский край
   geo:
     latitude: 58.00000000000001
     longitude: 56.316667
@@ -679,7 +731,8 @@ PER:
 PNZ:
   unofficial_names:
   - Penzenskaja Oblast
-  translations: Пензенская область
+  translations:
+    ru: Пензенская область
   geo:
     latitude: 53.1412105
     longitude: 44.0940048
@@ -693,7 +746,8 @@ PRI:
   - Primorskij
   - Primorskij Kraj
   - Primorje
-  translations: Приморский край
+  translations:
+    ru: Приморский край
   geo:
     latitude: 45.0525641
     longitude: 135
@@ -707,7 +761,8 @@ PSK:
   - Pihkva
   - Pleskau
   - Pskovskaja Oblast
-  translations: Псковская область
+  translations:
+    ru: Псковская область
   geo:
     latitude: 56.7708599
     longitude: 29.094009
@@ -719,7 +774,8 @@ PSK:
 ROS:
   unofficial_names:
   - Rostovskaja Oblast
-  translations: Ростовская область
+  translations:
+    ru: Ростовская область
   geo:
     latitude: 47.6853247
     longitude: 41.8258952
@@ -732,7 +788,8 @@ RYA:
   unofficial_names:
   - Rjazanskaja Oblast
   - Rjazan
-  translations: Рязанская область
+  translations:
+    ru: Рязанская область
   geo:
     latitude: 54.3875964
     longitude: 41.259566
@@ -747,7 +804,8 @@ SA:
   - Sakha
   - Yakutsk-Sakha
   - Saha
-  translations: Республика Саха (Якутия)
+  translations:
+    ru: Республика Саха (Якутия)
   geo:
     latitude: 66.7613451
     longitude: 124.1237531
@@ -760,7 +818,8 @@ SAK:
   unofficial_names:
   - Sahalinskaya Oblast
   - Sahalin
-  translations: Сахалинская область
+  translations:
+    ru: Сахалинская область
   geo:
     latitude: 49.9807847
     longitude: 143.3738129
@@ -772,7 +831,8 @@ SAK:
 SAM:
   unofficial_names:
   - Samarskaja Oblast
-  translations: Самарская область
+  translations:
+    ru: Самарская область
   geo:
     latitude: 53.41838389999999
     longitude: 50.4725528
@@ -784,7 +844,8 @@ SAM:
 SAR:
   unofficial_names:
   - Saratovskaja Oblast
-  translations: Саратовская область
+  translations:
+    ru: Саратовская область
   geo:
     latitude: 51.83692629999999
     longitude: 46.7539397
@@ -799,7 +860,8 @@ SE:
   - North Ossetian Republic
   - Osetija
   - Alanija
-  translations: Республика Северная Осетия-Алания
+  translations:
+    ru: Республика Северная Осетия-Алания
   geo:
     latitude: 43.0451302
     longitude: 44.2870972
@@ -811,7 +873,8 @@ SE:
 SMO:
   unofficial_names:
   - Smolenskaja Oblast
-  translations: Смоленская область
+  translations:
+    ru: Смоленская область
   geo:
     latitude: 54.9882994
     longitude: 32.6677378
@@ -827,7 +890,8 @@ SPE:
   - Sankt Petersburg
   - Saint-Pétersbourg
   - San Petersburgo
-  translations: Санкт-Петербург
+  translations:
+    ru: Санкт-Петербург
   geo:
     latitude: 59.9342802
     longitude: 30.3350986
@@ -839,7 +903,8 @@ SPE:
 STA:
   unofficial_names:
   - Stavropolskij Kraj
-  translations: Ставропольский край
+  translations:
+    ru: Ставропольский край
   geo:
     latitude: 44.6680993
     longitude: 43.520214
@@ -851,7 +916,8 @@ STA:
 SVE:
   unofficial_names:
   - Sverdlovskaja Oblast
-  translations: Свердловская область
+  translations:
+    ru: Свердловская область
   geo:
     latitude: 59.007735
     longitude: 61.9316226
@@ -862,7 +928,8 @@ SVE:
   name: Sverdlovskaya oblast'
 TA:
   unofficial_names: Tatarstan, Respublika
-  translations: Республика Татарстан
+  translations:
+    ru: Республика Татарстан
   geo:
     latitude: 55.1802364
     longitude: 50.7263945
@@ -874,7 +941,8 @@ TA:
 TAM:
   unofficial_names:
   - Tambovskaja Oblast
-  translations: Тамбовская область
+  translations:
+    ru: Тамбовская область
   geo:
     latitude: 52.6416589
     longitude: 41.4216451
@@ -886,7 +954,8 @@ TAM:
 TOM:
   unofficial_names:
   - Tomskaja Oblast
-  translations: Томская область
+  translations:
+    ru: Томская область
   geo:
     latitude: 58.8969882
     longitude: 82.67654999999999
@@ -898,7 +967,8 @@ TOM:
 TUL:
   unofficial_names:
   - Tulskaja Oblast
-  translations: Тульская область
+  translations:
+    ru: Тульская область
   geo:
     latitude: 54.163768
     longitude: 37.5649507
@@ -910,7 +980,8 @@ TUL:
 TVE:
   unofficial_names:
   - Tverskaja Oblast
-  translations: Тверская область
+  translations:
+    ru: Тверская область
   geo:
     latitude: 57.0021654
     longitude: 33.9853142
@@ -922,7 +993,8 @@ TVE:
 TY:
   unofficial_names:
   - Tuva
-  translations: Республика Тыва
+  translations:
+    ru: Республика Тыва
   geo:
     latitude: 51.8872669
     longitude: 95.62601719999999
@@ -936,7 +1008,8 @@ TYU:
   - Tjumenskaja Oblast
   - Tumen
   - Tjumen
-  translations: Тюменская область
+  translations:
+    ru: Тюменская область
   geo:
     latitude: 56.9634387
     longitude: 66.948278
@@ -950,7 +1023,8 @@ UD:
   - Udmurt Republic
   - Udmurtskaya Respublika
   - Udmurtija
-  translations: Удмуртская Республика
+  translations:
+    ru: Удмуртская Республика
   geo:
     latitude: 57.0670218
     longitude: 53.0277948
@@ -963,7 +1037,8 @@ ULY:
   unofficial_names:
   - Uljanovskaja Oblast
   - Uljanovsk
-  translations: Ульяновская область
+  translations:
+    ru: Ульяновская область
   geo:
     latitude: 53.9793357
     longitude: 47.7762426
@@ -975,7 +1050,8 @@ ULY:
 VGG:
   unofficial_names:
   - Volgogradskaja Oblast
-  translations: Волгоградская область
+  translations:
+    ru: Волгоградская область
   geo:
     latitude: 49.7604522
     longitude: 45
@@ -987,7 +1063,8 @@ VGG:
 VLA:
   unofficial_names:
   - Vladimirskaja Oblast
-  translations: Владимирская область
+  translations:
+    ru: Владимирская область
   geo:
     latitude: 56.1553465
     longitude: 40.5926685
@@ -999,7 +1076,8 @@ VLA:
 VLG:
   unofficial_names:
   - Vologodskaja Oblast
-  translations: Вологодская область
+  translations:
+    ru: Вологодская область
   geo:
     latitude: 59.8706711
     longitude: 40.6555411
@@ -1012,7 +1090,8 @@ VOR:
   unofficial_names:
   - Voronežskaja Oblast
   - Voronež
-  translations: Воронежская область
+  translations:
+    ru: Воронежская область
   geo:
     latitude: 50.8589713
     longitude: 39.8644375
@@ -1026,7 +1105,8 @@ YAN:
   - Jamalija
   - Jamalo-Nenetskij Avtonomnyj Okrug
   - Jamalo-Nenets
-  translations: Ямало-Ненецкий автономный округ
+  translations:
+    ru: Ямало-Ненецкий автономный округ
   geo:
     latitude: 66.0653057
     longitude: 76.9345194
@@ -1039,7 +1119,8 @@ YAR:
   unofficial_names:
   - Jaroslavskaja Oblast
   - Jaroslavl
-  translations: Ярославская область
+  translations:
+    ru: Ярославская область
   geo:
     latitude: 57.8991523
     longitude: 38.8388633
@@ -1055,7 +1136,8 @@ YEV:
   - Jewish Autonomous Oblast
   - Yevreyskaya Oblast
   - Jevrej
-  translations: Еврейская автономная область
+  translations:
+    ru: Еврейская автономная область
   geo:
     latitude: 48.4808147
     longitude: 131.7657367
@@ -1069,7 +1151,8 @@ ZAB:
   - Zabajkal'skij kraj
   - Zabajkal'skij
   - Zabaykal'skij kray
-  translations: Забайкальский край
+  translations:
+    ru: Забайкальский край
   geo:
     latitude: 53.0928771
     longitude: 116.967656

data/lib/countries/version.rb

@@ -1,3 +1,3 @@
 module Countries
-  VERSION = '2.0.0.pre.3'
+  VERSION = '2.0.0.pre.4'
 end

data/spec/configuration_spec.rb

@@ -21,6 +21,13 @@ describe 'ISO3166.configuration' do
     expect(ISO3166::Country.new('DE').translation(:es)).to eq nil
   end
 
+  it 'unsupported locales do not affect supported locales' do
+    I18n.available_locales = [:de, :en, :unsupported]
+    ISO3166.reset
+    expect(ISO3166::Country.new('DE').translation(:de)).to eq 'Deutschland'
+    expect(ISO3166::Country.new('DE').translation(:es)).to eq nil
+  end
+
   it 'locales can be changed' do
     ISO3166.configuration.locales = [:de]
     expect(ISO3166::Country.new('DE').translation(:de)).to eq 'Deutschland'

data/spec/data_spec.rb

@@ -80,6 +80,18 @@ describe ISO3166::Data do
     expect(ISO3166::Country.new('DE').translation('de')).to eq nil
   end
 
+  describe '#load_cache' do
+    it 'will return an empty hash for an unsupported locale' do
+      file_array = %w(cache locales unsupported.json)
+      expect(ISO3166::Data.send(:load_cache, file_array)).to eql({})
+    end
+
+    it 'will return json for a supported locale' do
+      file_array = %w(cache locales en.json)
+      expect(ISO3166::Data.send(:load_cache, file_array)).not_to be_empty
+    end
+  end
+
   describe 'hotloading existing data' do
     before do
       ISO3166::Data.register(

data/spec/subdivision_spec.rb

@@ -0,0 +1,18 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+describe ISO3166::Subdivision do
+  let(:countries) { ISO3166::Country.all }
+  let(:available_types) { [Hash, NilClass] }
+
+  describe 'translations' do
+    it 'should be hash or nil' do
+      countries.each do |country|
+        country.subdivisions.each do |_, region|
+          expect(available_types).to include(region.translations.class)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countries
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.3
+  version: 2.0.0.pre.4
 platform: ruby
 authors:
 - Josh Robinson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n_data
@@ -664,6 +664,7 @@ files:
 - spec/mongoid_spec.rb
 - spec/perf_spec.rb
 - spec/spec_helper.rb
+- spec/subdivision_spec.rb
 - spec/timezone_spec.rb
 homepage: http://github.com/hexorx/countries
 licenses: []
@@ -696,5 +697,5 @@ test_files:
 - spec/mongoid_spec.rb
 - spec/perf_spec.rb
 - spec/spec_helper.rb
+- spec/subdivision_spec.rb
 - spec/timezone_spec.rb
-has_rdoc: