WIP

sequentech · Feb 7, 2024 · 3e70e6d · 3e70e6d
1 parent e59fa29
commit 3e70e6d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
@@ -36,7 +36,7 @@ angular.module('avUi')
     {    
       scope.deflang = $window.i18next.resolvedLanguage;
       angular.element('#ng-app').attr('lang', scope.deflang);
-      scope.langs =  $i18next.options.lngWhitelist;
+      scope.langs =  $window.i18next.options.lngWhitelist;
       var isAdmin = Authmethod.isAdmin();
       function triggerDropdown()
       {

diff --git a/avUi/custom-i18n-filter/custom-i18n-filter.js b/avUi/custom-i18n-filter/custom-i18n-filter.js
@@ -28,7 +28,7 @@ angular
       return function(data, key)
       {
         var suffix = "_i18n";
-        var lang = window.i18n.lng();
+        var lang = window.i18next.resolvedLanguage;
         var value = '';
         if (_.isString(key) && _.isObject(data) && _.isString(lang)) {
             value = data[key + suffix] && data[key + suffix][lang] || data[key] || value;

diff --git a/dist/appCommon-v10.1.0.js b/dist/appCommon-v10.1.0.js
@@ -1157,7 +1157,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
         scope: {},
         link: function(scope, element, attrs) {
             scope.deflang = $window.i18next.resolvedLanguage, angular.element("#ng-app").attr("lang", scope.deflang), 
-            scope.langs = $i18next.options.lngWhitelist;
+            scope.langs = $window.i18next.options.lngWhitelist;
             var isAdmin = Authmethod.isAdmin();
             element.on("click", function() {
                 setTimeout(function() {
@@ -1736,7 +1736,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
     };
 } ]), angular.module("avUi").filter("customI18n", function() {
     return function(data, key) {
-        var lang = window.i18n.lng(), value = "";
+        var lang = window.i18next.resolvedLanguage, value = "";
         return value = _.isString(key) && _.isObject(data) && _.isString(lang) ? data[key + "_i18n"] && data[key + "_i18n"][lang] || data[key] || value : value;
     };
 }), angular.module("common-ui", [ "ui.bootstrap", "ui.utils", "ui.router", "ngAnimate", "ngResource", "ngCookies", "ipCookie", "ngSanitize", "infinite-scroll", "angularMoment", "SequentConfig", "jm.i18next", "avRegistration", "avUi", "avTest", "angularFileUpload", "dndLists", "angularLoad", "ng-autofocus" ]), 

diff --git a/dist/index.html b/dist/index.html
@@ -1,4 +1,2 @@
-<!DOCTYPE html><html id="ng-app" ng-app="common-ui"><head><title>Sequent Tech</title><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><base href="/"><meta charset="utf-8"><link rel="stylesheet" id="theme" href="/themes/default/app.min.css"></head><body><!-- Livereload script for development only (stripped during dist build) --><!-- IE8 bind workaround (needed for less) --><!-- JS from node modules --><!--
-    node_modules/i18next/i18next.js
-  --><!-- Add New Bower Component JS Above --><!-- JS from Vendor Components --><!-- Add New Vendor Component JS Above --><!-- Configuration file JS --><!-- Themes JS --><!-- Main App JS --><!-- registration --><!-- ui --><!-- for security, we do not include the dynamic directive in the app,
+<!DOCTYPE html><html id="ng-app" ng-app="common-ui"><head><title>Sequent Tech</title><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><base href="/"><meta charset="utf-8"><link rel="stylesheet" id="theme" href="/themes/default/app.min.css"></head><body><!-- Livereload script for development only (stripped during dist build) --><!-- IE8 bind workaround (needed for less) --><!-- JS from node modules --><!-- Add New Bower Component JS Above --><!-- JS from Vendor Components --><!-- Add New Vendor Component JS Above --><!-- Configuration file JS --><!-- Themes JS --><!-- Main App JS --><!-- registration --><!-- ui --><!-- for security, we do not include the dynamic directive in the app,
        so in the compiled app e2e tests are not expected work. --><!-- IE10 viewport hack for Surface/desktop Windows 8 bug --><!-- IE9 console workaround --><!-- Add New Component JS Above --><div id="no-js">Page is taking some time to load, wait a moment please. If it takes too long, please check that you have javascript activated, try with another browser or contact us.</div><div id="unsupported-browser">For security reasons, your browser is unsupported. Please use a newer web browser (if you are using Internet Explorer, use version 9 or newer).</div><div><!-- Shown while loading --><div id="angular-preloading" class="avb-start-loading"></div><!-- Main content --><div id="content"><!-- This is where angular injects its content --><div ui-view=""></div></div></div><script src="/libnocompat-v10.1.0.js"></script><!--All the source code of this program under copyright. Take a look at the license details at https://github.com/sequent/sequent-core-common/blob/master/README.md --><script src="/appCommon-v10.1.0.js"></script><script src="/SequentPlugins-v10.1.0.js"></script></body></html>
diff --git a/index.html b/index.html
@@ -32,9 +32,6 @@
   <script src="node_modules/angular-cookies/angular-cookies.js" class="lib"></script>
   <script src="node_modules/angular-cookie/angular-cookie.js" class="lib"></script>
   <script src="node_modules/angular-load/angular-load.js" class="lib"></script>
-  <!--
-    node_modules/i18next/i18next.js
-  -->
   <script src="node_modules/i18next-http-backend/i18nextHttpBackend.js" class="lib"></script>
   <script src="node_modules/ng-i18next/dist/ng-i18next.js" class="lib"></script>
   <script src="node_modules/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js" class="lib"></script>