Removes defining the _() function if not available because it's not required any more
Fixes basket controller tests
Prepares for locale selector