From b9d22a04e51a55951c9505c8dab193994507ff67 Mon Sep 17 00:00:00 2001
From: roemhildtg <roemhildtg@gmail.com>
Date: Thu, 2 Mar 2017 16:08:58 -0600
Subject: [PATCH 1/4] move flag icon css to dojo config for package location
 configuration

---
 viewer/js/config/app.js       | 3 +++
 viewer/js/gis/dijit/Locale.js | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/viewer/js/config/app.js b/viewer/js/config/app.js
index 486259e58..322a54645 100644
--- a/viewer/js/config/app.js
+++ b/viewer/js/config/app.js
@@ -15,6 +15,9 @@
             }, {
                 name: 'proj4js',
                 location: '//cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.15'
+            }, {
+                name: 'flag-icon-css',
+                location: '//cdnjs.cloudflare.com/ajax/libs/flag-icon-css/2.3.1'
             }
         ]
     };
diff --git a/viewer/js/gis/dijit/Locale.js b/viewer/js/gis/dijit/Locale.js
index a7b532b9b..32322fc58 100644
--- a/viewer/js/gis/dijit/Locale.js
+++ b/viewer/js/gis/dijit/Locale.js
@@ -19,7 +19,7 @@ define([
     'dojo/text!./Locale/templates/Locale.html',
     'dojo/i18n!./Locale/nls/resource',
 
-    'xstyle/css!https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/2.3.1/css/flag-icon.min.css',
+    'xstyle/css!flag-icon-css/css/flag-icon.min.css',
     'xstyle/css!./Locale/css/Locale.css'
 ], function (
     declare,
@@ -184,4 +184,4 @@ define([
             }
         }
     });
-});
\ No newline at end of file
+});

From 34c448bf0fc00401447a27c2f2dbc3d5e9f42fac Mon Sep 17 00:00:00 2001
From: roemhildtg <roemhildtg@gmail.com>
Date: Thu, 2 Mar 2017 16:09:34 -0600
Subject: [PATCH 2/4] use relative url for i18n path

---
 viewer/js/viewer/_WebMapMixin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/viewer/js/viewer/_WebMapMixin.js b/viewer/js/viewer/_WebMapMixin.js
index 9a4fcd1d4..c1d2be293 100644
--- a/viewer/js/viewer/_WebMapMixin.js
+++ b/viewer/js/viewer/_WebMapMixin.js
@@ -7,7 +7,7 @@ define([
     'esri/arcgis/utils',
     'esri/units',
 
-    'dojo/i18n!config/nls/main'
+    'dojo/i18n!../config/nls/main'
 
 ], function (
     declare,

From 4fbf86a94e8c9363ffb341ff56cec59d9e05c084 Mon Sep 17 00:00:00 2001
From: Tim McGee <github@mmconsult.com>
Date: Thu, 2 Mar 2017 16:58:15 -0800
Subject: [PATCH 3/4] remove dependency on nls for 2 words. To override the
 title, include a config for the widget in viewer.js.

---
 viewer/js/viewer/_WebMapMixin.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/viewer/js/viewer/_WebMapMixin.js b/viewer/js/viewer/_WebMapMixin.js
index c1d2be293..106a302b2 100644
--- a/viewer/js/viewer/_WebMapMixin.js
+++ b/viewer/js/viewer/_WebMapMixin.js
@@ -5,9 +5,7 @@ define([
     'dojo/dom',
 
     'esri/arcgis/utils',
-    'esri/units',
-
-    'dojo/i18n!../config/nls/main'
+    'esri/units'
 
 ], function (
     declare,
@@ -16,9 +14,7 @@ define([
     dom,
 
     arcgisUtils,
-    units,
-
-    i18n
+    units
 ) {
     return declare(null, {
         startup: function () {
@@ -162,7 +158,7 @@ define([
                         id: 'directions',
                         type: 'titlePane',
                         path: 'gis/dijit/Directions',
-                        title: i18n.viewer.widgets.directions,
+                        title: 'Directions',
                         open: false,
                         position: 999,
                         options: {
@@ -186,7 +182,7 @@ define([
                         id: 'measurement',
                         type: 'titlePane',
                         path: 'gis/dijit/Measurement',
-                        title: i18n.viewer.widgets.measure,
+                        title: 'Measurement',
                         open: false,
                         position: 999,
                         options: {

From 9bab91be0f933310c5540d438d7c4b5b606c995e Mon Sep 17 00:00:00 2001
From: Tim McGee <github@mmconsult.com>
Date: Fri, 3 Mar 2017 09:08:58 -0800
Subject: [PATCH 4/4] update flag-icon-css version to most recent.

---
 viewer/js/config/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/viewer/js/config/app.js b/viewer/js/config/app.js
index 322a54645..f83155e22 100644
--- a/viewer/js/config/app.js
+++ b/viewer/js/config/app.js
@@ -17,7 +17,7 @@
                 location: '//cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.15'
             }, {
                 name: 'flag-icon-css',
-                location: '//cdnjs.cloudflare.com/ajax/libs/flag-icon-css/2.3.1'
+                location: '//cdnjs.cloudflare.com/ajax/libs/flag-icon-css/2.8.0'
             }
         ]
     };