From 37f1d1185902a5b1a79c53f7906728318cef17df Mon Sep 17 00:00:00 2001
From: Sebastian Ludwig <sebastian@lurado.de>
Date: Mon, 21 Nov 2016 21:44:56 +0100
Subject: [PATCH] Fixed #172 by removing language mappings.

---
 lib/twine/formatters/android.rb | 19 +++----------------
 test/test_formatters.rb         | 17 -----------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/lib/twine/formatters/android.rb b/lib/twine/formatters/android.rb
index 24c28aa..3575505 100644
--- a/lib/twine/formatters/android.rb
+++ b/lib/twine/formatters/android.rb
@@ -7,15 +7,6 @@ module Twine
     class Android < Abstract
       include Twine::Placeholders
 
-      LANG_MAPPINGS = Hash[
-        'zh-rCN' => 'zh-Hans',
-        'zh-rHK' => 'zh-Hant',
-        'en-rGB' => 'en-UK',
-        'in' => 'id',
-        'nb' => 'no'
-        # TODO: spanish
-      ]
-
       def format_name
         'android'
       end
@@ -41,12 +32,8 @@ 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)
-            if match
-              lang = match[1]
-              lang = LANG_MAPPINGS.fetch(lang, lang)
-              lang.sub!('-r', '-')
-              return lang
-            end
+            
+            return match[1].sub('-r', '-') if match
           end
         end
 
@@ -54,7 +41,7 @@ module Twine
       end
 
       def output_path_for_language(lang)
-        "values-" + (LANG_MAPPINGS.key(lang) || lang)
+        "values-#{lang}"
       end
 
       def set_translation_for_key(key, lang, value)
diff --git a/test/test_formatters.rb b/test/test_formatters.rb
index 99112c9..b25662a 100644
--- a/test/test_formatters.rb
+++ b/test/test_formatters.rb
@@ -146,10 +146,6 @@ class TestAndroidFormatter < FormatterTest
     assert_equal 'de-AT', @formatter.determine_language_given_path("res/values-de-rAT")
   end
 
-  def test_maps_laguage_deducted_from_resource_folder
-    assert_equal 'zh-Hans', @formatter.determine_language_given_path("res/values-zh-rCN")
-  end
-
   def test_does_not_deduct_language_from_device_capability_resource_folder
     assert_nil @formatter.determine_language_given_path('res/values-w820dp')
   end
@@ -157,19 +153,6 @@ class TestAndroidFormatter < FormatterTest
   def test_output_path_is_prefixed
     assert_equal 'values-en', @formatter.output_path_for_language('en')
   end
-
-  def test_output_path_language_mappings
-    mappings = {
-      'zh-Hans' => 'zh-rCN',
-      'zh-Hant' => 'zh-rHK',
-      'en-UK' => 'en-rGB',
-      'id' => 'in',
-      'no' => 'nb'
-    }
-    mappings.each do |lang, output_path|
-      assert_equal "values-#{output_path}", @formatter.output_path_for_language(lang)
-    end
-  end
 end
 
 class TestAppleFormatter < FormatterTest