Fix translated to use method's ? and ! as locale

r18n-core/lib/r18n-core/translated.rb

@@ -110,9 +110,11 @@ def translations(*methods)
       #   translation :desciption, :type => 'markdown'
       def translation(name, options = {})
         if options[:methods]
-          @unlocalized_getters[name] = R18n::Utils.hash_map(options[:methods]) { |l, i| [ l.to_s, i.to_s ] }
+          @unlocalized_getters[name] = R18n::Utils.
+            hash_map(options[:methods]) { |l, i| [ l.to_s, i.to_s ] }
           unless options[:no_write]
-            @unlocalized_setters[name] =R18n::Utils.hash_map(options[:methods]) { |l, i| [ l.to_s, i.to_s + '=' ] }
+            @unlocalized_setters[name] = R18n::Utils.
+              hash_map(options[:methods]) { |l, i| [ l.to_s, i.to_s + '=' ] }
           end
         end
 
@@ -163,7 +165,7 @@ def #{name}=(*params)
       # didn’t set map in +translation+ option +methods+, it will be detect
       # automatically.
       def unlocalized_getters(method)
-        matcher = Regexp.new('^' + Regexp.escape(method.to_s) + '_(.*[^=])$')
+        matcher = Regexp.new('^' + Regexp.escape(method.to_s) + '_(\w+)$')
         unless @unlocalized_getters.has_key? method
           @unlocalized_getters[method] = {}
           self.instance_methods.reject { |i| not i =~ matcher }.each do |i|
@@ -177,7 +179,7 @@ def unlocalized_getters(method)
       # didn’t set map in +translation+ option +methods+, it will be detect
       # automatically.
       def unlocalized_setters(method)
-        matcher = Regexp.new('^' + Regexp.escape(method.to_s) + '_(.*)=$')
+        matcher = Regexp.new('^' + Regexp.escape(method.to_s) + '_(\w+)=$')
         unless @unlocalized_setters.has_key? method
           @unlocalized_setters[method] = {}
           self.instance_methods.reject { |i| not i =~ matcher }.each do |i|

r18n-core/spec/translated_spec.rb

@@ -7,6 +7,9 @@
     @user_class = Class.new do
       include R18n::Translated
       attr_accessor :name_ru, :name_en
+
+      def name_ru?; end
+      def name_ru!; end
     end
     R18n.set(R18n::I18n.new('en'))
   end

r18n-rails/spec/rails_spec.rb

@@ -91,6 +91,9 @@
     @post.title_ru.should == 'Запись'
     @post.title_en.should == 'Record'
     @post.title.should == 'Запись'
+
+    Post.unlocalized_getters(:title).should == { 'ru' => 'title_ru',
+                                                 'en' => 'title_en' }
   end
 
 end