From f22472f8dee52e460077e1edd708f0ac70886603 Mon Sep 17 00:00:00 2001
From: Tim Mickel <tim.mickel@gmail.com>
Date: Mon, 11 Jan 2016 14:24:42 -0500
Subject: [PATCH 1/4] Adding arc link to app/src/.gitignore

---
 android/ScratchJr/app/src/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/ScratchJr/app/src/.gitignore b/android/ScratchJr/app/src/.gitignore
index 5ef305a..bbbaa2b 100644
--- a/android/ScratchJr/app/src/.gitignore
+++ b/android/ScratchJr/app/src/.gitignore
@@ -1,2 +1,3 @@
 /official
+/arc
 /pbs

From 7e342b608948db2009bfe541d3de4f10751cbfc0 Mon Sep 17 00:00:00 2001
From: Tim Mickel <tim.mickel@gmail.com>
Date: Tue, 12 Jan 2016 15:09:31 -0500
Subject: [PATCH 2/4] Moving localizations to non-country-code files

---
 editions/free/src/localizations/{en-US.json => en.json} | 0
 editions/free/src/localizations/{es-AR.json => es.json} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename editions/free/src/localizations/{en-US.json => en.json} (100%)
 rename editions/free/src/localizations/{es-AR.json => es.json} (100%)

diff --git a/editions/free/src/localizations/en-US.json b/editions/free/src/localizations/en.json
similarity index 100%
rename from editions/free/src/localizations/en-US.json
rename to editions/free/src/localizations/en.json
diff --git a/editions/free/src/localizations/es-AR.json b/editions/free/src/localizations/es.json
similarity index 100%
rename from editions/free/src/localizations/es-AR.json
rename to editions/free/src/localizations/es.json

From 960a4c43ff5ed4a0484a802a8c18806869dad3ed Mon Sep 17 00:00:00 2001
From: Tim Mickel <tim.mickel@gmail.com>
Date: Tue, 12 Jan 2016 15:11:59 -0500
Subject: [PATCH 3/4] Updating localization includes to use short codes

---
 src/utils/Localization.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/utils/Localization.js b/src/utils/Localization.js
index 893e2e8..2789ee2 100644
--- a/src/utils/Localization.js
+++ b/src/utils/Localization.js
@@ -46,12 +46,13 @@ Localization.includeLocales = function () {
     } else {
         Localization.currentLocale = localizationCookie;
     }
+
+    var topLevel = Localization.currentLocale.split('-')[0];
     // Intl locale-data
     document.write('<script src="' + Localization.root +
-        'jssource/external/Intl/locale-data/jsonp/' + Localization.currentLocale + '.js"><\/script>');
+        'jssource/external/Intl/locale-data/jsonp/' + topLevel + '.js"><\/script>');
 
     // MessageFormat locale-data
-    var topLevel = Localization.currentLocale.split('-')[0];
     document.write('<script src="' + Localization.root +
         'jssource/external/intl-messageformat/locale-data/' + topLevel + '.js"><\/script>');
 
@@ -63,7 +64,7 @@ Localization.includeLocales = function () {
 
     // Get messages synchronously
     var xhr = new XMLHttpRequest();
-    xhr.open('GET', Localization.root + 'localizations/' + Localization.currentLocale + '.json', false);
+    xhr.open('GET', Localization.root + 'localizations/' + topLevel + '.json', false);
     xhr.send(null);
     Localization.localizationMessages = JSON.parse(xhr.responseText);
 

From 4e51b077c2064d800ef58a508b16b90861a6876e Mon Sep 17 00:00:00 2001
From: Tim Mickel <tim.mickel@gmail.com>
Date: Tue, 12 Jan 2016 15:12:52 -0500
Subject: [PATCH 4/4] Updating default locale to short codes

---
 editions/free/src/Settings.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/editions/free/src/Settings.js b/editions/free/src/Settings.js
index f55463b..c3a6172 100644
--- a/editions/free/src/Settings.js
+++ b/editions/free/src/Settings.js
@@ -17,10 +17,10 @@ window.Settings = {
     categoryStopColor: '#D62222',
     paletteBlockShadowOpacity: 0.8,
     autoSaveInterval: 30 * 1000,
-    defaultLocale: 'en-US',
+    defaultLocale: 'en',
     defaultLocaleShort: 'en',
     supportedLocales: {
-        'English': 'en-US',
-        'Español': 'es-AR'
+        'English': 'en',
+        'Español': 'es'
     }
 };