Finished improving localization using Base Internationalization