Accept strings as well as functions for localization
Merge pull request #2092 from colemanw/strings

Accept strings as well as functions for localization