Ubercart currently has country information files for 118 countries. The ISO 3166 standard defines 248 countries. That means there are 130 countries that still need CIF files.

CommentFileSizeAuthor
#20 1070342-countries-backport.patch181.69 KBTR
#16 uc_store-countries-backport-1070342-16-D6.patch171.76 KBDavid Lesieur
#15 countries.zip134.11 KBscotwith1t
#13 western_sahara_732_1.cif_.txt567 bytesscotwith1t
#12 djibouti_262_1.cif_.txt950 bytesscotwith1t
#12 eritrea_232_1.cif_.txt974 bytesscotwith1t
#12 libya_434_1.cif_.txt1.78 KBscotwith1t
#12 mauritania_478_1.cif_.txt1.43 KBscotwith1t
#12 sudan_736_1.cif_.txt1.76 KBscotwith1t
#12 syria_760_1.cif_.txt1.27 KBscotwith1t
#12 western_sahara_732.cif_.txt567 bytesscotwith1t
#12 yemen_887_1.cif_.txt1.4 KBscotwith1t
#8 uc_store_backport_countries_d6.patch188.27 KBArtusamak
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

TR’s picture

TR CreditAttribution: TR commented
Status: Active » Fixed

... and done. I'm not going to bother to post all of these and wait for review, I'm just committing them.

longwave’s picture

longwave
he/him
Primary language English
Location UK
CreditAttribution: longwave commented

Wow, nice work.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.

stella’s picture

stella CreditAttribution: stella commented
Status: Closed (fixed) » Needs work

Any chance this could be back-ported to Drupal 6? I've a client requesting this, so am happy to look into it if it's not just a matter of committing the existing cif files.

TR’s picture

TR CreditAttribution: TR commented
Version: 6.x-2.x-dev » 7.x-3.x-dev
Assigned: Unassigned » TR
Status: Patch (to be ported) » Needs work

I'm not planning to back port them myself, but if you wanted to do some or all of them I'd be happy to put them into Ubercart.

longwave’s picture

longwave
he/him
Primary language English
Location UK
CreditAttribution: longwave commented
Version: 7.x-3.x-dev » 6.x-2.x-dev
Assigned: TR » Unassigned
Status: Needs work » Patch (to be ported)

Fixing status and version. There is no patch here, but everything is available in git for 7.x-3.x.

Artusamak’s picture

Artusamak
he/him
Primary language French
Location Bzh
CreditAttribution: Artusamak commented
Version: 7.x-3.x-dev » 6.x-2.x-dev
Assigned: TR » Unassigned
Status: Needs work » Patch (to be ported)

Here is the backport of the cif files for D6.

Artusamak’s picture

Artusamak
he/him
Primary language French
Location Bzh
CreditAttribution: Artusamak commented
FileSize
uc_store_backport_countries_d6.patch188.27 KB

Here is the backport of the cif files for D6.

longwave’s picture

longwave
he/him
Primary language English
Location UK
CreditAttribution: longwave commented
Status: Patch (to be ported) » Needs work

@Artusamak: This looks good, but needs a little bit of work - it changes the existing Canada, India and Russia CIFs and modifies their zones without changing the version number or using an update function to handle existing installations. But we're nearly there with this patch, so well done!

TR’s picture

TR CreditAttribution: TR commented

@Artusamak: Thanks for working on this.

Please make the patch against 6.x-2.x-dev instead of 6.x-2.4. There have been a lot of changes to the CIF files that were made in 6.x-2.x-dev. For example, the latest version of the Canada CIF file is canada_124_2.cif, but your patch is modifying canada_124_1.cif, which no longer exists. I think the reason for the problems that @longwave points out is because you're not using 6.x-2.x-dev.

You patch should only be creating CIF files that don't exist in 6.x-2.x-dev, it should *not* be altering CIF files that are in there already.

ayalsule’s picture

ayalsule CreditAttribution: ayalsule commented

#8 worked for me , thanks

scotwith1t’s picture

scotwith1t
Location Birmingham, AL
CreditAttribution: scotwith1t commented
FileSize
yemen_887_1.cif_.txt1.4 KB
western_sahara_732.cif_.txt567 bytes
syria_760_1.cif_.txt1.27 KB
sudan_736_1.cif_.txt1.76 KB
mauritania_478_1.cif_.txt1.43 KB
libya_434_1.cif_.txt1.78 KB
eritrea_232_1.cif_.txt974 bytes
djibouti_262_1.cif_.txt950 bytes

subscribe. seems pretty straightforward to separate out the new countries from this patch and make new cif files...if i get time, i may do that...in the meantime, i will grab the ones I need and give 'em right back...

arggggg...why can't we upload .cif files? i suppose it's not a very common need. i'll added .txt extension that you can remove after downloading.

scotwith1t’s picture

scotwith1t
Location Birmingham, AL
CreditAttribution: scotwith1t commented
FileSize
western_sahara_732_1.cif_.txt567 bytes

oops, forgot version # on western_sahara

TR’s picture

TR CreditAttribution: TR commented

@phrancescot: Only 121 more to go ... In #8 @Artusamak backported all the 130 .cif files missing from D6 Ubercart. Why would you throw away all that work and start writing .cif files one by one instead of using the patch @Artusamak posted and fixing it to address the issues from #9 and #10? If you want to work on this please start with @Artusamak's patch, which @longwave and I have already spent time reviewing. Don't start over again.

scotwith1t’s picture

scotwith1t
Location Birmingham, AL
CreditAttribution: scotwith1t commented
FileSize
countries.zip134.11 KB

mainly because i'm ignorant when it comes to git and diff files and such...i managed to apply the patch in cygwin to dev and just zipped up the resulting batch of .cif files? is this enough to add to the files? sorry, wish i could contribute the "right" way by correcting this patch...just never learned git. everything imports fine. it also might be useful to some who just need to grab one or 2 files to import instead of a new copy of UC.

David Lesieur’s picture

David Lesieur CreditAttribution: David Lesieur commented
Status: Needs work » Needs review
FileSize
uc_store-countries-backport-1070342-16-D6.patch171.76 KB

Updated the patch based on the latest 6.x-2.x-dev, synchronizing countries with those from 7.x-3.x-dev.

This patch only contains new countries, except for the following countries which have been updated in 7.x-3.x-dev: Bosnia and Herzegovina, Réunion, Venezuela.

David Lesieur’s picture

David Lesieur CreditAttribution: David Lesieur commented

Note that comments #9 and #10 are fixed with that patch.

TR’s picture

TR CreditAttribution: TR commented

Great work. I'm on travel right now so I can't effectively review a patch this big, but as soon as I get back I'll take an in-depth look at in and get it committed.

Artusamak’s picture

Artusamak
he/him
Primary language French
Location Bzh
CreditAttribution: Artusamak commented

#16 Seems OK to me.

TR’s picture

TR CreditAttribution: TR commented
Status: Needs review » Fixed
FileSize
1070342-countries-backport.patch181.69 KB

Thanks for working on this.

I made some minor changes: Removed some trailing whitespace in several files, fixed country_id in trinidad_tobago_780_1.cif to be 780 instead of 'V', fixed 3-character ISO code and version number in costa_rica_188_2.cif, changed country name in aland_islands_248_1.cif to be "Åland Islands" instead of "Aland Islands".

Patch as committed is attached for reference.

longwave’s picture

longwave
he/him
Primary language English
Location UK
CreditAttribution: longwave commented

This is great news. Thanks to everyone who contributed to this patch.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.

TR’s picture

TR CreditAttribution: TR commented

Note that this patch neglected to put the new countries into uc_store.countries.inc. This is needed in 6.x-2.x order to allow the country names to be translated. I fixed uc_store.countries.inc and committed the changes in commit 2d1eb13fc53bf57bf.