Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Italian republic #339

Merged
merged 2 commits into from
Aug 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: countrycode
Title: Convert Country Names and Country Codes
Version: 1.5.0.9000
Version: 1.5.0.9001
Authors@R:
c(person(given = "Vincent",
family = "Arel-Bundock",
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

* `countryname` gets the `nomatch` argument.
* `countryname` returns NA when the code does not support a given country. (Issue #336)
* Improved regex for Italy

# countrycode 1.5.0

Expand Down
Binary file modified data/codelist.rda
Binary file not shown.
Binary file modified data/codelist_panel.rda
Binary file not shown.
412 changes: 206 additions & 206 deletions dictionary/codelist_panel_without_cldr.csv

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dictionary/codelist_without_cldr.csv
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ MAF,.iq,Asia,Irak,\birak|mesopotamia,Iraq,\biraq|mesopotamia,Irak,irak(ien)?,Ira
OECD1990,.ie,Europe,Irland,irland,Ireland,^(?!.*north).*\bireland,Irlande,irlande|irlandais,Irlanda,irland,Ireland,IRE,205,Euro,,IE,EU,Eurocontrol,ESRA North-West,IE,104,EI,119,IE,IRL,372,IRE,205,EUR,178,IRL,Ireland,Irlande (l'),IE,IRL,372,EUR,978,Ireland,IRE,205,IRE,205,Europe & Central Asia,Northern Europe,372,أيرلندا,Ireland,Irlanda,Irlande,Ирландия,爱尔兰,150,Europe,,,154,Northern Europe,IRE,Europe,🇮🇪,372,81,Ireland,IRL,IE,IRL,372
OECD1990,.im,Europe,Isle of Man,^(?=.*isle).*\bman|^man.*insel,Isle of Man,^(?=.*isle).*\bman,Île de Man,^(?=.*ile).*\bman|^(?=.*île).*(de|of).*\bman|\biom\b,Isola di Man,^(?=.*isle).*\bman|^(?=.*isola).*\bman|\biom\b,,,,Pound Sterling,,IM,,Eurocontrol,ESRA North-West,IM,264,IM,120,IM,IMN,833,,,,,,Isle of Man,Île de Man,IM,IMN,833,GBP,826,,,,,,Europe & Central Asia,Northern Europe,833,,,,,,,150,Europe,,,154,Northern Europe,,,🇮🇲,833,,,IMN,IM,IMN,
MAF,.il,Asia,Israel,israel,Israel,israel,Israël,isra(e|ë)l(ien)?,Israele,israel,Israel,ISR,666,New Israeli Sheqel,,IL,,Middle East,Middle-East,IL,105,IS,121,IL,ISR,376,ISR,666,EUR,436,ISR,Israel,Israël,IL,ISR,376,ILS,376,Israel,ISR,666,ISR,666,Middle East & North Africa,Western Asia,376,إسرائيل,Israel,Israel,Israël,Израиль,以色列,142,Asia,,,145,Western Asia,ISR,Middle East and North Africa,🇮🇱,376,169,Israel,ISR,IL,ISR,376
OECD1990,.it,Europe,Italien,italien,Italy,italy,Italie,itali(e|ien),Italia,italia(no)?,Italy,ITA,325,Euro,,IT,EU,Eurocontrol,ESRA Mediterranean,IT,106,IT,122,IT,ITA,380,ITA,325,EUR,136,ITA,Italy,Italie (l'),IT,ITA,380,EUR,978,Italy,ITA,325,ITA,325,Europe & Central Asia,Southern Europe,380,إيطاليا,Italy,Italia,Italie,Италия,意大利,150,Europe,,,39,Southern Europe,ITA,Europe,🇮🇹,380,82,Italy,ITA,IT,ITA,380
OECD1990,.it,Europe,Italien,italien|italienische.?.?republi,Italy,italy|italian.?republic,Italie,itali(e|ien),Italia,italia(no)?,Italy,ITA,325,Euro,,IT,EU,Eurocontrol,ESRA Mediterranean,IT,106,IT,122,IT,ITA,380,ITA,325,EUR,136,ITA,Italy,Italie (l'),IT,ITA,380,EUR,978,Italy,ITA,325,ITA,325,Europe & Central Asia,Southern Europe,380,إيطاليا,Italy,Italia,Italie,Италия,意大利,150,Europe,,,39,Southern Europe,ITA,Europe,🇮🇹,380,82,Italy,ITA,IT,ITA,380
LAM,.jm,Americas,Jamaika,jamaika,Jamaica,jamaica,Jamaïque,jama(i|ï)que,Giamaica,giamaica,Jamaica,JAM,51,Jamaican Dollar,,JM,,Southern America,Mid-Atlantic,JM,109,JM,123,JM,JAM,388,JAM,51,CARSAM,343,JAM,Jamaica,Jamaïque (la),JM,JAM,388,JMD,388,Jamaica,JAM,51,JAM,51,Latin America & Caribbean,Caribbean,388,جامايكا,Jamaica,Jamaica,Jamaïque,Ямайка,牙买加,19,Americas,29,Caribbean,419,Latin America and the Caribbean,JAM,The Americas,🇯🇲,388,120,Jamaica,JAM,JM,JAM,388
OECD1990,.jp,Asia,Japan,japan,Japan,japan,Japon,japon,Giappone,giappone,Japan,JPN,740,Yen,,JP,,Asia,Asia/Pacific,JP,110,JA,126,JP,JPN,392,JPN,740,ASIAPAC,158,JPN,Japan,Japon (le),JP,JPN,392,JPY,392,Japan,JPN,740,JPN,740,East Asia & Pacific,Eastern Asia,392,اليابان,Japan,Japón,Japon,Япония,日本,142,Asia,,,30,Eastern Asia,JPN,Asia and the Pacific,🇯🇵,392,9,Japan,JPN,JP,JPN,392
OECD1990,.je,Europe,Jersey,jersey,Jersey,jersey,Jersey,jersey,Jersey,jersey,,,,Pound Sterling,,JE,,Eurocontrol,ESRA North-West,JE,283,JE,128,JE,JEY,832,,,,,,Jersey,Jersey,JE,JEY,832,GBP,826,,,,,,Europe & Central Asia,Northern Europe,832,,,,,,,150,Europe,830,Channel Islands,154,Northern Europe,,,🇯🇪,,,,,,,
Expand Down
2 changes: 1 addition & 1 deletion dictionary/data_regex.csv
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Irak,\birak|mesopotamia,Iraq,\biraq|mesopotamia,Irak,irak(ien)?,Iraq,iraq|irache
Irland,irland,Ireland,^(?!.*north).*\bireland,Irlande,irlande|irlandais,Irlanda,irland
Isle of Man,^(?=.*isle).*\bman|^man.*insel,Isle of Man,^(?=.*isle).*\bman,Île de Man,^(?=.*ile).*\bman|^(?=.*île).*(de|of).*\bman|\biom\b,Isola di Man,^(?=.*isle).*\bman|^(?=.*isola).*\bman|\biom\b
Israel,israel,Israel,israel,Israël,isra(e|ë)l(ien)?,Israele,israel
Italien,italien,Italy,italy,Italie,itali(e|ien),Italia,italia(no)?
Italien,italien|italienische.?.?republi,Italy,italy|italian.?republic,Italie,itali(e|ien),Italia,italia(no)?
Jamaika,jamaika,Jamaica,jamaica,Jamaïque,jama(i|ï)que,Giamaica,giamaica
Japan,japan,Japan,japan,Japon,japon,Giappone,giappone
Jersey,jersey,Jersey,jersey,Jersey,jersey,Jersey,jersey
Expand Down
4 changes: 4 additions & 0 deletions tests/testthat/data-known-name-variations.R
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ variations <- list(
"Ireland"
),

"Italy" = c(
"Italian Republic"
),

"Martinique" = c(
"France, Martinique",
"Martinique, France"
Expand Down
Loading