Permalink
Browse files

remove all lang code from country fixtures

  • Loading branch information...
geraldb committed Dec 9, 2012
1 parent fe69447 commit 68c15468f1b45b6c857b4da882b88c447f86009d
Showing with 49 additions and 50 deletions.
  1. +3 −2 africa/3_more/lang.yml
  2. +5 −5 africa/countries.txt
  3. +4 −6 america/3_more/lang.yml
  4. +26 −26 america/countries.txt
  5. +9 −9 europe/countries.txt
  6. +2 −2 oceania/countries.txt
View
@@ -31,12 +31,13 @@ ly: ar
ma: ar
mg: mg,fr
ml: fr
-mq: fr
mr: ar,fr
mu: fr,en # mfe
mw: en,ny
mz: pt
-na: en,sf,de
+
+### todo: check sf - no iso code found -- check again and add it if exists to na
+na: en,de
ne: fr
ng: en
rw: rw,fr,en
View
@@ -52,11 +52,11 @@ st, São Tomé and Príncipe, STP, 1_001, 183_176, São Tomé, un|fifa|centr
###############
## Northern Africa
-dz, Algeria, ALG, 2_381_740, 34_178_188, un|fifa|ar|northern africa
-eg, Egypt, EGY, 1_001_450, 82_868_000, un|fifa|ar|northern africa|middle_east
-ma, Morocco, MAR, 446_550, 34_859_364, un|fifa|ar|northern africa
-ly, Libya, LBY, 1_759_540, 6_310_434, un|fifa|ar|northern africa
-tn, Tunisia, TUN, 163_610, 10_486_339, un|fifa|ar|northern africa
+dz, Algeria, ALG, 2_381_740, 34_178_188, un|fifa|northern africa
+eg, Egypt, EGY, 1_001_450, 82_868_000, un|fifa|northern africa|middle_east
+ma, Morocco, MAR, 446_550, 34_859_364, un|fifa|northern africa
+ly, Libya, LBY, 1_759_540, 6_310_434, un|fifa|northern africa
+tn, Tunisia, TUN, 163_610, 10_486_339, un|fifa|northern africa
ss, South Sudan, SSD, 619_745, 8_260_490, Juba, un|fifa|northern africa
sd, Sudan, SDN, 1_886_068, 30_894_000, Khartoum, un|fifa|northern africa
View
@@ -13,24 +13,22 @@ mx: es
## carribean
+ag: en
+
## south america
-ag: en
+ar: es
ve: es
br: pt
+bo: es,qu,ay
tt: en
uy: es
vc: en
-
-ai: en
-ar: es
bb: en
-bm: en
-bo: es,qu,ay
bs: en
bz: en
cl: es
View
@@ -15,26 +15,26 @@
# area (in sq km), pop(ulation)
-ca, Canada, CAN, 9_984_670, 34_278_406, en|fr| un|fifa|north america|g8|g20|commonwealth
-us, United States, USA, 9_629_091, 314_167_157, en|es| un|fifa|north america|g8|g20
-mx, México [Mexico], MEX, 1_972_550, 112_322_757, es| un|fifa|north america|g5|g20
+ca, Canada, CAN, 9_984_670, 34_278_406, un|fifa|north america|g8|g20|commonwealth
+us, United States, USA, 9_629_091, 314_167_157, un|fifa|north america|g8|g20
+mx, México [Mexico], MEX, 1_972_550, 112_322_757, un|fifa|north america|g5|g20
#####################
## central america & caribbean islands
-bz, Belize, BLZ, 22_966, 307_000, un|fifa|en|es|central_america|commonwealth
-gt, Guatemala, GUA, 108_889, 14_027_000, un|fifa|es|central_america
-cr, Costa Rica, CRC, 51_100, 4_579_000, un|fifa|es|central_america
-hn, Honduras, HON, 112_492, 7_466_000, un|fifa|es|central_america
-sv, El Salvador, SLV, 21_041, 6_163_000, un|fifa|es|central_america
-ni, Nicaragua, NCA, 130_373, 5_743_000, un|fifa|es|central_america
-pa, Panamá [Panama], PAN, 75_417, 3_454_000, un|fifa|es|central_america
+bz, Belize, BLZ, 22_966, 307_000, un|fifa|central_america|commonwealth
+gt, Guatemala, GUA, 108_889, 14_027_000, un|fifa|central_america
+cr, Costa Rica, CRC, 51_100, 4_579_000, un|fifa|central_america
+hn, Honduras, HON, 112_492, 7_466_000, un|fifa|central_america
+sv, El Salvador, SLV, 21_041, 6_163_000, un|fifa|central_america
+ni, Nicaragua, NCA, 130_373, 5_743_000, un|fifa|central_america
+pa, Panamá [Panama], PAN, 75_417, 3_454_000, un|fifa|central_america
-cu, Cuba, CUB, 109_886, 11_204_000, un|fifa|es|caribbean
-jm, Jamaica, JAM, 10_991, 2_719_000, un|fifa|en|caribbean|commonwealth
-pr, Puerto Rico, PUR, 8_870, 3_982_000, country:us, fifa|es|en|caribbean
-do, Dominican Republic, DOM, 48_671, 10_090_000, un|fifa|es|caribbean
+cu, Cuba, CUB, 109_886, 11_204_000, un|fifa|caribbean
+jm, Jamaica, JAM, 10_991, 2_719_000, un|fifa|caribbean|commonwealth
+pr, Puerto Rico, PUR, 8_870, 3_982_000, country:us, fifa|caribbean
+do, Dominican Republic, DOM, 48_671, 10_090_000, un|fifa|caribbean
ht, Haiti, HAI, 27_750, 9_719_932, Port-au-Prince, un|fifa|caribbean
ag, Antigua and Barbuda, ATG, 440, 81_799, Saint John's, un|fifa|caribbean|microstate|commonwealth
@@ -56,15 +56,15 @@ tt, Trinidad and Tobago, TRI, 5_131, 1_346_350, Port of Spain, un|fifa|car
## - southern cone - see http://en.wikipedia.org/wiki/Southern_Cone
## - andean states - see http://en.wikipedia.org/wiki/Andean_states
-ar, Argentina, ARG, 2_780_400, 40_518_425, un|fifa|es| south america|g20|southern_cone
-bo, Bolivia, BOL, 1_098_581, 10_907_778, un|fifa|es|qu|ay| south america|andean_states
-br, Brazil, BRA, 8_514_215, 192_380_000, un|fifa|pt| south america|g5|g20|southern_cone
-cl, Chile, CHI, 755_696, 16_763_470, un|fifa|south america|es|southern_cone
-co, Colombia, COL, 1_138_748, 46_413_791, un|fifa|south america|es|andean_states
-ec, Ecuador, ECU, 258_238, 15_007_343, un|fifa|south america|es|qu|andean_states
-gy, Guyana, GUY, 214_970, 752_940, un|fifa|south america|en|commonwealth
-pe, Peru, PER, 1_285_220, 29_546_963, un|fifa|south america|es|andean_states
-sr, Suriname, SUR, 163_820, 492_829, un|fifa|south america|nl
-py, Paraguay, PAR, 406_752, 6_375_830, un|fifa|south america|es|southern_cone
-uy, Uruguay, URU, 176_215, 3_510_386, un|fifa|south america|es|southern_cone
-ve, Venezuela, VEN, 916_445, 28_833_845, un|fifa|south america|es|andean_states ## add to andean too - why? why not?
+ar, Argentina, ARG, 2_780_400, 40_518_425, un|fifa|south america|g20|southern_cone
+bo, Bolivia, BOL, 1_098_581, 10_907_778, un|fifa|south america|andean_states
+br, Brazil, BRA, 8_514_215, 192_380_000, un|fifa|south america|g5|g20|southern_cone
+cl, Chile, CHI, 755_696, 16_763_470, un|fifa|south america|southern_cone
+co, Colombia, COL, 1_138_748, 46_413_791, un|fifa|south america|andean_states
+ec, Ecuador, ECU, 258_238, 15_007_343, un|fifa|south america|andean_states
+gy, Guyana, GUY, 214_970, 752_940, un|fifa|south america|commonwealth
+pe, Peru, PER, 1_285_220, 29_546_963, un|fifa|south america|andean_states
+sr, Suriname, SUR, 163_820, 492_829, un|fifa|south america
+py, Paraguay, PAR, 406_752, 6_375_830, un|fifa|south america|southern_cone
+uy, Uruguay, URU, 176_215, 3_510_386, un|fifa|south america|southern_cone
+ve, Venezuela, VEN, 916_445, 28_833_845, un|fifa|south america|andean_states ## add to andean too - why? why not?
View
@@ -57,32 +57,32 @@ eu, European Union, EUR, 4_324_782, 503_492_041, supra, g20 # NB: no FIFA c
## todo: auto-add tag eu?? for supra:eu?
-at, Austria, AUT, 83_871, 8_414_638, supra:eu, un|fifa|uefa|de| eu|euro|schengen|central_europe|western_europe
-be, Belgium, BEL, 30_528, 11_007_020, supra:eu, un|fifa|uefa|nl|fr|de| eu|euro|schengen|benelux
+at, Austria, AUT, 83_871, 8_414_638, supra:eu, un|fifa|uefa|eu|euro|schengen|central_europe|western_europe
+be, Belgium, BEL, 30_528, 11_007_020, supra:eu, un|fifa|uefa|eu|euro|schengen|benelux
cy, Cyprus, CYP, 9_251, 1_099_341, supra:eu, un|fifa|uefa|eu|euro|asia|western asia|middle_east|mediterranean|southern_europe|commonwealth
-de, Germany, GER, 357_050, 81_799_600, supra:eu, un|fifa|uefa|de| eu|euro|schengen|g8|g20|western europe|central_europe
+de, Germany, GER, 357_050, 81_799_600, supra:eu, un|fifa|uefa|eu|euro|schengen|g8|g20|western europe|central_europe
ee, Estonia, EST, 45_226, 1_340_194, supra:eu, un|fifa|uefa|eu|euro|schengen|uefa|northern europe|baltic|eastern_europe
es, Spain, ESP, 506_030, 46_030_109, supra:eu, un|fifa|uefa|eu|euro|schengen|southern_europe
fi, Finland, FIN, 338_145, 5_391_700, supra:eu, un|fifa|uefa|eu|euro|schengen|northern europe|nordic
fr, France, FRA, 674_843, 65_821_885, supra:eu, un|fifa|uefa|eu|euro|schengen|g8|g20|western_europe
-gr, Greece, GRE, 131_990, 10_787_690, supra:eu, un|fifa|uefa|eu|euro|schengen|southern_europe # NB: ISO (GRC) <> FIFA (GRE)
+gr, Greece, GRE, 131_990, 10_787_690, supra:eu, un|fifa|uefa|eu|euro|schengen|southern_europe
ie, Irland, IRL, 70_273, 4_722_028, supra:eu, un|fifa|uefa|eu|euro|northern europe|western_europe
it, Italy, ITA, 301_318, 60_681_514, supra:eu, un|fifa|uefa|eu|euro|schengen|g8|g20|southern_europe
lu, Luxembourg, LUX, 2_586, 511_840, supra:eu, un|fifa|uefa|eu|euro|schengen|benelux|western_europe
mt, Malta, MLT, 316, 417_608, supra:eu, un|fifa|uefa|eu|euro|schengen|microstate|mediterranean|southern_europe|commonwealth
nl, Netherlands, NED, 41_526, 16_703_700, supra:eu, un|fifa|uefa|eu|euro|schengen|benelux|western_europe
-pt, Portugal, POR, 92_391, 10_647_763, supra:eu, un|fifa|uefa|eu|euro|schengen|southern_europe # NB: ISO (PRT) <> FIFA (POR)
+pt, Portugal, POR, 92_391, 10_647_763, supra:eu, un|fifa|uefa|eu|euro|schengen|southern_europe
sk, Slovakia, SVK, 49_037, 5_440_078, supra:eu, un|fifa|uefa|eu|euro|schengen|central_europe
si, Slovenia, SVN, 20_273, 2_048_951, supra:eu, un|fifa|uefa|eu|euro|schengen|southern_europe|central_europe
-bg, Bulgaria, BUL, 110_994, 7_364_570, supra:eu, un|fifa|uefa|eu|eastern_europe|southeastern_europe
+bg, Bulgaria, BUL, 110_994, 7_364_570, supra:eu, un|fifa|uefa|eu|eastern_europe|southeastern_europe
dk, Denmark, DEN, 43_094, 5_564_219, supra:eu, un|fifa|uefa|eu|schengen|northern europe|scandinavia|nordic
lv, Latvija [Latvia], LVA, 64_589, 2_245_357, supra:eu, un|fifa|uefa|eu|schengen|northern europe|baltic
lt, Lithuania, LTU, 65_303, 3_207_060, supra:eu, un|fifa|uefa|eu|schengen|northern europe|baltic
pl, Poland, POL, 312_683, 38_186_860, supra:eu, un|fifa|uefa|eu|schengen|central_europe
ro, Romania, ROU, 238_391, 19_042_936, supra:eu, un|fifa|uefa|eu|eastern_europe|southeastern_europe
se, Sweden, SWE, 449_964, 9_415_570, supra:eu, un|fifa|uefa|eu|schengen|northern europe|scandinavia|nordic
-cz, Czech Republic, CZE, 78_866, 10_535_811, supra:eu, un|fifa|uefa|cs|sk| eu|schengen|central_europe
+cz, Czech Republic, CZE, 78_866, 10_535_811, supra:eu, un|fifa|uefa|eu|schengen|central_europe
hu, Hungary, HUN, 93_030, 9_979_000, supra:eu, un|fifa|uefa|eu|schengen|central_europe
## todo/check: make a distinction between uk and gb?
@@ -102,8 +102,8 @@ fo, Faroe Islands, FRO, 1_399, 49_267, country:dk, fifa|uefa|northern
ad, Andorra, AND, 468, 85_082, un|fifa|uefa|microstate|western_europe
al, Albania, ALB, 28_748, 3_002_859, un|fifa|uefa|southern_europe|balkans|southeastern_europe
by, Belarus, BLR, 207_600, 9_643_566, un|fifa|uefa|eastern_europe
-ch, Switzerland, SUI, 41_285, 7_866_500, un|fifa|uefa|de|fr|it|rm| schengen|western_europe|central_europe
-hr, Croatia, CRO, 56_594, 4_290_612, un|fifa|uefa|southern_europe|balkans|southeastern_europe # NB: ISO (HRV) <> FIFA (CRO); local name: Hrvatska
+ch, Switzerland, SUI, 41_285, 7_866_500, un|fifa|uefa|schengen|western_europe|central_europe
+hr, Croatia, CRO, 56_594, 4_290_612, un|fifa|uefa|southern_europe|balkans|southeastern_europe
rs, Serbia, SRB, 88_361, 7_276_604, un|fifa|uefa|southern_europe|balkans|southeastern_europe
ru, Russia, RUS, 17_098_242, 142_517_670, un|fifa|uefa|asia|north asia|g8|g20
tr, Turkey, TUR, 783_562, 79_749_461, un|fifa|uefa|asia|western asia|g20
View
@@ -8,7 +8,7 @@
## - Polynesia
-au, Australia, AUS, 7_686_850, 22_028_000, un|fifa|en|g20|commonwealth
+au, Australia, AUS, 7_686_850, 22_028_000, un|fifa|g20|commonwealth
##############
### Melanesia
@@ -34,7 +34,7 @@ ki, Kiribati, KIR, 811, 103_500, Tarawa, un|micronesia|microstate|commonwealth
## Polynesia
## see http://en.wikipedia.org/wiki/Polynesia
-nz, New Zealand, NZL, 268_680, 4_108_037, un|fifa|en|polynesia|commonwealth
+nz, New Zealand, NZL, 268_680, 4_108_037, un|fifa|polynesia|commonwealth
ws, Samoa, SAM, 2_831, 194_320, Apia, un|fifa|polynesia|commonwealth
to, Tonga, TGA, 748, 103_036, Nuku'alofa, un|fifa|polynesia|microstate|commonwealth
tv, Tuvalu, TUV, 26, 10_544, Funafuti, un|polynesia|microstate|commonwealth # nb: use ISO code; NOT fifa member

0 comments on commit 68c1546

Please sign in to comment.