for android, put default language in values folder

splendo · Feb 21, 2012 · 828aac3 · 828aac3
1 parent ce96dcd
commit 828aac3
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/lib/twine/formatters/android.rb b/lib/twine/formatters/android.rb
@@ -24,7 +24,7 @@ class Android < Abstract
       ]
 
       def self.can_handle_directory?(path)
-        Dir.entries(path).any? { |item| /^values-.+$/.match(item) }
+        Dir.entries(path).any? { |item| /^values.*$/.match(item) }
       end
 
       def default_file_name
@@ -34,12 +34,16 @@ def default_file_name
       def determine_language_given_path(path)
         path_arr = path.split(File::SEPARATOR)
         path_arr.each do |segment|
-          match = /^values-(.*)$/.match(segment)
-          if match
-            lang = match[1]
-            lang = LANG_CODES.fetch(lang, lang)
-            lang.sub!('-r', '-')
-            return lang
+          if segment == 'values'
+            return @strings.language_codes[0]
+          else
+            match = /^values-(.*)$/.match(segment)
+            if match
+              lang = match[1]
+              lang = LANG_CODES.fetch(lang, lang)
+              lang.sub!('-r', '-')
+              return lang
+            end
           end
         end