Use the post_class filter rather than conditionals in the template files.
Remove old unnecessary $locale stuff for loading the textdomain.