Merge branch 'master' of github.com:domify/registry

config/initializers/relaxed_i18n.rb

@@ -4,7 +4,7 @@ module I18n
   class << self
     alias_method :original_localize, :localize
 
-    def localize object, options = {}
+    def localize(object, options = {})
       object.present? ? original_localize(object, options) : ''
     end
   end

config/locales/en.yml

@@ -64,7 +64,7 @@ en:
               invalid: 'Domain name is invalid'
               reserved: 'Domain name is reserved or restricted'
               taken: 'Domain name already exists'
-            name_puny:
+            puny_label:
               too_long: 'Domain name is too long (maximum is 63 characters)'
             registrant:
               blank: 'Registrant is missing'