Merge pull request #10 from DevExpress/localization-imports-rework

Rework localization imports
DevExpress · Dec 13, 2016 · 51ab02b · 51ab02b
2 parents f370a8e + b8dd63b
commit 51ab02b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/examples/bundled.html b/examples/bundled.html
@@ -12,11 +12,11 @@
     <script type="text/javascript" src="../node_modules/jszip/dist/jszip.js"></script>
 
     <script type="text/javascript" src="../node_modules/devextreme/dist/js/dx.all.debug.js"></script>
-    <script type="text/javascript" src="../node_modules/devextreme/dist/js/localization/dx.all.de.js"></script>
-    <script type="text/javascript" src="../node_modules/devextreme/dist/js/localization/dx.all.ja.js"></script>
-    <script type="text/javascript" src="../node_modules/devextreme/dist/js/localization/dx.all.ru.js"></script>
+    <script type="text/javascript" src="../node_modules/devextreme/dist/js/localization/dx.messages.de.js"></script>
+    <script type="text/javascript" src="../node_modules/devextreme/dist/js/localization/dx.messages.ja.js"></script>
+    <script type="text/javascript" src="../node_modules/devextreme/dist/js/localization/dx.messages.ru.js"></script>
 
-    <script type="text/javascript" src="../dist/devextreme-intl.dev.js"></script>
+    <script type="text/javascript" src="../dist/devextreme-intl.js"></script>
 </head>
 
 <body>

diff --git a/examples/modular.html b/examples/modular.html
@@ -16,9 +16,10 @@
             },
             map: {
                 devextreme: 'npm:devextreme',
-                'devextreme-intl': '../dist/devextreme-intl.dev.js',
+                'devextreme-intl': '../dist/devextreme-intl.js',
                 jquery: 'npm:jquery/dist/jquery.min.js',
-                jszip: 'npm:jszip/dist/jszip.min.js'
+                jszip: 'npm:jszip/dist/jszip.min.js',
+                json: 'npm:systemjs-plugin-json/json.js'
             },
             packages: {
                 'devextreme': {
@@ -33,22 +34,15 @@
     <script>
         System.import('devextreme-intl');
 
-        System.import('devextreme/localization/de/core.de.js');
-        System.import('devextreme/localization/de/widgets-base.de.js');
-        System.import('devextreme/localization/de/widgets-mobile.de.js');
-        System.import('devextreme/localization/de/widgets-web.de.js');
-
-        System.import('devextreme/localization/ja/core.ja.js');
-        System.import('devextreme/localization/ja/widgets-base.ja.js');
-        System.import('devextreme/localization/ja/widgets-mobile.ja.js');
-        System.import('devextreme/localization/ja/widgets-web.ja.js');
+        System.import('devextreme/localization').then(function(localization) {
+            var deMessages = System.import('devextreme/localization/messages/de.json!json');
+            var jaMessages = System.import('devextreme/localization/messages/ja.json!json');
+            var ruMessages = System.import('devextreme/localization/messages/ru.json!json');
 
-        System.import('devextreme/localization/ru/core.ru.js');
-        System.import('devextreme/localization/ru/widgets-base.ru.js');
-        System.import('devextreme/localization/ru/widgets-mobile.ru.js');
-        System.import('devextreme/localization/ru/widgets-web.ru.js');
+            localization.loadMessages(deMessages);
+            localization.loadMessages(jaMessages);
+            localization.loadMessages(ruMessages);
 
-        System.import('devextreme/localization').then(function(localization) {
             localization.locale(navigator.language);
         });
     </script>

diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
     "phantomjs-prebuilt": "^2.1.7",
     "qunitjs": "^1.23.1",
     "systemjs": "^0.19.41",
+    "systemjs-plugin-json": "^0.2.2",
     "webpack": "^1.13.3",
     "yargs": "^6.4.0"
   },