Merge pull request #203 from scelis/fix/android-output-folder-name

Fix android output folder name

2 files changed, 6 insertions, 2 deletions

diff --git a/lib/twine/formatters/android.rb b/lib/twine/formatters/android.rb
index 0108de8..b9dba3e 100644
--- a/lib/twine/formatters/android.rb
+++ b/lib/twine/formatters/android.rb
@@ -32,7 +32,7 @@ module Twine
             # The language is defined by a two-letter ISO 639-1 language code, optionally followed by a two letter ISO 3166-1-alpha-2 region code (preceded by lowercase "r").
             # see http://developer.android.com/guide/topics/resources/providing-resources.html#AlternativeResources
             match = /^values-([a-z]{2}(-r[a-z]{2})?)$/i.match(segment)
-            
+
             return match[1].sub('-r', '-') if match
           end
         end
@@ -41,7 +41,7 @@ module Twine
       end
 
       def output_path_for_language(lang)
-        "values-#{lang}"
+        "values-#{lang}".gsub(/-(\p{Lu})/, '-r\1')
       end
 
       def set_translation_for_key(key, lang, value)
diff --git a/test/test_formatters.rb b/test/test_formatters.rb
index ae10a69..a63b0a5 100644
--- a/test/test_formatters.rb
+++ b/test/test_formatters.rb
@@ -157,6 +157,10 @@ class TestAndroidFormatter < FormatterTest
   def test_output_path_is_prefixed
     assert_equal 'values-en', @formatter.output_path_for_language('en')
   end
+
+  def test_output_path_with_region
+    assert_equal 'values-en-rGB', @formatter.output_path_for_language('en-GB')
+  end
 end
 
 class TestAppleFormatter < FormatterTest