From c6a9424f5ab986f283c642447dd29770e4127d4a Mon Sep 17 00:00:00 2001 From: Juan Pablo Orsay Date: Thu, 3 Aug 2017 17:19:07 -0300 Subject: [PATCH 1/2] Android folder should have the region code preceded by lowercase "r" --- lib/twine/formatters/android.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/twine/formatters/android.rb b/lib/twine/formatters/android.rb index 0108de8..9b207ae 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) From e1984e06c0532eba25a5d31ebf82b77558a3cb21 Mon Sep 17 00:00:00 2001 From: Juan Pablo Orsay Date: Thu, 3 Aug 2017 17:20:49 -0300 Subject: [PATCH 2/2] Fix indentation --- lib/twine/formatters/android.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/twine/formatters/android.rb b/lib/twine/formatters/android.rb index 9b207ae..b9dba3e 100644 --- a/lib/twine/formatters/android.rb +++ b/lib/twine/formatters/android.rb @@ -41,7 +41,7 @@ module Twine end def output_path_for_language(lang) - "values-#{lang}".gsub(/-(\p{Lu})/, '-r\1') + "values-#{lang}".gsub(/-(\p{Lu})/, '-r\1') end def set_translation_for_key(key, lang, value)