Browse Source

HPCC-24797 Refactor locale and TypeScript support

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
Gordon Smith 4 years ago
parent
commit
4214be33e3
100 changed files with 536 additions and 474 deletions
  1. 113 146
      esp/files/Login.html
  2. 1 0
      esp/src/.gitignore
  3. 1 2
      esp/src/CMakeLists.txt
  4. 4 3
      esp/src/eclwatch/ActivityWidget.js
  5. 4 3
      esp/src/eclwatch/ClusterProcessesQueryWidget.js
  6. 4 3
      esp/src/eclwatch/CurrentUserDetailsWidget.js
  7. 4 3
      esp/src/eclwatch/DFUQueryWidget.js
  8. 1 0
      esp/src/eclwatch/DFUSearchWidget.js
  9. 4 3
      esp/src/eclwatch/DFUWUDetailsWidget.js
  10. 1 0
      esp/src/eclwatch/DelayLoadWidget.js
  11. 4 3
      esp/src/eclwatch/DiskUsageDetails.js
  12. 4 3
      esp/src/eclwatch/DiskUsageWidget.js
  13. 4 3
      esp/src/eclwatch/DynamicESDLDefinitionDetailsWidget.js
  14. 4 3
      esp/src/eclwatch/DynamicESDLDefinitionQueryWidget.js
  15. 4 3
      esp/src/eclwatch/DynamicESDLDetailsWidget.js
  16. 4 3
      esp/src/eclwatch/DynamicESDLMethodWidget.js
  17. 4 3
      esp/src/eclwatch/DynamicESDLQueryWidget.js
  18. 1 0
      esp/src/eclwatch/ECLPlaygroundResultsWidget.js
  19. 4 3
      esp/src/eclwatch/ECLPlaygroundWidget.js
  20. 4 3
      esp/src/eclwatch/ECLSourceWidget.js
  21. 4 3
      esp/src/eclwatch/EventScheduleWorkunitWidget.js
  22. 4 3
      esp/src/eclwatch/FileBelongsToWidget.js
  23. 4 3
      esp/src/eclwatch/FileBloomsWidget.js
  24. 4 3
      esp/src/eclwatch/FileHistoryWidget.js
  25. 4 3
      esp/src/eclwatch/FilePartsWidget.js
  26. 4 3
      esp/src/eclwatch/FileProtectListWidget.js
  27. 5 4
      esp/src/eclwatch/FilterDropDownWidget.js
  28. 4 3
      esp/src/eclwatch/FullResultWidget.js
  29. 4 3
      esp/src/eclwatch/GetDFUWorkunitsWidget.js
  30. 4 3
      esp/src/eclwatch/GetNumberOfFilesToCopyWidget.js
  31. 4 3
      esp/src/eclwatch/GraphPageWidget.js
  32. 4 3
      esp/src/eclwatch/GraphWidget.js
  33. 1 0
      esp/src/eclwatch/GraphsLFWidget.js
  34. 1 0
      esp/src/eclwatch/GraphsQueryWidget.js
  35. 1 0
      esp/src/eclwatch/GraphsWUWidget.js
  36. 4 3
      esp/src/eclwatch/GraphsWidget.js
  37. 4 3
      esp/src/eclwatch/GridDetailsWidget.js
  38. 4 3
      esp/src/eclwatch/GroupDetailsWidget.js
  39. 4 3
      esp/src/eclwatch/HPCCPlatformECLWidget.js
  40. 4 3
      esp/src/eclwatch/HPCCPlatformFilesWidget.js
  41. 4 3
      esp/src/eclwatch/HPCCPlatformMainWidget.js
  42. 4 3
      esp/src/eclwatch/HPCCPlatformOpsWidget.js
  43. 4 3
      esp/src/eclwatch/HPCCPlatformRoxieWidget.js
  44. 4 3
      esp/src/eclwatch/HPCCPlatformServicesPluginWidget.js
  45. 64 64
      esp/src/eclwatch/HPCCPlatformWidget.js
  46. 4 3
      esp/src/eclwatch/HelpersWidget.js
  47. 4 3
      esp/src/eclwatch/HexViewWidget.js
  48. 4 3
      esp/src/eclwatch/IFrameWidget.js
  49. 4 3
      esp/src/eclwatch/InfoGridWidget.js
  50. 3 3
      esp/src/eclwatch/JSGraphWidget.js
  51. 4 3
      esp/src/eclwatch/LFDetailsWidget.js
  52. 4 3
      esp/src/eclwatch/LZBrowseWidget.js
  53. 4 3
      esp/src/eclwatch/LibrariesUsedWidget.js
  54. 4 3
      esp/src/eclwatch/LockDialogWidget.js
  55. 4 3
      esp/src/eclwatch/LogVisualizationWidget.js
  56. 4 3
      esp/src/eclwatch/LogWidget.js
  57. 4 3
      esp/src/eclwatch/MachineInformationWidget.js
  58. 4 3
      esp/src/eclwatch/MemberOfWidget.js
  59. 4 3
      esp/src/eclwatch/MembersWidget.js
  60. 4 3
      esp/src/eclwatch/MonitoringWidget.js
  61. 4 3
      esp/src/eclwatch/PackageMapDetailsWidget.js
  62. 4 3
      esp/src/eclwatch/PackageMapPartsWidget.js
  63. 4 3
      esp/src/eclwatch/PackageMapQueryWidget.js
  64. 4 3
      esp/src/eclwatch/PackageMapValidateContentWidget.js
  65. 6 4
      esp/src/eclwatch/PackageMapValidateWidget.js
  66. 4 2
      esp/src/eclwatch/PackageSourceWidget.js
  67. 4 3
      esp/src/eclwatch/PermissionsWidget.js
  68. 4 3
      esp/src/eclwatch/PreflightDetailsWidget.js
  69. 4 3
      esp/src/eclwatch/QuerySetDetailsWidget.js
  70. 4 3
      esp/src/eclwatch/QuerySetErrorsWidget.js
  71. 4 3
      esp/src/eclwatch/QuerySetLogicalFilesWidget.js
  72. 4 3
      esp/src/eclwatch/QuerySetQueryWidget.js
  73. 4 3
      esp/src/eclwatch/QuerySetSuperFilesWidget.js
  74. 4 3
      esp/src/eclwatch/QueryTestWidget.js
  75. 4 3
      esp/src/eclwatch/RequestInformationWidget.js
  76. 4 3
      esp/src/eclwatch/ResourcesWidget.js
  77. 4 3
      esp/src/eclwatch/ResultWidget.js
  78. 4 3
      esp/src/eclwatch/ResultsWidget.js
  79. 4 3
      esp/src/eclwatch/SFDetailsWidget.js
  80. 4 3
      esp/src/eclwatch/SearchResultsWidget.js
  81. 1 0
      esp/src/eclwatch/SelectionGridWidget.js
  82. 4 3
      esp/src/eclwatch/ShowAccountPermissionsWidget.js
  83. 4 3
      esp/src/eclwatch/ShowIndividualPermissionsWidget.js
  84. 4 3
      esp/src/eclwatch/ShowInheritedPermissionsWidget.js
  85. 4 3
      esp/src/eclwatch/ShowPermissionsWidget.js
  86. 4 3
      esp/src/eclwatch/SourceFilesWidget.js
  87. 4 3
      esp/src/eclwatch/SystemServersQueryWidget.js
  88. 1 0
      esp/src/eclwatch/TableContainer.js
  89. 4 3
      esp/src/eclwatch/TargetClustersQueryWidget.js
  90. 3 3
      esp/src/eclwatch/TargetSelectClass.js
  91. 4 3
      esp/src/eclwatch/TimingPageWidget.js
  92. 4 3
      esp/src/eclwatch/TimingTreeMapWidget.js
  93. 4 3
      esp/src/eclwatch/TopologyDetailsWidget.js
  94. 4 3
      esp/src/eclwatch/TopologyWidget.js
  95. 4 3
      esp/src/eclwatch/TpClusterInfoWidget.js
  96. 4 3
      esp/src/eclwatch/TpThorStatusWidget.js
  97. 4 3
      esp/src/eclwatch/UserDetailsWidget.js
  98. 4 3
      esp/src/eclwatch/UserQueryWidget.js
  99. 4 3
      esp/src/eclwatch/VariablesWidget.js
  100. 0 0
      esp/src/eclwatch/VizWidget.js

+ 113 - 146
esp/files/Login.html

@@ -1,153 +1,120 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge"> 
-        <meta charset="UTF-8">
-        <title class="loginStr"></title>
-        <style type="text/css">
-            body {
-                font-family: Lucida Sans, Lucida Grande, Arial !important;
-                font-size: 15px !important;
-                background-color: #1A9BD7;
-            }
-
-            .container {
-                width: 99%;
-                position: absolute;
-                top: 50%;
-                transform: translateY(-50%);
-            }
-
-            .formContainer {
-                width: 500px;
-                padding: 20px 0 20px 0;
-                border-radius: 5px;
-                background-color: #fff;
-                margin: auto;
-            }
-
-            .login {
-                width: 400px;
-                margin: auto;
-            }
 
-            .login input {
-                margin-bottom: 20px;
-                width: 300px;
-                padding: 8px;
-                border: 1px solid #bfbfbf;
-            }
-
-            #hidden_msg{
-                display: none;
-                text-align: center;
-                margin-bottom: 20px;
-                width: 300px;
-		color:red;
-            }
-
-            .login form {
-                margin: auto;
-                width: 300px;
-            }
-
-            img {
-                display: block;
-                margin: auto;
-            }
-
-            p {
-                text-align: center
-            }
-
-            #button {
-                background-color: #1A9BD7;
-                border: none;
-                color: white;
-                padding: 15px 32px;
-                text-align: center;
-                text-decoration: none;
-                display: inline-block;
-                font-size: 16px;
-                border-radius: 4px;
-                cursor: pointer;
-                -webkit-transition-duration: 0.4s;
-                /* Safari */
-                transition-duration: 0.4s;
-                margin: auto;
-                display: block;
-            }
-
-            .button:hover {
-                background-color: #13b1f9;
-                color: white;
-            }
-
-            .visible {
-                display: none;
-            }
-        </style>
-        <script src="/esp/files/dist/dojoLib.eclwatch.js"></script>
-    </head>
-    <body>
-        <div id="container" class="container visible">
-            <div class="formContainer">
-                <img id="logo" src="eclwatch/img/Loginlogo.png" />
-                <p id="loginStr" class="loginStr"></p>
-                <div class="login">
-                    <form method="POST" action="/esp/login">
-                        <input id="username" type="text" name="username" placeholder="username" class="loginStr" autofocus></input>
-                        <input id="password" type="password" name="password" placeholder="password" class="loginStr"></input>
-                        <p id="hidden_msg" class="loginStr"></p>
-                        <button class="loginStr" id="button" type="submit"></button>
-                    </form>
-                </div>
+<head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta charset="UTF-8">
+    <title class="loginStr"></title>
+    <style type="text/css">
+        body {
+            font-family: Lucida Sans, Lucida Grande, Arial !important;
+            font-size: 15px !important;
+            background-color: #1A9BD7;
+        }
+
+        .container {
+            width: 99%;
+            position: absolute;
+            top: 50%;
+            transform: translateY(-50%);
+        }
+
+        .formContainer {
+            width: 500px;
+            padding: 20px 0 20px 0;
+            border-radius: 5px;
+            background-color: #fff;
+            margin: auto;
+        }
+
+        .login {
+            width: 400px;
+            margin: auto;
+        }
+
+        .login input {
+            margin-bottom: 20px;
+            width: 300px;
+            padding: 8px;
+            border: 1px solid #bfbfbf;
+        }
+
+        #hidden_msg {
+            display: none;
+            text-align: center;
+            margin-bottom: 20px;
+            width: 300px;
+            color: red;
+        }
+
+        .login form {
+            margin: auto;
+            width: 300px;
+        }
+
+        img {
+            display: block;
+            margin: auto;
+        }
+
+        p {
+            text-align: center
+        }
+
+        #button {
+            background-color: #1A9BD7;
+            border: none;
+            color: white;
+            padding: 15px 32px;
+            text-align: center;
+            text-decoration: none;
+            display: inline-block;
+            font-size: 16px;
+            border-radius: 4px;
+            cursor: pointer;
+            -webkit-transition-duration: 0.4s;
+            /* Safari */
+            transition-duration: 0.4s;
+            margin: auto;
+            display: block;
+        }
+
+        .button:hover {
+            background-color: #13b1f9;
+            color: white;
+        }
+
+        .visible {
+            display: none;
+        }
+    </style>
+    <script src="/esp/files/dist/dojoLib.eclwatch.js"></script>
+</head>
+
+<body>
+    <div id="container" class="container visible">
+        <div class="formContainer">
+            <img id="logo" src="eclwatch/img/Loginlogo.png" />
+            <p id="loginStr" class="loginStr"></p>
+            <div class="login">
+                <form method="POST" action="/esp/login">
+                    <input id="username" type="text" name="username" placeholder="username" class="loginStr"
+                        autofocus></input>
+                    <input id="password" type="password" name="password" placeholder="password"
+                        class="loginStr"></input>
+                    <p id="hidden_msg" class="loginStr"></p>
+                    <button class="loginStr" id="button" type="submit"></button>
+                </form>
             </div>
         </div>
-        <script type="text/javascript">
-            require(["dojo/ready", "dojo/i18n", "dojo/i18n!hpcc/nls/hpcc"],
-                function(ready, i18n, nlsHPCC){
-                    ready(function(){
-                        var loginStr = document.getElementById("loginStr");
-                        var error = document.getElementById("hidden_msg");
-                        var username = document.getElementById("username");
-                        var password = document.getElementById("password");
-                        var button = document.getElementById("button");
-                        var enableCookies = "";
-                        var HPCCSystems = document.getElementById("logo");
-
-                        loginStr.innerHTML = nlsHPCC.PleaseLogIntoECLWatch;
-                        error.innerHTML = nlsHPCC.InvalidUsernamePassword;
-                        username.innerHTML = nlsHPCC.Username;
-                        password.innerHTML = nlsHPCC.Password;
-                        button.innerHTML = nlsHPCC.Login;
-                        enableCookies = nlsHPCC.PleaseEnableCookies;
-                        HPCCSystems.setAttribute("alt", nlsHPCC.HPCCSystems);
-
-                        var element = document.getElementById('container');
-
-                        if (navigator.cookieEnabled) {
-                            var element = document.getElementById("container");
-                            element.classList.remove("visible");
-                        } else {
-                            alert(enableCookies);
-                        }
-
-                        function deleteCookie(cname, cvalue, exMins) {
-                            var d = new Date();
-                            d.setTime(d.getTime() + (exMins*60*1000));
-                            var expires = "expires="+d.toUTCString();
-                            document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
-                        }
+    </div>
+    <script type="text/javascript">
+        require([init],
+            function (init) {
+                init();
+            }
+        );
+    </script>
+</body>
 
-                        if (document.cookie.indexOf("ESPAuthenticationMSG") > -1){
-                            var element = document.getElementById('hidden_msg');
-                            element.style.display = "inline-block";
-                            deleteCookie('ESPAuthenticationMSG','',0);
-                        }
-                    });
-                }
-            );
-        </script>
-    </body>
 </html>

+ 1 - 0
esp/src/.gitignore

@@ -3,4 +3,5 @@ hpcc-js/
 lib/
 node_modules/
 src/nlsHPCCType.ts
+types/
 lws.target.txt

+ 1 - 2
esp/src/CMakeLists.txt

@@ -31,13 +31,11 @@ file(COPY
     ${CMAKE_CURRENT_SOURCE_DIR}/tsconfig.json
     ${CMAKE_CURRENT_SOURCE_DIR}/webpack.config.js
     ${CMAKE_CURRENT_SOURCE_DIR}/xstyle
-    ${CMAKE_CURRENT_SOURCE_DIR}/util
     DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 set ( SRCS
     ${CMAKE_CURRENT_BINARY_DIR}/eclwatch/css/ecl.css
     ${CMAKE_CURRENT_BINARY_DIR}/eclwatch/css/hpcc.css
-    ${CMAKE_CURRENT_BINARY_DIR}/eclwatch/nls/hpcc.js
     ${CMAKE_CURRENT_BINARY_DIR}/eclwatch/templates/ActivityPageWidget.html
     ${CMAKE_CURRENT_BINARY_DIR}/eclwatch/templates/CurrentUserDetailsWidget.html
     ${CMAKE_CURRENT_BINARY_DIR}/eclwatch/templates/DataPatternsWidget.html
@@ -218,6 +216,7 @@ set ( SRCS
     ${CMAKE_CURRENT_BINARY_DIR}/eclwatch/XrefLostFilesWidget.js
     ${CMAKE_CURRENT_BINARY_DIR}/eclwatch/XrefOrphanFilesWidget.js
     ${CMAKE_CURRENT_BINARY_DIR}/eclwatch/XrefQueryWidget.js
+    ${CMAKE_CURRENT_BINARY_DIR}/src/nls/hpcc.ts
     ${CMAKE_CURRENT_BINARY_DIR}/src/DataPatterns/AttributeDesc.ts
     ${CMAKE_CURRENT_BINARY_DIR}/src/DataPatterns/Cardinality.ts
     ${CMAKE_CURRENT_BINARY_DIR}/src/DataPatterns/config.ts

+ 4 - 3
esp/src/eclwatch/ActivityWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom-attr",
 
@@ -31,12 +30,13 @@ define([
     "dijit/ToolbarSeparator",
     "dijit/layout/ContentPane"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, domAttr,
+], function (declare, lang, nlsHPCCMod, arrayUtil, domAttr,
     registry, Button, ToolbarSeparator, Tooltip,
     selector, tree,
     GridDetailsWidget, ESPActivity, DelayLoadWidget, ESPUtil, Utility, DiskUsage, Clippy,
     template
 ) {
+
     var DelayedRefresh = declare("DelayedRefresh", [], {
         _activityWidget: null,
         _promises: null,
@@ -63,6 +63,7 @@ define([
         }
     });
 
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("ActivityWidget", [GridDetailsWidget], {
         templateString: template,
         i18n: nlsHPCC,

+ 4 - 3
esp/src/eclwatch/ClusterProcessesQueryWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/topic",
 
     "dijit/registry",
@@ -19,10 +18,12 @@ define([
     "hpcc/PreflightDetailsWidget",
     "hpcc/MachineInformationWidget",
     "hpcc/IFrameWidget"
-], function (declare, i18n, nlsHPCC, topic,
+], function (declare, nlsHPCCMod, topic,
     registry,
     tree, selector,
     GridDetailsWidget, ESPPreflight, ESPRequest, WsTopology, Utility, ESPUtil, DelayLoadWidget, PreflightDetailsWidget, MachineInformationWidget, IFrameWidget) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("CluserProcessesQueryWidget", [GridDetailsWidget, ESPUtil.FormHelper], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/CurrentUserDetailsWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom",
     "dojo/dom-form",
     "dojo/_base/array",
@@ -26,10 +25,12 @@ define([
     "dojox/form/PasswordValidator"
 
 ],
-function (declare, lang, i18n, nlsHPCC, dom, domForm, arrayUtil,
+    function (declare, lang, nlsHPCCMod, dom, domForm, arrayUtil,
     registry,
     _Widget, WsAccount,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("CurrentUserDetailsWidget", [_Widget], {
         templateString: template,
         baseClass: "CurrentUserDetailsWidget",

+ 4 - 3
esp/src/eclwatch/DFUQueryWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom-class",
     "dojo/dom-form",
@@ -59,12 +58,14 @@ define([
 
     "hpcc/TableContainer"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, domClass, domForm, topic,
+], function (declare, lang, nlsHPCCMod, arrayUtil, domClass, domForm, topic,
     registry, Dialog, Menu, MenuItem, MenuSeparator, PopupMenuItem,
     editor, selector, tree,
     _TabContainerWidget, WsDfu, FileSpray, ESPUtil, ESPLogicalFile, ESPDFUWorkunit, DelayLoadWidget, WsTopology, Utility,
     put,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("DFUQueryWidget", [_TabContainerWidget, ESPUtil.FormHelper], {
         templateString: template,
         baseClass: "DFUQueryWidget",

+ 1 - 0
esp/src/eclwatch/DFUSearchWidget.js

@@ -22,6 +22,7 @@ define([
     registry,
     _Widget, Workunit,
     template) {
+
     return declare("DFUSearchWidget", [_Widget], {
         templateString: template,
         baseClass: "DFUSearchWidget",

+ 4 - 3
esp/src/eclwatch/DFUWUDetailsWidget.js

@@ -1,8 +1,7 @@
 define([
     "exports",
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-class",
@@ -31,10 +30,12 @@ define([
     "dijit/form/CheckBox",
     "dijit/ToolbarSeparator"
 
-], function (exports, declare, i18n, nlsHPCC, arrayUtil, dom, domClass, query,
+], function (exports, declare, nlsHPCCMod, arrayUtil, dom, domClass, query,
     registry,
     _TabContainerWidget, Clippy, FileSpray, ESPDFUWorkunit, DelayLoadWidget,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     exports.fixCircularDependency = declare("DFUWUDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "DFUWUDetailsWidget",

+ 1 - 0
esp/src/eclwatch/DelayLoadWidget.js

@@ -10,6 +10,7 @@ define([
 ], function (declare, lang, dom, domStyle,
     ContentPane,
     Utility) {
+
     return declare("DelayLoadWidget", [ContentPane], {
         __ensurePromise: undefined,
         __initPromise: undefined,

+ 4 - 3
esp/src/eclwatch/DiskUsageDetails.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "dijit/registry",
 
@@ -23,10 +22,12 @@ define([
     "dijit/form/DateTextBox",
     "dijit/form/TimeTextBox"
 
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     registry,
     _Widget, ESPUtil, DiskUsage,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("DiskUsageDetails", [_Widget, ESPUtil.FormHelper], {
         templateString: template,
         baseClass: "DiskUsageDetails",

+ 4 - 3
esp/src/eclwatch/DiskUsageWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom-class",
 
     "dijit/registry",
@@ -26,10 +25,12 @@ define([
     "dijit/form/DateTextBox",
     "dijit/form/TimeTextBox"
 
-], function (declare, lang, i18n, nlsHPCC, domClass,
+], function (declare, lang, nlsHPCCMod, domClass,
     registry,
     _Widget, WsDfu, ESPUtil,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("DiskUsageWidget", [_Widget, ESPUtil.FormHelper], {
         templateString: template,
         baseClass: "DiskUsageWidget",

+ 4 - 3
esp/src/eclwatch/DynamicESDLDefinitionDetailsWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "hpcc/_TabContainerWidget",
     "src/WsESDLConfig",
@@ -12,9 +11,11 @@ define([
     "dijit/layout/BorderContainer",
     "dijit/layout/TabContainer",
     "dijit/layout/ContentPane"
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     _TabContainerWidget, WsESDLConfig,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("DynamicESDLDefinitionDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "DynamicESDLDefinitionDetailsWidget",

+ 4 - 3
esp/src/eclwatch/DynamicESDLDefinitionQueryWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom",
 
@@ -22,10 +21,12 @@ define([
     "hpcc/DynamicESDLDefinitionDetailsWidget",
     "src/Utility"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom,
+], function (declare, lang, nlsHPCCMod, arrayUtil, dom,
     registry, MenuSeparator, Dialog, ToolbarSeparator, Button, TextBox,
     selector,
     GridDetailsWidget, TargetSelectWidget, WsESDLConfig, ESPUtil, DynamicESDLDefinitionDetailsWidget, Utility) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("DynamicESDLWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/DynamicESDLDetailsWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom",
     "dojo/dom-attr",
 
@@ -36,11 +35,13 @@ define([
 
     "hpcc/TableContainer"
 ],
-    function (declare, lang, i18n, nlsHPCC, dom, domAttr,
+    function (declare, lang, nlsHPCCMod, dom, domAttr,
         registry,
         Clippy,
         _TabContainerWidget, WsESDLConfig,
         template) {
+
+        var nlsHPCC = nlsHPCCMod.default;
         return declare("DynamicESDLDetailsWidget", [_TabContainerWidget], {
             templateString: template,
             baseClass: "DynamicESDLDetailsWidget",

+ 4 - 3
esp/src/eclwatch/DynamicESDLMethodWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "dijit/registry",
@@ -15,11 +14,13 @@ define([
     "dgrid/editor",
     "dgrid/tree"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil,
+], function (declare, lang, nlsHPCCMod, arrayUtil,
     registry, Button,
     GridDetailsWidget, ESPUtil, WsESDLConfig,
     editor, tree
 ) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("DynamicESDLMethodWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/DynamicESDLQueryWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom",
 
@@ -22,10 +21,12 @@ define([
     "src/ESPUtil",
     "hpcc/DynamicESDLDefinitionQueryWidget",
     "hpcc/TargetSelectWidget"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom,
+], function (declare, lang, nlsHPCCMod, arrayUtil, dom,
     registry, Button, ToolbarSeparator, Dialog, TextBox,
     tree, selector,
     GridDetailsWidget, WsESDLConfig, Utility, DelayLoadWidget, ESPUtil, DynamicESDLDefinitionQueryWidget, TargetSelectWidget) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("DynamicESDLQueryWidget", [GridDetailsWidget, ESPUtil.FormHelper], {
         i18n: nlsHPCC,
 

+ 1 - 0
esp/src/eclwatch/ECLPlaygroundResultsWidget.js

@@ -17,6 +17,7 @@ define([
     registry,
     _TabContainerWidget, ESPWorkunit, ESPQuery, ResultWidget, FullResultWidget,
     template) {
+
     return declare("ECLPlaygroundResultsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "ECLPlaygroundResultsWidget",

+ 4 - 3
esp/src/eclwatch/ECLPlaygroundWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom",
     "dojo/query",
 
@@ -25,10 +24,12 @@ define([
     "hpcc/InfoGridWidget",
     "hpcc/VizWidget"
 
-], function (declare, lang, i18n, nlsHPCC, dom, query,
+], function (declare, lang, nlsHPCCMod, dom, query,
     registry,
     _Widget, ESPWorkunit, ESPQuery,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("ECLPlaygroundWidget", [_Widget], {
         templateString: template,
         baseClass: "ECLPlaygroundWidget",

+ 4 - 3
esp/src/eclwatch/ECLSourceWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom",
     "dojo/request/xhr",
     "dojo/topic",
@@ -22,11 +21,13 @@ define([
     "dijit/ToolbarSeparator",
     "dijit/form/Button"
 
-], function (declare, lang, i18n, nlsHPCC, dom, xhr, topic,
+], function (declare, lang, nlsHPCCMod, dom, xhr, topic,
     registry,
     CodeMirror,
     _Widget, ESPWorkunit,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("ECLSourceWidget", [_Widget], {
         templateString: template,
         baseClass: "ECLSourceWidget",

+ 4 - 3
esp/src/eclwatch/EventScheduleWorkunitWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom-form",
     "dojo/_base/array",
 
@@ -33,11 +32,13 @@ define([
     "dijit/TooltipDialog",
 
     "dojox/layout/TableContainer"
-], function (declare, i18n, nlsHPCC, domForm, arrayUtil,
+], function (declare, nlsHPCCMod, domForm, arrayUtil,
     registry, Menu, MenuItem,
     selector,
     _TabContainerWidget, WUDetailsWidget, WsWorkunits, ESPUtil,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("EventScheduleWorkunitWidget", [_TabContainerWidget], {
         i18n: nlsHPCC,
         templateString: template,

+ 4 - 3
esp/src/eclwatch/FileBelongsToWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "dgrid/selector",
 
@@ -10,9 +9,11 @@ define([
     "src/ESPLogicalFile",
     "src/ESPUtil",
 
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     selector,
     DelayLoadWidget, GridDetailsWidget, ESPLogicalFile, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("FileBelongsToWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
         logicalFile: null,

+ 4 - 3
esp/src/eclwatch/FileBloomsWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "dijit/registry",
@@ -12,9 +11,11 @@ define([
     "hpcc/GridDetailsWidget",
     "src/WsDfu",
     "src/ESPUtil"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil,
+], function (declare, lang, nlsHPCCMod, arrayUtil,
     registry, selector,
     GridDetailsWidget, WsDfu, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("FileBloomsWidget", [GridDetailsWidget, ESPUtil.FormHelper], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/FileHistoryWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "dijit/registry",
@@ -12,9 +11,11 @@ define([
     "hpcc/GridDetailsWidget",
     "src/WsDfu",
     "src/ESPUtil"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil,
+], function (declare, lang, nlsHPCCMod, arrayUtil,
     registry, Button,
     GridDetailsWidget, WsDfu, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("FileHistoryWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
         gridTitle: nlsHPCC.History,

+ 4 - 3
esp/src/eclwatch/FilePartsWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/store/Memory",
     "dojo/store/Observable",
 
@@ -16,10 +15,12 @@ define([
 
     "dijit/layout/ContentPane"
 ],
-    function (declare, i18n, nlsHPCC, Memory, Observable,
+    function (declare, nlsHPCCMod, Memory, Observable,
         OnDemandGrid, Keyboard, ColumnResizer, DijitRegistry,
         _Widget,
         template) {
+
+        var nlsHPCC = nlsHPCCMod.default;
         return declare("FilePartsWidget", [_Widget], {
             templateString: template,
             baseClass: "FilePartsWidget",

+ 4 - 3
esp/src/eclwatch/FileProtectListWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "dijit/registry",
@@ -12,9 +11,11 @@ define([
     "hpcc/GridDetailsWidget",
     "src/WsDfu",
     "src/ESPUtil"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil,
+], function (declare, lang, nlsHPCCMod, arrayUtil,
     registry, selector,
     GridDetailsWidget, WsDfu, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("FileProtectListWidget", [GridDetailsWidget, ESPUtil.FormHelper], {
         i18n: nlsHPCC,
 

+ 5 - 4
esp/src/eclwatch/FilterDropDownWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-style",
@@ -24,10 +23,12 @@ define([
 
     "hpcc/TableContainer"
 
-], function (declare, i18n, nlsHPCC, arrayUtil, dom, domStyle,
+], function (declare, nlsHPCCMod, arrayUtil, dom, domStyle,
     registry, Select,
     _Widget, Utility, srcReact, Recent,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("FilterDropDownWidget", [_Widget], {
         templateString: template,
         baseClass: "FilterDropDownWidget",
@@ -177,7 +178,7 @@ define([
             var context = this;
             if (this.userName !== null) {
                 if (!Utility.isObjectEmpty(retVal)) {
-                    Recent.addToStack(this.params.ws_key, retVal, 5, true).then(function(val){
+                    Recent.addToStack(this.params.ws_key, retVal, 5, true).then(function (val) {
                         context.loadRecentFilters(retVal);
                     });
                 }

+ 4 - 3
esp/src/eclwatch/FullResultWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/request/iframe",
     "dojo/store/Memory",
@@ -25,11 +24,13 @@ define([
     "dijit/form/Button",
     "dijit/form/ToggleButton",
     "dijit/ToolbarSeparator"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, iframe, Memory, Observable,
+], function (declare, lang, nlsHPCCMod, arrayUtil, iframe, Memory, Observable,
     registry,
     Grid, DijitRegistry,
     _Widget, ESPBaseMod, ESPUtil,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("FullResultWidget", [_Widget], {
         templateString: template,
         baseClass: "FullResultWidget",

+ 4 - 3
esp/src/eclwatch/GetDFUWorkunitsWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom-class",
     "dojo/topic",
@@ -41,11 +40,13 @@ define([
     "dijit/ToolbarSeparator",
     "dijit/TooltipDialog"
 
-], function (declare, i18n, nlsHPCC, arrayUtil, domClass, topic,
+], function (declare, nlsHPCCMod, arrayUtil, domClass, topic,
     registry, Menu, MenuItem, MenuSeparator, PopupMenuItem,
     selector,
     _TabContainerWidget, ESPUtil, ESPDFUWorkunit, FileSpray, DelayLoadWidget, Utility,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("GetDFUWorkunitsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "GetDFUWorkunitsWidget",

+ 4 - 3
esp/src/eclwatch/GetNumberOfFilesToCopyWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "hpcc/GridDetailsWidget",
@@ -10,8 +9,10 @@ define([
     "src/ESPUtil",
     "src/WsWorkunits"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil,
+], function (declare, lang, nlsHPCCMod, arrayUtil,
     GridDetailsWidget, ESPUtil, WsWorkunits) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("GetNumberOfFilesToCopyWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/GraphPageWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/Deferred",
     "dojo/dom",
     "dojo/on",
@@ -36,11 +35,13 @@ define([
     "dijit/form/SimpleTextarea",
     "dijit/form/NumberSpinner",
     "dijit/form/DropDownButton"
-], function (declare, lang, i18n, nlsHPCC, Deferred, dom, on, html,
+], function (declare, lang, nlsHPCCMod, Deferred, dom, on, html,
     registry,
     entities,
     _Widget, ESPUtil, ESPWorkunit, WsWorkunits, Utility,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("GraphPageWidget", [_Widget], {
         templateString: template,
         baseClass: "GraphPageWidget",

+ 4 - 3
esp/src/eclwatch/GraphWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/_base/Deferred",
     "dojo/has",
@@ -39,11 +38,13 @@ define([
     "dijit/Fieldset",
 
     "hpcc/TableContainer"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, Deferred, has, dom, domConstruct, domClass, domStyle, Observable, Evented,
+], function (declare, lang, nlsHPCCMod, arrayUtil, Deferred, has, dom, domConstruct, domClass, domStyle, Observable, Evented,
     registry,
     parser,
     _Widget, ESPUtil, GraphStore, Utility,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     var GraphView = declare("GraphView", null, {
         sourceGraphWidget: null,
         rootGlobalIDs: null,

+ 1 - 0
esp/src/eclwatch/GraphsLFWidget.js

@@ -10,6 +10,7 @@ define([
 ], function (declare, lang, arrayUtil,
     selector,
     GraphsWidget, ESPLogicalFile) {
+
     return declare("GraphsLFWidget", [GraphsWidget], {
 
         init: function (params) {

+ 1 - 0
esp/src/eclwatch/GraphsQueryWidget.js

@@ -10,6 +10,7 @@ define([
 ], function (declare, lang, arrayUtil,
     selector,
     GraphsWidget, ESPQuery) {
+
     return declare("GraphsQueryWidget", [GraphsWidget], {
         query: null,
 

+ 1 - 0
esp/src/eclwatch/GraphsWUWidget.js

@@ -14,6 +14,7 @@ define([
     selector,
     GraphsWidget, ESPWorkunit,
     srcTimings) {
+
     return declare("GraphsWUWidget", [GraphsWidget], {
         wu: null,
         _graphsData: null,

+ 4 - 3
esp/src/eclwatch/GraphsWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "dijit/form/Button",
@@ -10,9 +9,11 @@ define([
     "hpcc/DelayLoadWidget",
     "src/ESPUtil",
     "src/Utility"
-], function (declare, i18n, nlsHPCC, arrayUtil,
+], function (declare, nlsHPCCMod, arrayUtil,
     Button,
     GridDetailsWidget, DelayLoadWidget, ESPUtil, Utility) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("GraphsWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/GridDetailsWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/store/Memory",
     "dojo/store/Observable",
 
@@ -25,10 +24,12 @@ define([
     "dijit/ToolbarSeparator",
     "dijit/layout/ContentPane"
 
-], function (declare, lang, i18n, nlsHPCC, Memory, Observable,
+], function (declare, lang, nlsHPCCMod, Memory, Observable,
     registry, Menu, MenuItem, MenuSeparator,
     _TabContainerWidget, Utility, ESPUtil,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("GridDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "GridDetailsWidget",

+ 4 - 3
esp/src/eclwatch/GroupDetailsWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "dijit/registry",
 
@@ -19,10 +18,12 @@ define([
     "dijit/TitlePane",
     "dijit/Dialog"
 
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     registry,
     _TabContainerWidget,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("GroupDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "GroupDetailsWidget",

+ 4 - 3
esp/src/eclwatch/HPCCPlatformECLWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "hpcc/_TabContainerWidget",
 
@@ -13,9 +12,11 @@ define([
 
     "hpcc/DelayLoadWidget"
 
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     _TabContainerWidget,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("HPCCPlatformECLWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformECLWidget",

+ 4 - 3
esp/src/eclwatch/HPCCPlatformFilesWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "hpcc/_TabContainerWidget",
     "src/ESPRequest",
@@ -14,9 +13,11 @@ define([
 
     "hpcc/DelayLoadWidget"
 
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     _TabContainerWidget, ESPRequest,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("HPCCPlatformFilesWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformFilesWidget",

+ 4 - 3
esp/src/eclwatch/HPCCPlatformMainWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "hpcc/_TabContainerWidget",
 
@@ -13,9 +12,11 @@ define([
 
     "hpcc/DelayLoadWidget"
 
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     _TabContainerWidget,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("HPCCPlatformMainWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformMainWidget",

+ 4 - 3
esp/src/eclwatch/HPCCPlatformOpsWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "dijit/registry",
 
@@ -19,10 +18,12 @@ define([
 
     "hpcc/DelayLoadWidget"
 
-], function (declare, lang, i18n, nlsHPCC,
+], function (declare, lang, nlsHPCCMod,
     registry,
     _TabContainerWidget, ESPRequest, WsELK,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("HPCCPlatformOpsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformOpsWidget",

+ 4 - 3
esp/src/eclwatch/HPCCPlatformRoxieWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "hpcc/_TabContainerWidget",
 
@@ -13,9 +12,11 @@ define([
 
     "hpcc/DelayLoadWidget"
 
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     _TabContainerWidget,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("HPCCPlatformRoxieWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformRoxieWidget",

+ 4 - 3
esp/src/eclwatch/HPCCPlatformServicesPluginWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "hpcc/_TabContainerWidget",
@@ -15,9 +14,11 @@ define([
     "dijit/layout/TabContainer",
     "dijit/layout/ContentPane"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil,
+], function (declare, lang, nlsHPCCMod, arrayUtil,
     _TabContainerWidget, DelayLoadWidget, WsTopology,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("HPCCPlatformServicesPluginWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformServicesPluginWidget",

+ 64 - 64
esp/src/eclwatch/HPCCPlatformWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-construct",
@@ -58,7 +57,7 @@ define([
     "hpcc/TableContainer",
     "hpcc/InfoGridWidget"
 
-], function(declare, lang, i18n, nlsHPCC, arrayUtil, dom, domConstruct, domClass, domForm, domStyle, domGeo, cookie, query, topic, xhr,
+], function (declare, lang, nlsHPCCMod, arrayUtil, dom, domConstruct, domClass, domForm, domStyle, domGeo, cookie, query, topic, xhr,
     registry, Tooltip,
     UpgradeBar, ColorPicker,
     CodeMirror, srcReact,
@@ -73,6 +72,7 @@ define([
         _huePickerPointerAlly: "/esp/files/eclwatch/img/hueHandleA11y.png"
     });
 
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("HPCCPlatformWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "HPCCPlatformWidget",
@@ -82,7 +82,7 @@ define([
         upgradeBar: null,
         storage: null,
 
-        postCreate: function(args) {
+        postCreate: function (args) {
             this.inherited(arguments);
             this.searchText = registry.byId(this.id + "FindText");
             this.logoutBtn = registry.byId(this.id + "Logout");
@@ -112,7 +112,7 @@ define([
             });
         },
 
-        startup: function(args) {
+        startup: function (args) {
             this.inherited(arguments);
             domStyle.set(dom.byId(this.id + "StackController_stub_Plugins").parentNode.parentNode, {
                 visibility: "hidden"
@@ -126,7 +126,7 @@ define([
         },
 
         //  Implementation  ---
-        refreshBanner: function(activity) {
+        refreshBanner: function (activity) {
             if (this.showBanner !== activity.ShowBanner ||
                 this.bannerContent !== activity.BannerContent ||
                 this.bannerScroll !== activity.BannerScroll ||
@@ -152,7 +152,7 @@ define([
             }
         },
 
-        refreshUserName: function() {
+        refreshUserName: function () {
             if (this.userName) {
                 dom.byId(this.id + "UserID").textContent = this.userName;
             } else if (cookie("ESPUserName")) {
@@ -163,7 +163,7 @@ define([
             }
         },
 
-        init: function(params) {
+        init: function (params) {
             if (this.inherited(arguments))
                 return;
 
@@ -171,7 +171,7 @@ define([
 
             WsMachine.GetComponentStatus({
                 request: {}
-            }).then(function(response) {
+            }).then(function (response) {
                 if (lang.exists("GetComponentStatusResponse.ComponentStatus", response)) {
                     dojoConfig.monitoringEnabled = true;
                     var status = response.GetComponentStatusResponse.ComponentStatus
@@ -181,7 +181,7 @@ define([
                 }
             });
 
-            WsAccount.MyAccount({}).then(function(response) {
+            WsAccount.MyAccount({}).then(function (response) {
                 if (lang.exists("MyAccountResponse.username", response)) {
                     context.userName = response.MyAccountResponse.username;
                     dojoConfig.username = response.MyAccountResponse.username;
@@ -215,7 +215,7 @@ define([
 
             WsTopology.TpGetServicePlugins({
                 request: {}
-            }).then(function(response) {
+            }).then(function (response) {
                 if (lang.exists("TpGetServicePluginsResponse.Plugins.Plugin", response) && response.TpGetServicePluginsResponse.Plugins.Plugin.length) {
                     domStyle.set(dom.byId(context.id + "StackController_stub_Plugins").parentNode.parentNode, {
                         visibility: "visible"
@@ -223,12 +223,12 @@ define([
                 }
             });
 
-            WsTopology.TpGetServerVersion().then(function(buildVersion) {
+            WsTopology.TpGetServerVersion().then(function (buildVersion) {
                 context.build = WsSMC.parseBuildString(buildVersion);
             });
 
             this.activity = ESPActivity.Get();
-            this.activity.watch("__hpcc_changedCount", function(name, oldValue, newValue) {
+            this.activity.watch("__hpcc_changedCount", function (name, oldValue, newValue) {
                 context.refreshBanner(context.activity);
             });
 
@@ -241,19 +241,19 @@ define([
             this.initTab();
             this.checkIfSessionsAreActive();
 
-            topic.subscribe("hpcc/monitoring_component_update", function(topic) {
+            topic.subscribe("hpcc/monitoring_component_update", function (topic) {
                 context.checkMonitoring(topic.status);
             });
             this.storage = new ESPUtil.LocalStorage();
 
-            this.storage.on("storageUpdate", function(msg) {
+            this.storage.on("storageUpdate", function (msg) {
                 context._onUpdateFromStorage(msg)
             });
             this.storage.setItem("Status", "Unlocked");
 
             EnvironmentTheme.checkCurrentState(this.id, this);
 
-            this.environmentTextCB.on("change", function(state) {
+            this.environmentTextCB.on("change", function (state) {
                 if (state) {
                     context.environmentText.set("disabled", false);
                 } else {
@@ -262,7 +262,7 @@ define([
             });
         },
 
-        _onUpdateFromStorage: function(msg) {
+        _onUpdateFromStorage: function (msg) {
             var context = this;
             if (msg.event.newValue === "logged_out") {
                 window.location.reload();
@@ -273,7 +273,7 @@ define([
             }
         },
 
-        initTab: function() {
+        initTab: function () {
             var currSel = this.getSelectedChild();
             if (currSel && !currSel.initalized) {
                 if (currSel.init) {
@@ -282,18 +282,18 @@ define([
             }
         },
 
-        getTitle: function() {
+        getTitle: function () {
             return "ECL Watch";
         },
 
-        checkMonitoring: function(status) {
+        checkMonitoring: function (status) {
             if (status) {
                 domClass.remove("MonitorStatus");
                 domClass.add("MonitorStatus", status);
             }
         },
 
-        checkIfAdmin: function(user) {
+        checkIfAdmin: function (user) {
             var context = this;
             if (user == null) {
                 registry.byId(context.id + "SetBanner").set("disabled", false);
@@ -305,7 +305,7 @@ define([
                     request: {
                         username: user
                     }
-                }).then(function(response) {
+                }).then(function (response) {
                     if (lang.exists("UserEditResponse.isLDAPAdmin", response)) {
                         if (response.UserEditResponse.isLDAPAdmin === true) {
                             dojoConfig.isAdmin = true;
@@ -318,7 +318,7 @@ define([
                         }
                     } else {
                         if (lang.exists("UserEditResponse.Groups.Group", response)) {
-                            arrayUtil.some(response.UserEditResponse.Groups.Group, function(item, idx) {
+                            arrayUtil.some(response.UserEditResponse.Groups.Group, function (item, idx) {
                                 if (item.name === "Administrators" || item.name === "Directory Administrators") {
                                     dojoConfig.isAdmin = true;
                                     registry.byId(context.id + "SetBanner").set("disabled", false);
@@ -335,7 +335,7 @@ define([
             }
         },
 
-        checkIfSessionsAreActive: function() {
+        checkIfSessionsAreActive: function () {
             if (cookie("ESPSessionTimeoutSeconds")) {
                 this.logoutBtn.set("disabled", false);
                 this.lockBtn.set("disabled", false);
@@ -344,12 +344,12 @@ define([
             }
         },
 
-        setEnvironmentTheme: function() {
+        setEnvironmentTheme: function () {
             EnvironmentTheme.setEnvironmentTheme(this.id, this);
         },
 
         //  Hitched actions  ---
-        _onUserID: function(evt) {
+        _onUserID: function (evt) {
             var userDialog = registry.byId(this.id + "UserDialog");
             var userInfo = registry.byId(this.id + "UserInfo");
             if (!userInfo.init({
@@ -361,53 +361,53 @@ define([
             userDialog.show();
         },
 
-        _onFind: function(evt) {
+        _onFind: function (evt) {
             var context = this;
             this.stackContainer.selectChild(this.mainPage);
-            this.mainPage.ensureWidget().then(function(mainPage) {
+            this.mainPage.ensureWidget().then(function (mainPage) {
                 mainPage.widget.TabContainer.selectChild(mainPage.widget._Search);
-                mainPage.widget._Search.ensureWidget().then(function(searchPage) {
+                mainPage.widget._Search.ensureWidget().then(function (searchPage) {
                     searchPage.doSearch(context.searchText.get("value"));
                 });
             });
         },
 
-        _openNewTab: function(url) {
+        _openNewTab: function (url) {
             var win = window.open(url, "_blank");
             if (win && win.focus) {
                 win.focus();
             }
         },
 
-        _onOpenResources: function(evt) {
+        _onOpenResources: function (evt) {
             this._openNewTab("https://hpccsystems.com/download");
         },
 
-        _onOpenDocuments: function(evt) {
+        _onOpenDocuments: function (evt) {
             this._openNewTab("https://hpccsystems.com/training/documentation");
         },
 
-        _onOpenJira: function(evt) {
+        _onOpenJira: function (evt) {
             this._openNewTab("https://track.hpccsystems.com/issues");
         },
 
-        _onOpenForums: function(evt) {
+        _onOpenForums: function (evt) {
             this._openNewTab("https://hpccsystems.com/bb/");
         },
 
-        _onOpenRedBook: function(evt) {
+        _onOpenRedBook: function (evt) {
             this._openNewTab("https://wiki.hpccsystems.com/x/fYAb");
         },
 
-        _onOpenReleaseNotes: function(evt) {
+        _onOpenReleaseNotes: function (evt) {
             this._openNewTab("https://hpccsystems.com/download/release-notes");
         },
 
-        _onOpenTransitionGuide: function(evt) {
+        _onOpenTransitionGuide: function (evt) {
             this._openNewTab("https://wiki.hpccsystems.com/display/hpcc/HPCC+ECL+Watch+5.0+Transition+Guide");
         },
 
-        _onOpenConfiguration: function(evt) {
+        _onOpenConfiguration: function (evt) {
             var context = this;
             if (!this.configText) {
                 ESPRequest.send("main", "", {
@@ -416,7 +416,7 @@ define([
                         PlainText: "yes"
                     },
                     handleAs: "text"
-                }).then(function(response) {
+                }).then(function (response) {
                     context.configText = context.formatXml(response);
                     context.configSourceCM = CodeMirror.fromTextArea(dom.byId(context.id + "ConfigTextArea"), {
                         tabMode: "indent",
@@ -434,24 +434,24 @@ define([
             this.stackContainer.selectChild(this.widget._Config);
         },
 
-        _onOpenErrWarn: function(evt) {
+        _onOpenErrWarn: function (evt) {
             this.stackContainer.selectChild(this.errWarnPage);
         },
 
-        _ondebugLanguageFiles: function() {
+        _ondebugLanguageFiles: function () {
             var context = this;
-            require(["hpcc/nls/hpcc"], function(lang) {
+            require(["src/nls/hpcc"], function (lang) {
                 var languageID = [];
                 var languageRequire = [];
                 for (var key in lang) {
                     if (key !== "root") {
                         languageID.push(key);
-                        languageRequire.push("hpcc/nls/" + key + "/hpcc");
+                        languageRequire.push("src/nls/" + key + "/hpcc");
                     }
                 }
-                require(languageRequire, function() {
+                require(languageRequire, function () {
                     var errWarnGrid = registry.byId(context.id + "ErrWarnGrid");
-                    arrayUtil.forEach(arguments, function(otherLang, idx) {
+                    arrayUtil.forEach(arguments, function (otherLang, idx) {
                         var langID = languageID[idx];
                         for (var key in lang.root) {
                             if (!otherLang[key]) {
@@ -486,39 +486,39 @@ define([
         },
 
         _onAboutLoaded: false,
-        _onAbout: function(evt) {
+        _onAbout: function (evt) {
             var aboutNode = dom.byId(this.id + "AboutDialog");
             srcReact.render(srcReact.AboutDialog, {
                 version: this.build.orig,
-                handleClose: function() {
+                handleClose: function () {
                     srcReact.unrender(aboutNode);
                 }
             }, aboutNode);
         },
 
-        _onShowLock: function(evt) {
+        _onShowLock: function (evt) {
             var LockDialog = new LockDialogWidget({});
             LockDialog.show()
         },
 
-        _onLock: function(evt) {
+        _onLock: function (evt) {
             var LockDialog = new LockDialogWidget({});
             LockDialog._onLock();
         },
 
-        _onHideLock: function(evt) {
+        _onHideLock: function (evt) {
             var LockDialog = new LockDialogWidget({});
             LockDialog.hide();
         },
 
-        _onLogout: function(evt) {
+        _onLogout: function (evt) {
             var context = this;
             this.logoutConfirm.show();
             query(".dijitDialogUnderlay").style("opacity", "0.5");
-            this.logoutConfirm.on("execute", function() {
+            this.logoutConfirm.on("execute", function () {
                 xhr("esp/logout", {
                     method: "post"
-                }).then(function(data) {
+                }).then(function (data) {
                     if (data) {
                         cookie("ECLWatchUser", "", { expires: -1 });
                         cookie("ESPSessionID" + location.port + " = '' ", "", { expires: -1 });
@@ -531,16 +531,16 @@ define([
             });
         },
 
-        _onMonitoring: function(evt) {
+        _onMonitoring: function (evt) {
             this.stackContainer.selectChild(this.operationsPage);
-            this.operationsPage.ensureWidget().then(function(operationsPage) {
-                operationsPage.widget._Topology.ensureWidget().then(function(topologyPage) { //  This is needed otherwise topology will steal focus the first time it is delay loaded
+            this.operationsPage.ensureWidget().then(function (operationsPage) {
+                operationsPage.widget._Topology.ensureWidget().then(function (topologyPage) { //  This is needed otherwise topology will steal focus the first time it is delay loaded
                     operationsPage.selectChild(operationsPage.widget._Monitoring);
                 });
             });
         },
 
-        _onSetBanner: function(evt) {
+        _onSetBanner: function (evt) {
             registry.byId(this.id + "ShowBanner").set("value", this.activity.ShowBanner);
             dom.byId(this.id + "BannerContent").value = this.activity.BannerContent;
             dom.byId(this.id + "BannerColor").value = this.activity.BannerColor;
@@ -549,35 +549,35 @@ define([
             this.setBannerDialog.show();
         },
 
-        _onSetBannerOk: function(evt) {
+        _onSetBannerOk: function (evt) {
             this.activity.setBanner(domForm.toObject(this.id + "SetBannerForm"));
             this.setBannerDialog.hide();
         },
 
-        _onSetBannerCancel: function(evt) {
+        _onSetBannerCancel: function (evt) {
             this.setBannerDialog.hide();
         },
 
-        _onSetToolbar: function(evt) {
+        _onSetToolbar: function (evt) {
             this.setToolbarDialog.show();
         },
 
-        _onSetToolbarOk: function(evt) {
+        _onSetToolbarOk: function (evt) {
             this.setEnvironmentTheme();
         },
 
-        _onSetToolbarCancel: function(evt) {
+        _onSetToolbarCancel: function (evt) {
             this.setToolbarDialog.hide();
         },
 
-        _onSetToolbarReset: function(evt) {
+        _onSetToolbarReset: function (evt) {
             if (confirm(this.i18n.AreYouSureYouWantToResetTheme)) {
                 EnvironmentTheme._onResetDefaultTheme(this.id, this);
                 this._onSetToolbarCancel();
             }
         },
 
-        createStackControllerTooltip: function(widgetID, text) {
+        createStackControllerTooltip: function (widgetID, text) {
             return new Tooltip({
                 connectId: [this.id + "StackController_" + widgetID],
                 label: text,

+ 4 - 3
esp/src/eclwatch/HelpersWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom-construct",
     "dojo/dom-class",
@@ -20,10 +19,12 @@ define([
     "src/Utility",
     "hpcc/DelayLoadWidget"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, domConstruct, domClass,
+], function (declare, lang, nlsHPCCMod, arrayUtil, domConstruct, domClass,
     registry, Button, ToolbarSeparator,
     selector,
     GridDetailsWidget, ESPUtil, ESPRequest, ESPWorkunit, Utility, DelayLoadWidget) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("LogsWidget", [GridDetailsWidget], {
         baseClass: "LogsWidget",
         i18n: nlsHPCC,

+ 4 - 3
esp/src/eclwatch/HexViewWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "dijit/registry",
@@ -17,10 +16,12 @@ define([
     "dijit/form/ToggleButton",
     "dijit/form/CheckBox"
 ],
-    function (declare, i18n, nlsHPCC, arrayUtil,
+    function (declare, nlsHPCCMod, arrayUtil,
         registry,
         _Widget, hpccComms,
         template) {
+
+        var nlsHPCC = nlsHPCCMod.default;
         return declare("HexViewWidget", [_Widget], {
             templateString: template,
             baseClass: "HexViewWidget",

+ 4 - 3
esp/src/eclwatch/IFrameWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom-construct",
 
     "dijit/registry",
@@ -15,10 +14,12 @@ define([
     "dijit/ToolbarSeparator",
     "dijit/form/Button",
     "dijit/layout/ContentPane"
-], function (declare, i18n, nlsHPCC, domConstruct,
+], function (declare, nlsHPCCMod, domConstruct,
     registry,
     _Widget,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("IFrameWidget", [_Widget], {
         templateString: template,
         baseClass: "IFrameWidget",

+ 4 - 3
esp/src/eclwatch/InfoGridWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-construct",
@@ -30,10 +29,12 @@ define([
     "dijit/Toolbar",
     "dijit/ToolbarSeparator"
 ],
-    function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, domConstruct, domClass, Memory, Observable, topic, has,
+    function (declare, lang, nlsHPCCMod, arrayUtil, dom, domConstruct, domClass, Memory, Observable, topic, has,
         registry,
         _Widget, ESPUtil, ESPWorkunit, Utility,
         template) {
+
+        var nlsHPCC = nlsHPCCMod.default;
         return declare("InfoGridWidget", [_Widget], {
             templateString: template,
             baseClass: "InfoGridWidget",

+ 3 - 3
esp/src/eclwatch/JSGraphWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/Evented",
 
@@ -15,10 +14,11 @@ define([
     "src/Utility",
 
     "css!font-awesome/css/font-awesome.css"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, Evented,
+], function (declare, lang, nlsHPCCMod, arrayUtil, Evented,
     hpccCommon, hpccGraph, hpccLayout,
     GraphWidget, ESPGraph, Utility) {
 
+    var nlsHPCC = nlsHPCCMod.default;
     var faCharFactory = function (kind) {
         switch (kind) {
             case "2": return "\uf0c7";      //  Disk Write

+ 4 - 3
esp/src/eclwatch/LFDetailsWidget.js

@@ -2,8 +2,7 @@ define([
     "exports",
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom",
     "dojo/dom-attr",
     "dojo/dom-class",
@@ -48,10 +47,12 @@ define([
 
     "hpcc/TableContainer"
 
-], function (exports, declare, lang, i18n, nlsHPCC, dom, domAttr, domClass, domForm,
+], function (exports, declare, lang, nlsHPCCMod, dom, domAttr, domClass, domForm,
     registry,
     _TabContainerWidget, DelayLoadWidget, Clippy, ESPLogicalFile, ESPDFUWorkunit, FileSpray, DataPatternsWidget,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     exports.fixCircularDependency = declare("LFDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "LFDetailsWidget",

+ 4 - 3
esp/src/eclwatch/LZBrowseWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom-form",
     "dojo/dom-class",
@@ -53,11 +52,13 @@ define([
     "dojox/form/uploader/FileList",
 
     "hpcc/TableContainer"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, domForm, domClass, iframe, topic,
+], function (declare, lang, nlsHPCCMod, arrayUtil, domForm, domClass, iframe, topic,
     registry, MenuItem, TextBox, ValidationTextBox,
     tree, editor, selector,
     _TabContainerWidget, FileSpray, ESPUtil, ESPRequest, ESPDFUWorkunit, DelayLoadWidget, Utility,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("LZBrowseWidget", [_TabContainerWidget, ESPUtil.FormHelper], {
         templateString: template,
         baseClass: "LZBrowseWidget",

+ 4 - 3
esp/src/eclwatch/LibrariesUsedWidget.js

@@ -1,15 +1,16 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "hpcc/GridDetailsWidget",
     "src/ESPQuery",
     "src/ESPUtil"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil,
+], function (declare, lang, nlsHPCCMod, arrayUtil,
     GridDetailsWidget, ESPQuery, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("LibrariesUsedWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/LockDialogWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom",
     "dojo/dom-class",
     "dojo/on",
@@ -25,10 +24,12 @@ define([
 
     "hpcc/TableContainer"
 
-], function (declare, i18n, nlsHPCC, dom, domClass, on, xhr, cookie, topic,
+], function (declare, nlsHPCCMod, dom, domClass, on, xhr, cookie, topic,
     registry,
     _Widget, WsAccount, ESPUtil,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("LockDialogWidget", [_Widget], {
         templateString: template,
         baseClass: "LockDialogWidget",

+ 4 - 3
esp/src/eclwatch/LogVisualizationWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "hpcc/_TabContainerWidget",
 
@@ -13,8 +12,10 @@ define([
     "dijit/form/Button",
     "dijit/ToolbarSeparator",
     "dijit/form/ToggleButton"
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     _TabContainerWidget) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("LogVisualizationWidget", [_TabContainerWidget], {
         i18n: nlsHPCC
     });

+ 4 - 3
esp/src/eclwatch/LogWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "dijit/registry",
 
@@ -31,10 +30,12 @@ define([
     "dijit/ToolbarSeparator",
     "dijit/TooltipDialog"
 
-], function (declare, lang, i18n, nlsHPCC,
+], function (declare, lang, nlsHPCCMod,
     registry,
     _TabContainerWidget, ESPBaseMod, ESPUtil, WsTopology,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("LogWidget", [_TabContainerWidget, ESPUtil.FormHelper], {
         templateString: template,
         baseClass: "LogWidget",

+ 4 - 3
esp/src/eclwatch/MachineInformationWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-style",
@@ -25,10 +24,12 @@ define([
 
     "hpcc/TableContainer"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, domStyle, topic,
+], function (declare, lang, nlsHPCCMod, arrayUtil, dom, domStyle, topic,
     registry,
     _Widget, WsMachine,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("MachineInformationWidget", [_Widget], {
         templateString: template,
         baseClass: "MachineInformationWidget",

+ 4 - 3
esp/src/eclwatch/MemberOfWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/promise/all",
 
@@ -18,10 +17,12 @@ define([
     "src/ESPUtil",
     "hpcc/TargetSelectWidget"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, all,
+], function (declare, lang, nlsHPCCMod, arrayUtil, all,
     registry, Button, ToolbarSeparator, Dialog,
     selector,
     GridDetailsWidget, WsAccess, ESPUtil, TargetSelectWidget) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("MemberOfWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/MembersWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/promise/all",
     "dojo/on",
@@ -21,10 +20,12 @@ define([
     "src/Utility",
     "hpcc/TargetSelectWidget"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, all, on,
+], function (declare, lang, nlsHPCCMod, arrayUtil, all, on,
     registry, Button, ValidationTextBox, ToolbarSeparator, Dialog,
     selector,
     GridDetailsWidget, WsAccess, ESPUtil, Utility, TargetSelectWidget) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("MembersWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/MonitoringWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom-class",
     "dojo/topic",
@@ -14,9 +13,11 @@ define([
     "src/ESPUtil",
     "src/Utility"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, domClass, topic,
+], function (declare, lang, nlsHPCCMod, arrayUtil, domClass, topic,
     tree,
     GridDetailsWidget, WsMachine, ESPUtil, Utility) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("MonitoringWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/PackageMapDetailsWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom-attr",
     "dojo/dom-class",
     "dojo/topic",
@@ -22,8 +21,10 @@ define([
     "dijit/form/Button",
     "dijit/form/ToggleButton",
     "dijit/Toolbar"
-], function (declare, i18n, nlsHPCC, domAttr, domClass, topic, registry,
+], function (declare, nlsHPCCMod, domAttr, domClass, topic, registry,
     _TabContainerWidget, Clippy, WsPackageMaps, template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("PackageMapDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "PackageMapDetailsWidget",

+ 4 - 3
esp/src/eclwatch/PackageMapPartsWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/promise/all",
 
@@ -23,10 +22,12 @@ define([
     "src/WsPackageMaps",
     "src/Utility",
     "hpcc/FilterDropDownWidget"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, all,
+], function (declare, lang, nlsHPCCMod, arrayUtil, all,
     registry, ToolbarSeparator, Button, ValidationTextBox, Textarea, TextBox, CheckBox, Dialog,
     selector,
     GridDetailsWidget, DelayLoadWidget, ESPUtil, WsPackageMaps, Utility, FilterDropDownWidget) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("PackageMapPartsWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
         gridTitle: nlsHPCC.Parts,

+ 4 - 3
esp/src/eclwatch/PackageMapQueryWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/topic",
@@ -36,11 +35,13 @@ define([
     "dijit/Toolbar",
     "dijit/ToolbarSeparator",
     "dijit/TooltipDialog"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, dom, topic,
+], function (declare, lang, nlsHPCCMod, arrayUtil, dom, topic,
     _LayoutWidget, _TemplatedMixin, _WidgetsInTemplateMixin, registry,
     selector,
     _TabContainerWidget, DelayLoadWidget, WsPackageMaps, ESPPackageProcess, ESPUtil,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("PackageMapQueryWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "PackageMapQueryWidget",

+ 4 - 3
esp/src/eclwatch/PackageMapValidateContentWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/topic",
     "dijit/registry",
 
@@ -19,8 +18,10 @@ define([
     "dijit/form/Button",
     "dijit/form/ToggleButton"
 
-], function (declare, lang, i18n, nlsHPCC, topic, registry,
+], function (declare, lang, nlsHPCCMod, topic, registry,
     _TabContainerWidget, EclSourceWidget, WsPackageMaps, template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("PackageMapValidateContentWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "PackageMapValidateContentWidget",

+ 6 - 4
esp/src/eclwatch/PackageMapValidateWidget.js

@@ -2,7 +2,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/topic",
     "dijit/registry",
 
@@ -19,8 +19,10 @@ define([
     "dijit/form/Button",
     "dijit/form/ToggleButton",
     "dijit/form/Select"
-], function (declare, lang, i18n, nlsHPCC, topic, registry,
+], function (declare, lang, i18n, nlsHPCCMod, topic, registry,
     _TabContainerWidget, WsPackageMaps, template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("PackageMapValidateWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "PackageMapValidateWidget",
@@ -216,8 +218,8 @@ define([
                         responseText = context.i18n.ValidateResult + responseText;
                         context.resultControl.setText(responseText);
                     }
-                        context.validateButton.set("disabled", false);
-                        return response;
+                    context.validateButton.set("disabled", false);
+                    return response;
                 } else {
                     context.validateButton.set("disabled", false);
                 }

+ 4 - 2
esp/src/eclwatch/PackageSourceWidget.js

@@ -2,7 +2,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom",
     "dojo/topic",
 
@@ -20,11 +20,13 @@ define([
     "dijit/layout/BorderContainer",
     "dijit/layout/ContentPane"
 ],
-    function (declare, lang, i18n, nlsHPCC, dom, topic,
+    function (declare, lang, i18n, nlsHPCCMod, dom, topic,
         _LayoutWidget, _TemplatedMixin, _WidgetsInTemplateMixin,
         registry,
         CodeMirror,
         WsPackageMaps, template) {
+
+        var nlsHPCC = nlsHPCCMod.default;
         return declare("PackageSourceWidget", [_LayoutWidget, _TemplatedMixin, _WidgetsInTemplateMixin], {
             templateString: template,
             baseClass: "PackageSourceWidget",

+ 4 - 3
esp/src/eclwatch/PermissionsWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "dijit/registry",
     "dijit/form/CheckBox",
@@ -13,10 +12,12 @@ define([
     "src/ws_access",
     "src/ESPUtil"
 
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     registry, CheckBox,
     tree, editor,
     GridDetailsWidget, WsAccess, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("PermissionsWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/PreflightDetailsWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom-class",
     "dojo/dom-construct",
@@ -13,9 +12,11 @@ define([
     "src/ESPUtil",
     "src/ESPPreflight",
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, domClass, domConstruct, domGeom, win,
+], function (declare, lang, nlsHPCCMod, arrayUtil, domClass, domConstruct, domGeom, win,
     GridDetailsWidget, ESPUtil, ESPPreflight
 ) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("PreflightDetailsWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/QuerySetDetailsWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom",
     "dojo/dom-attr",
     "dojo/promise/all",
@@ -30,10 +29,12 @@ define([
     "dijit/TooltipDialog",
     "dijit/TitlePane"
 
-], function (declare, lang, i18n, nlsHPCC, dom, domAttr, all, arrayUtil,
+], function (declare, lang, nlsHPCCMod, dom, domAttr, all, arrayUtil,
     registry,
     Clippy, ESPQuery, _TabContainerWidget, Utility,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("QuerySetDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "QuerySetDetailsWidget",

+ 4 - 3
esp/src/eclwatch/QuerySetErrorsWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "dgrid/selector",
@@ -10,9 +9,11 @@ define([
     "hpcc/GridDetailsWidget",
     "src/ESPQuery",
     "src/ESPUtil"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil,
+], function (declare, lang, nlsHPCCMod, arrayUtil,
     selector,
     GridDetailsWidget, ESPQuery, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("QuerySetErrorsWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/QuerySetLogicalFilesWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "dgrid/selector",
@@ -11,9 +10,11 @@ define([
     "hpcc/DelayLoadWidget",
     "src/ESPQuery",
     "src/ESPUtil"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil,
+], function (declare, lang, nlsHPCCMod, arrayUtil,
     selector,
     GridDetailsWidget, DelayLoadWidget, ESPQuery, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("QuerySetLogicalFilesWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/QuerySetQueryWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/topic",
     "dojo/_base/array",
     "dojo/dom-form",
@@ -43,11 +42,13 @@ define([
     "hpcc/TargetSelectWidget",
     "hpcc/FilterDropDownWidget",
     "hpcc/TableContainer"
-], function (declare, lang, i18n, nlsHPCC, topic, arrayUtil, domForm,
+], function (declare, lang, nlsHPCCMod, topic, arrayUtil, domForm,
     registry, Menu, MenuItem, MenuSeparator, PopupMenuItem,
     selector,
     _TabContainerWidget, DelayLoadWidget, WsWorkunits, ESPQuery, ESPUtil, Utility,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("QuerySetQueryWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "QuerySetQueryWidget",

+ 4 - 3
esp/src/eclwatch/QuerySetSuperFilesWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/store/util/QueryResults",
 
@@ -14,9 +13,11 @@ define([
     "src/ESPUtil",
     "src/ESPQuery",
     "hpcc/SFDetailsWidget"
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, QueryResults,
+], function (declare, lang, nlsHPCCMod, arrayUtil, QueryResults,
     tree, selector,
     GridDetailsWidget, DelayLoadWidget, ESPUtil, ESPQuery, SFDetailsWidget) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("QuerySetSuperFilesWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
         query: null,

+ 4 - 3
esp/src/eclwatch/QueryTestWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "dijit/registry",
@@ -17,11 +16,13 @@ define([
     "dijit/layout/BorderContainer",
     "dijit/layout/TabContainer"
 
-], function (declare, i18n, nlsHPCC, arrayUtil,
+], function (declare, nlsHPCCMod, arrayUtil,
     registry,
     _TabContainerWidget, WsTopology, ESPQuery,
     ContentPane,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("QueryTestWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "QueryTestWidget",

+ 4 - 3
esp/src/eclwatch/RequestInformationWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom-construct",
 
     "dijit/registry",
@@ -23,10 +22,12 @@ define([
     "dijit/TooltipDialog",
 
     "dojox/layout/TableContainer"
-], function (declare, i18n, nlsHPCC, domConstruct,
+], function (declare, nlsHPCCMod, domConstruct,
     registry,
     _TabContainerWidget,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("RequestInformationWidget", [_TabContainerWidget], {
         i18n: nlsHPCC,
         templateString: template,

+ 4 - 3
esp/src/eclwatch/ResourcesWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "dijit/registry",
@@ -17,10 +16,12 @@ define([
     "src/WsTopology",
     "src/ESPUtil"
 
-], function (declare, i18n, nlsHPCC, arrayUtil,
+], function (declare, nlsHPCCMod, arrayUtil,
     registry, ContentPane, Button,
     selector,
     GridDetailsWidget, ESPRequest, ESPWorkunit, DelayLoadWidget, WsTopology, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("ResourcesWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/ResultWidget.js

@@ -2,8 +2,7 @@ define([
     "dojo/_base/declare",
     "dojo/_base/lang",
     "dojo/_base/array",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/io-query",
 
     "dijit/registry",
@@ -32,11 +31,13 @@ define([
     "dijit/form/Button",
     "dijit/form/ToggleButton",
     "dijit/ToolbarSeparator"
-], function (declare, lang, arrayUtil, i18n, nlsHPCC, ioQuery,
+], function (declare, lang, arrayUtil, nlsHPCCMod, ioQuery,
     registry, TextBox,
     Grid, Keyboard, ColumnResizer, CompoundColumns, DijitRegistry, PaginationModule,
     _Widget, ESPBaseMod, ESPWorkunit, ESPLogicalFile, TableContainer, DGridHeaderHookMod,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("ResultWidget", [_Widget], {
         templateString: template,
         baseClass: "ResultWidget",

+ 4 - 3
esp/src/eclwatch/ResultsWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "dijit/layout/ContentPane",
@@ -15,10 +14,12 @@ define([
     "hpcc/DelayLoadWidget",
     "src/ESPUtil"
 
-], function (declare, i18n, nlsHPCC, arrayUtil,
+], function (declare, nlsHPCCMod, arrayUtil,
     ContentPane, Button,
     selector,
     GridDetailsWidget, ESPRequest, ESPWorkunit, DelayLoadWidget, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("ResultsWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/SFDetailsWidget.js

@@ -1,8 +1,7 @@
 define([
     "exports",
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom",
     "dojo/dom-attr",
@@ -38,12 +37,14 @@ define([
     "dijit/form/DropDownButton",
     "dijit/form/ToggleButton",
     "dijit/TitlePane"
-], function (exports, declare, i18n, nlsHPCC, arrayUtil, dom, domAttr, domClass, domForm, Memory, Observable, all,
+], function (exports, declare, nlsHPCCMod, arrayUtil, dom, domAttr, domClass, domForm, Memory, Observable, all,
     registry,
     selector,
     _TabContainerWidget,
     ESPUtil, ESPLogicalFile, DelayLoadWidget, Utility,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     exports.fixCircularDependency = declare("SFDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "SFDetailsWidget",

+ 4 - 3
esp/src/eclwatch/SearchResultsWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/store/Memory",
     "dojo/store/Observable",
@@ -26,10 +25,12 @@ define([
     "src/ESPUtil",
     "src/Utility"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, Memory, Observable, on, all,
+], function (declare, lang, nlsHPCCMod, arrayUtil, Memory, Observable, on, all,
     Standby, validate,
     selector,
     GridDetailsWidget, WsWorkunits, ESPWorkunit, ESPDFUWorkunit, ESPLogicalFile, ESPQuery, FileSpray, WsDfu, DelayLoadWidget, ESPUtil, Utility) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("SearchResultsWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 1 - 0
esp/src/eclwatch/SelectionGridWidget.js

@@ -22,6 +22,7 @@
     OnDemandGrid, Keyboard, Selection, ColumnResizer, DijitRegistry,
     _Widget,
     template) {
+
     return declare("SelectionGridWidget", [_Widget], {
         templateString: template,
         store: null,

+ 4 - 3
esp/src/eclwatch/ShowAccountPermissionsWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "dijit/registry",
@@ -15,10 +14,12 @@ define([
     "src/ESPUtil",
     "hpcc/ShowInheritedPermissionsWidget"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil,
+], function (declare, lang, nlsHPCCMod, arrayUtil,
     registry, CheckBox,
     editor,
     GridDetailsWidget, WsAccess, ESPUtil, ShowInheritedPermissionsWidget) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("ShowAccountPermissionsWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/ShowIndividualPermissionsWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "dijit/registry",
     "dijit/form/CheckBox",
@@ -12,10 +11,12 @@ define([
     "src/ws_access",
     "src/ESPUtil"
 
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     registry, CheckBox,
     editor,
     GridDetailsWidget, WsAccess, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("ShowIndividualPermissionsWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/ShowInheritedPermissionsWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "dijit/registry",
     "dijit/form/CheckBox",
@@ -16,10 +15,12 @@ define([
     "dijit/layout/TabContainer",
     "dijit/layout/ContentPane"
 
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     registry, CheckBox,
     editor,
     GridDetailsWidget, WsAccess, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("ShowInheritedPermissionsWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/ShowPermissionsWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "dijit/registry",
     "dijit/form/CheckBox",
@@ -11,10 +10,12 @@ define([
     "hpcc/GridDetailsWidget",
     "src/ws_access",
     "src/ESPUtil"
-], function (declare, i18n, nlsHPCC,
+], function (declare, nlsHPCCMod,
     registry, CheckBox,
     editor,
     GridDetailsWidget, WsAccess, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("ShowPermissionsWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/SourceFilesWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom-class",
 
@@ -15,9 +14,11 @@ define([
     "src/ESPUtil",
     "src/Utility",
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, domClass,
+], function (declare, lang, nlsHPCCMod, arrayUtil, domClass,
     tree, selector,
     GridDetailsWidget, ESPWorkunit, DelayLoadWidget, ESPUtil, Utility) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("SourceFilesWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/SystemServersQueryWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom-class",
     "dojo/topic",
@@ -22,10 +21,12 @@ define([
     "hpcc/PreflightDetailsWidget",
     "hpcc/MachineInformationWidget",
     "hpcc/IFrameWidget"
-], function (declare, i18n, nlsHPCC, arrayUtil, domClass, topic,
+], function (declare, nlsHPCCMod, arrayUtil, domClass, topic,
     registry, Dialog,
     tree, selector,
     GridDetailsWidget, ESPPreflight, ESPRequest, WsTopology, Utility, ESPUtil, DelayLoadWidget, PreflightDetailsWidget, MachineInformationWidget, IFrameWidget) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("SystemServersQueryWidget", [GridDetailsWidget, ESPUtil.FormHelper], {
         i18n: nlsHPCC,
 

+ 1 - 0
esp/src/eclwatch/TableContainer.js

@@ -6,6 +6,7 @@ define([
     "dojox/layout/TableContainer"
 ], function (declare, lang, arrayUtil,
     DojoxTableContainer) {
+
     return declare("hpcc.TableContainer", [DojoxTableContainer], {
 
         layout: function (params) {

+ 4 - 3
esp/src/eclwatch/TargetClustersQueryWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/topic",
 
     "dijit/registry",
@@ -19,10 +18,12 @@ define([
     "src/ESPUtil",
     "hpcc/MachineInformationWidget",
     "hpcc/IFrameWidget"
-], function (declare, i18n, nlsHPCC, topic,
+], function (declare, nlsHPCCMod, topic,
     registry,
     tree, selector,
     GridDetailsWidget, PreflightDetailsWidget, ESPPreflight, ESPRequest, WsTopology, Utility, DelayLoadWidget, ESPUtil, MachineInformationWidget, IFrameWidget) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("TargetClustersQueryWidget", [GridDetailsWidget, ESPUtil.FormHelper], {
         i18n: nlsHPCC,
 

+ 3 - 3
esp/src/eclwatch/TargetSelectClass.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/_base/xhr",
     "dojo/_base/Deferred",
@@ -17,9 +16,10 @@ define([
     "src/WsPackageMaps",
     "src/Utility"
 
-], function (lang, i18n, nlsHPCC, arrayUtil, xhr, Deferred, ItemFileReadStore, all, Memory,
+], function (lang, nlsHPCCMod, arrayUtil, xhr, Deferred, ItemFileReadStore, all, Memory,
     WsTopology, WsWorkunits, FileSpray, WsAccess, WsESDLConfig, WsPackageMaps, Utility) {
 
+    var nlsHPCC = nlsHPCCMod.default;
     return {
         i18n: nlsHPCC,
 

+ 4 - 3
esp/src/eclwatch/TimingPageWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/store/Observable",
 
     "dijit/registry",
@@ -28,11 +27,13 @@ define([
     "dijit/form/DropDownButton",
     "dijit/TooltipDialog"
 
-], function (declare, i18n, nlsHPCC, Observable,
+], function (declare, nlsHPCCMod, Observable,
     registry,
     _TabContainerWidget, ESPWorkunit, DelayLoadWidget, ESPUtil, srcTimings,
     hpccComms,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("TimingPageWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "TimingPageWidget",

+ 4 - 3
esp/src/eclwatch/TimingTreeMapWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/store/Memory",
     "dojo/dom-class",
@@ -18,10 +17,12 @@ define([
 
     "dojox/treemap/TreeMap"
 ],
-    function (declare, lang, i18n, nlsHPCC, arrayUtil, Memory, domClass, domStyle, has,
+    function (declare, lang, nlsHPCCMod, arrayUtil, Memory, domClass, domStyle, has,
         registry,
         _Widget, ESPWorkunit,
         template) {
+
+        var nlsHPCC = nlsHPCCMod.default;
         return declare("TimingTreeMapWidget", [_Widget], {
             templateString: template,
             baseClass: "TimingTreeMapWidget",

+ 4 - 3
esp/src/eclwatch/TopologyDetailsWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom-construct",
 
     "dijit/registry",
@@ -31,10 +30,12 @@ define([
     "dijit/form/SimpleTextarea",
 
     "hpcc/TableContainer"
-], function (declare, i18n, nlsHPCC, domConstruct,
+], function (declare, nlsHPCCMod, domConstruct,
     registry,
     _TabContainerWidget,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("TopologyDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "TopologyDetailsWidget",

+ 4 - 3
esp/src/eclwatch/TopologyWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/lang",
 
     "dijit/form/CheckBox",
@@ -24,10 +23,12 @@ define([
     "src/ws_machine",
     "src/Utility"
 
-], function (declare, i18n, nlsHPCC, lang,
+], function (declare, nlsHPCCMod, lang,
     CheckBox, ValidationTextBox, registry, ToggleButton, Select, ToolbarSeparator,
     tree, selector,
     GridDetailsWidget, PreflightDetailsWidget, ESPTopology, TopologyDetailsWidget, DelayLoadWidget, ESPUtil, FilterDropDownWidget, WsMachine, Utility) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("TopologyWidget", [GridDetailsWidget], {
 
         i18n: nlsHPCC,

+ 4 - 3
esp/src/eclwatch/TpClusterInfoWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
 
     "dgrid/selector",
 
@@ -11,9 +10,11 @@ define([
     "hpcc/DelayLoadWidget",
     "src/ESPUtil"
 
-], function (declare, lang, i18n, nlsHPCC,
+], function (declare, lang, nlsHPCCMod,
     selector,
     GridDetailsWidget, WsTopology, DelayLoadWidget, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("TpClusterInfoWidget", [GridDetailsWidget], {
 
         i18n: nlsHPCC,

+ 4 - 3
esp/src/eclwatch/TpThorStatusWidget.js

@@ -1,7 +1,6 @@
 define([
     "dojo/_base/declare",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom",
     "dojo/dom-construct",
     "dojo/on",
@@ -24,10 +23,12 @@ define([
     "dijit/form/ToggleButton",
     "dijit/Toolbar",
     "dijit/ToolbarSeparator"
-], function (declare, i18n, nlsHPCC, dom, domConstruct, on,
+], function (declare, nlsHPCCMod, dom, domConstruct, on,
     registry,
     _TabContainerWidget, ESPRequest, ESPTopology, DelayLoadWidget,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("TpThorStatusWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "TpThorStatusWidget",

+ 4 - 3
esp/src/eclwatch/UserDetailsWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/dom-form",
 
     "dijit/registry",
@@ -29,10 +28,12 @@ define([
 
     "dojox/form/PasswordValidator"
 
-], function (declare, lang, i18n, nlsHPCC, domForm,
+], function (declare, lang, nlsHPCCMod, domForm,
     registry,
     _TabContainerWidget, Clippy, WsAccess,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("UserDetailsWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "UserDetailsWidget",

+ 4 - 3
esp/src/eclwatch/UserQueryWidget.js

@@ -1,8 +1,7 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
     "dojo/dom-form",
     "dojo/promise/all",
@@ -46,11 +45,13 @@ define([
 
     "hpcc/TableContainer"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil, domForm, all,
+], function (declare, lang, nlsHPCCMod, arrayUtil, domForm, all,
     registry, Menu, MenuItem, MenuSeparator, Select,
     tree, selector,
     _TabContainerWidget, WsAccess, WsAccount, ESPBaseMod, ESPUtil, UserDetailsWidget, GroupDetailsWidget, ShowIndividualPermissionsWidget,
     template) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("UserQueryWidget", [_TabContainerWidget], {
         templateString: template,
         baseClass: "UserQueryWidget",

+ 4 - 3
esp/src/eclwatch/VariablesWidget.js

@@ -1,16 +1,17 @@
 define([
     "dojo/_base/declare",
     "dojo/_base/lang",
-    "dojo/i18n",
-    "dojo/i18n!./nls/hpcc",
+    "src/nlsHPCC",
     "dojo/_base/array",
 
     "hpcc/GridDetailsWidget",
     "src/ESPWorkunit",
     "src/ESPUtil"
 
-], function (declare, lang, i18n, nlsHPCC, arrayUtil,
+], function (declare, lang, nlsHPCCMod, arrayUtil,
     GridDetailsWidget, ESPWorkunit, ESPUtil) {
+
+    var nlsHPCC = nlsHPCCMod.default;
     return declare("VariablesWidget", [GridDetailsWidget], {
         i18n: nlsHPCC,
 

+ 0 - 0
esp/src/eclwatch/VizWidget.js


Some files were not shown because too many files changed in this diff