Need a tweak to a Date-related Custom Function, please

Howdy, all:

I'm trying to tweak the CF in the attached solution to accommodate our hockey-crazed neighbors to the north so that when a user enters a date into the Date__lxd field (e.g., 09.28.2011), selects dd-MON-yyyy from _g__DateFormatChoice__gxt's pop-up menu, the output in Date__lct will be 28-SEP-2011.

Here's the text of the CF:

Let(

date = GetAsDate( the_date );

Case(

IsEmpty( date );

"";

Substitute(

format;

[ "dd"; Right( "0" & Day( date ); 2 ) ];

[ "mm"; Right( "0" & Month( date ); 2 ) ];

[ "yyyy"; Year( date ) ];

[ "yy"; Right( "0" & Year( date ); 2 ) ]

)

)

)

Along these same lines, short of creating two separate solutions to accommodate the date format differences between our countries (Canada and USA), is there a way to set a pop-up field-fired default format for all the date fields within a solution so if a Canadian selects CANADA from the pop-up all the date fields will have the default custom set-up of dd-MON-yyyy, or if a U.S. user selects USA from the pop-up all the date fields will have the default customer set-up of mm.dd.yyyy?

TIA for your help!

Date Problem.fp7.zip