Details
-
Type:
Patch
-
Status: Done/Fixed
-
Priority:
Minor
-
Resolution: Fixed/Completed
-
Affects Version/s: 3.2.3
-
Fix Version/s: 3.3.alpha
-
Component/s: Core CiviCRM
-
Labels:None
Description
Currently the CRM/Core/BAO/Address.php parseStreetAddress function support just US civic address formats.
This patch provides support for putting units at the beginning of the address, in conformity with Canadian addressing formats:
2-123 Main St
It also supports the Canadian French habit of putting a comma after the street number (and suffix) and before the street type:
123, rue Principale
Finally there was a small bug that resulted in street_number_suffix being returned with a zero-length string in some cases rather than a Null value.
Also attached are PHPUnit tests for this function. Note that I ran the tests using the parseStreetAddressTest.php file. I cut and pasted its functions into the AddressTest.php file (patch attached) but haven't tested that setup.
Attachments
Activity
checked in r 30394
Neha or Rahul,
The change you made to the code to handle the case of a NULL locale argument means that if the locale is not supported it no longer silently defaults to en_US, but presents an error message every time an address is saved. To my mind, many locales can use the default en_US parsing without a problem, which is why I only presented the error message if there was a call that explicitly requested a non-supported locale. I think it would be best to revert to the submitted code.
Joe,
Have fixed and committed. ( https://fisheye2.atlassian.com/changelog/CiviCRM?cs=30707 ). Thanks.
Rahul.
Rahul, the patch could benefit from some tests that checked the handling of different locales in the global variable and not just the passed parameter. I also didn't include tests to check what happens when the address passed in was not in a correct format, as the original code didn't do anything to look for or handle such cases.
On another note, I just added some documentation about this to http://wiki.civicrm.org/confluence/display/CRMDOC32/CiviCRM+Localisation#CiviCRMLocalisation-AddressParsing.