From b3e2b9550690cfed147579367691bd336621bbc1 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Sun, 12 Nov 2023 08:47:45 -0500
Subject: [PATCH 01/12] wip

---
 avUi/change-lang-directive/change-lang-directive.js | 5 ++---
 dist/appCommon-v10.0.2.js                           | 7 +++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
index 44ab6a01..9998516b 100644
--- a/avUi/change-lang-directive/change-lang-directive.js
+++ b/avUi/change-lang-directive/change-lang-directive.js
@@ -80,13 +80,12 @@ angular.module('avUi')
         angular.element('#ng-app').attr('lang', scope.deflang);
 
         // async load moment i18n
-        /*angularLoad
+        angularLoad
           .loadScript(ConfigService.base + '/locales/moment/' + lang + '.js')
           .then(function () {
             amMoment.changeLocale(lang);
-          });*/
+          });
       };
-      $i18next.options.useLocalStorage = true;
 
     }
 
diff --git a/dist/appCommon-v10.0.2.js b/dist/appCommon-v10.0.2.js
index 48342159..ae774aa6 100644
--- a/dist/appCommon-v10.0.2.js
+++ b/dist/appCommon-v10.0.2.js
@@ -1132,8 +1132,11 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                 ipCookie("lang", lang, _.extend({
                     expires: 360,
                     path: "/"
-                }, ConfigService.i18nextCookieOptions)), scope.deflang = lang, angular.element("#ng-app").attr("lang", scope.deflang);
-            }, $i18next.options.useLocalStorage = !0;
+                }, ConfigService.i18nextCookieOptions)), scope.deflang = lang, angular.element("#ng-app").attr("lang", scope.deflang), 
+                angularLoad.loadScript(ConfigService.base + "/locales/moment/" + lang + ".js").then(function() {
+                    amMoment.changeLocale(lang);
+                });
+            };
         },
         templateUrl: "avUi/change-lang-directive/change-lang-directive.html"
     };

From 04ba6b6fbcd0cb21ad68ec199a95e44cff127807 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Sun, 12 Nov 2023 10:54:52 -0500
Subject: [PATCH 02/12] wip

---
 avUi/change-lang-directive/change-lang-directive.js | 1 +
 dist/appCommon-v10.0.2.js                           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
index 9998516b..f18ab5d8 100644
--- a/avUi/change-lang-directive/change-lang-directive.js
+++ b/avUi/change-lang-directive/change-lang-directive.js
@@ -86,6 +86,7 @@ angular.module('avUi')
             amMoment.changeLocale(lang);
           });
       };
+      scope.changeLang(scope.deflang);
 
     }
 
diff --git a/dist/appCommon-v10.0.2.js b/dist/appCommon-v10.0.2.js
index ae774aa6..4e945c68 100644
--- a/dist/appCommon-v10.0.2.js
+++ b/dist/appCommon-v10.0.2.js
@@ -1136,7 +1136,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                 angularLoad.loadScript(ConfigService.base + "/locales/moment/" + lang + ".js").then(function() {
                     amMoment.changeLocale(lang);
                 });
-            };
+            }, scope.changeLang(scope.deflang);
         },
         templateUrl: "avUi/change-lang-directive/change-lang-directive.html"
     };

From 2dfa901918665189370fd9ce2054b18e6a66c189 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Sun, 12 Nov 2023 11:03:32 -0500
Subject: [PATCH 03/12] wip

---
 avUi/change-lang-directive/change-lang-directive.js | 2 +-
 dist/appCommon-v10.0.2.js                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
index f18ab5d8..c25afd75 100644
--- a/avUi/change-lang-directive/change-lang-directive.js
+++ b/avUi/change-lang-directive/change-lang-directive.js
@@ -50,7 +50,6 @@ angular.module('avUi')
       scope.changeLang = function(lang)
       {
         $i18next.options.lng = lang;
-        $i18next.options.useLocalStorage = true;
 
         // load i18n_overrides if any
         if (angular.isDefined($window.i18nOverride))
@@ -85,6 +84,7 @@ angular.module('avUi')
           .then(function () {
             amMoment.changeLocale(lang);
           });
+        $i18next.options.useLocalStorage = true;
       };
       scope.changeLang(scope.deflang);
 
diff --git a/dist/appCommon-v10.0.2.js b/dist/appCommon-v10.0.2.js
index 4e945c68..35c374ce 100644
--- a/dist/appCommon-v10.0.2.js
+++ b/dist/appCommon-v10.0.2.js
@@ -1126,7 +1126,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                     angular.element("#lang-dropdown-toggle").click();
                 }, 0);
             }), scope.changeLang = function(lang) {
-                $i18next.options.lng = lang, $i18next.options.useLocalStorage = !0, angular.isDefined($window.i18nOverride) && $window.i18n.preload([ lang ], function() {
+                $i18next.options.lng = lang, angular.isDefined($window.i18nOverride) && $window.i18n.preload([ lang ], function() {
                     I18nOverride($window.i18nOverride, !0);
                 }), console.log("setting cookie");
                 ipCookie("lang", lang, _.extend({
@@ -1135,7 +1135,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                 }, ConfigService.i18nextCookieOptions)), scope.deflang = lang, angular.element("#ng-app").attr("lang", scope.deflang), 
                 angularLoad.loadScript(ConfigService.base + "/locales/moment/" + lang + ".js").then(function() {
                     amMoment.changeLocale(lang);
-                });
+                }), $i18next.options.useLocalStorage = !0;
             }, scope.changeLang(scope.deflang);
         },
         templateUrl: "avUi/change-lang-directive/change-lang-directive.html"

From a0d41ca2639f7c16ad276f636a540d2cd6bf7ea8 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Sun, 12 Nov 2023 11:24:20 -0500
Subject: [PATCH 04/12] wip

---
 avUi/change-lang-directive/change-lang-directive.js | 5 +++--
 dist/appCommon-v10.0.2.js                           | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
index c25afd75..529347dc 100644
--- a/avUi/change-lang-directive/change-lang-directive.js
+++ b/avUi/change-lang-directive/change-lang-directive.js
@@ -86,8 +86,9 @@ angular.module('avUi')
           });
         $i18next.options.useLocalStorage = true;
       };
-      scope.changeLang(scope.deflang);
-
+      setTimeout(function () {
+        scope.changeLang(scope.deflang);
+      }, 100);
     }
 
     return {
diff --git a/dist/appCommon-v10.0.2.js b/dist/appCommon-v10.0.2.js
index 35c374ce..d0fd844c 100644
--- a/dist/appCommon-v10.0.2.js
+++ b/dist/appCommon-v10.0.2.js
@@ -1136,7 +1136,9 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                 angularLoad.loadScript(ConfigService.base + "/locales/moment/" + lang + ".js").then(function() {
                     amMoment.changeLocale(lang);
                 }), $i18next.options.useLocalStorage = !0;
-            }, scope.changeLang(scope.deflang);
+            }, setTimeout(function() {
+                scope.changeLang(scope.deflang);
+            }, 100);
         },
         templateUrl: "avUi/change-lang-directive/change-lang-directive.html"
     };

From 9acc9f287e3fd882f7c20097bada947cf6737ecf Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Sun, 12 Nov 2023 11:33:23 -0500
Subject: [PATCH 05/12] wip

---
 avUi/change-lang-directive/change-lang-directive.js | 8 ++++----
 dist/appCommon-v10.0.2.js                           | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
index 529347dc..426e2603 100644
--- a/avUi/change-lang-directive/change-lang-directive.js
+++ b/avUi/change-lang-directive/change-lang-directive.js
@@ -84,11 +84,11 @@ angular.module('avUi')
           .then(function () {
             amMoment.changeLocale(lang);
           });
-        $i18next.options.useLocalStorage = true;
+        setTimeout(function () {
+          $i18next.options.useLocalStorage = true;
+        }, 1000);
       };
-      setTimeout(function () {
-        scope.changeLang(scope.deflang);
-      }, 100);
+      scope.changeLang(scope.deflang);
     }
 
     return {
diff --git a/dist/appCommon-v10.0.2.js b/dist/appCommon-v10.0.2.js
index d0fd844c..fb183e4f 100644
--- a/dist/appCommon-v10.0.2.js
+++ b/dist/appCommon-v10.0.2.js
@@ -1135,10 +1135,10 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                 }, ConfigService.i18nextCookieOptions)), scope.deflang = lang, angular.element("#ng-app").attr("lang", scope.deflang), 
                 angularLoad.loadScript(ConfigService.base + "/locales/moment/" + lang + ".js").then(function() {
                     amMoment.changeLocale(lang);
-                }), $i18next.options.useLocalStorage = !0;
-            }, setTimeout(function() {
-                scope.changeLang(scope.deflang);
-            }, 100);
+                }), setTimeout(function() {
+                    $i18next.options.useLocalStorage = !0;
+                }, 1e3);
+            }, scope.changeLang(scope.deflang);
         },
         templateUrl: "avUi/change-lang-directive/change-lang-directive.html"
     };

From 86a2ed190dbd8f79e107e6504f846e394bf08c36 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Sun, 12 Nov 2023 11:41:18 -0500
Subject: [PATCH 06/12] wip

---
 avUi/change-lang-directive/change-lang-directive.js | 8 ++++----
 dist/appCommon-v10.0.2.js                           | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
index 426e2603..85dfb9de 100644
--- a/avUi/change-lang-directive/change-lang-directive.js
+++ b/avUi/change-lang-directive/change-lang-directive.js
@@ -84,11 +84,11 @@ angular.module('avUi')
           .then(function () {
             amMoment.changeLocale(lang);
           });
-        setTimeout(function () {
-          $i18next.options.useLocalStorage = true;
-        }, 1000);
+        $i18next.options.useLocalStorage = true;
       };
-      scope.changeLang(scope.deflang);
+      setTimeout(function () {
+        scope.changeLang(scope.deflang);
+      }, 5000);
     }
 
     return {
diff --git a/dist/appCommon-v10.0.2.js b/dist/appCommon-v10.0.2.js
index fb183e4f..68ea1c6c 100644
--- a/dist/appCommon-v10.0.2.js
+++ b/dist/appCommon-v10.0.2.js
@@ -1135,10 +1135,10 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                 }, ConfigService.i18nextCookieOptions)), scope.deflang = lang, angular.element("#ng-app").attr("lang", scope.deflang), 
                 angularLoad.loadScript(ConfigService.base + "/locales/moment/" + lang + ".js").then(function() {
                     amMoment.changeLocale(lang);
-                }), setTimeout(function() {
-                    $i18next.options.useLocalStorage = !0;
-                }, 1e3);
-            }, scope.changeLang(scope.deflang);
+                }), $i18next.options.useLocalStorage = !0;
+            }, setTimeout(function() {
+                scope.changeLang(scope.deflang);
+            }, 5e3);
         },
         templateUrl: "avUi/change-lang-directive/change-lang-directive.html"
     };

From b53b3c7d43cc434164444641ab82d2036cf30639 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Sun, 12 Nov 2023 11:49:23 -0500
Subject: [PATCH 07/12] wip

---
 avUi/change-lang-directive/change-lang-directive.js | 2 +-
 dist/appCommon-v10.0.2.js                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
index 85dfb9de..0b539961 100644
--- a/avUi/change-lang-directive/change-lang-directive.js
+++ b/avUi/change-lang-directive/change-lang-directive.js
@@ -50,6 +50,7 @@ angular.module('avUi')
       scope.changeLang = function(lang)
       {
         $i18next.options.lng = lang;
+        $i18next.options.useLocalStorage = true;
 
         // load i18n_overrides if any
         if (angular.isDefined($window.i18nOverride))
@@ -84,7 +85,6 @@ angular.module('avUi')
           .then(function () {
             amMoment.changeLocale(lang);
           });
-        $i18next.options.useLocalStorage = true;
       };
       setTimeout(function () {
         scope.changeLang(scope.deflang);
diff --git a/dist/appCommon-v10.0.2.js b/dist/appCommon-v10.0.2.js
index 68ea1c6c..8d1e5ced 100644
--- a/dist/appCommon-v10.0.2.js
+++ b/dist/appCommon-v10.0.2.js
@@ -1126,7 +1126,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                     angular.element("#lang-dropdown-toggle").click();
                 }, 0);
             }), scope.changeLang = function(lang) {
-                $i18next.options.lng = lang, angular.isDefined($window.i18nOverride) && $window.i18n.preload([ lang ], function() {
+                $i18next.options.lng = lang, $i18next.options.useLocalStorage = !0, angular.isDefined($window.i18nOverride) && $window.i18n.preload([ lang ], function() {
                     I18nOverride($window.i18nOverride, !0);
                 }), console.log("setting cookie");
                 ipCookie("lang", lang, _.extend({
@@ -1135,7 +1135,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                 }, ConfigService.i18nextCookieOptions)), scope.deflang = lang, angular.element("#ng-app").attr("lang", scope.deflang), 
                 angularLoad.loadScript(ConfigService.base + "/locales/moment/" + lang + ".js").then(function() {
                     amMoment.changeLocale(lang);
-                }), $i18next.options.useLocalStorage = !0;
+                });
             }, setTimeout(function() {
                 scope.changeLang(scope.deflang);
             }, 5e3);

From cf18a5995b98cd17920bec45a71112b4b668e60b Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Sun, 12 Nov 2023 12:26:34 -0500
Subject: [PATCH 08/12] wip

---
 avUi/change-lang-directive/change-lang-directive.js | 3 ---
 dist/appCommon-v10.0.2.js                           | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
index 0b539961..f405b57e 100644
--- a/avUi/change-lang-directive/change-lang-directive.js
+++ b/avUi/change-lang-directive/change-lang-directive.js
@@ -86,9 +86,6 @@ angular.module('avUi')
             amMoment.changeLocale(lang);
           });
       };
-      setTimeout(function () {
-        scope.changeLang(scope.deflang);
-      }, 5000);
     }
 
     return {
diff --git a/dist/appCommon-v10.0.2.js b/dist/appCommon-v10.0.2.js
index 8d1e5ced..ae774aa6 100644
--- a/dist/appCommon-v10.0.2.js
+++ b/dist/appCommon-v10.0.2.js
@@ -1136,9 +1136,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                 angularLoad.loadScript(ConfigService.base + "/locales/moment/" + lang + ".js").then(function() {
                     amMoment.changeLocale(lang);
                 });
-            }, setTimeout(function() {
-                scope.changeLang(scope.deflang);
-            }, 5e3);
+            };
         },
         templateUrl: "avUi/change-lang-directive/change-lang-directive.html"
     };

From 9f674bc4ecd094769ba0d9b8a5c627e73d2fd786 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Sun, 12 Nov 2023 12:36:48 -0500
Subject: [PATCH 09/12] wip

---
 avUi/change-lang-directive/change-lang-directive.js | 4 ++--
 dist/appCommon-v10.0.2.js                           | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
index f405b57e..58fe5150 100644
--- a/avUi/change-lang-directive/change-lang-directive.js
+++ b/avUi/change-lang-directive/change-lang-directive.js
@@ -80,11 +80,11 @@ angular.module('avUi')
         angular.element('#ng-app').attr('lang', scope.deflang);
 
         // async load moment i18n
-        angularLoad
+        /*angularLoad
           .loadScript(ConfigService.base + '/locales/moment/' + lang + '.js')
           .then(function () {
             amMoment.changeLocale(lang);
-          });
+          });*/
       };
     }
 
diff --git a/dist/appCommon-v10.0.2.js b/dist/appCommon-v10.0.2.js
index ae774aa6..d0bc5f9e 100644
--- a/dist/appCommon-v10.0.2.js
+++ b/dist/appCommon-v10.0.2.js
@@ -1132,10 +1132,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                 ipCookie("lang", lang, _.extend({
                     expires: 360,
                     path: "/"
-                }, ConfigService.i18nextCookieOptions)), scope.deflang = lang, angular.element("#ng-app").attr("lang", scope.deflang), 
-                angularLoad.loadScript(ConfigService.base + "/locales/moment/" + lang + ".js").then(function() {
-                    amMoment.changeLocale(lang);
-                });
+                }, ConfigService.i18nextCookieOptions)), scope.deflang = lang, angular.element("#ng-app").attr("lang", scope.deflang);
             };
         },
         templateUrl: "avUi/change-lang-directive/change-lang-directive.html"

From b4579d5d252f62f9f2c8ce7e1a362a009d61d25d Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Sun, 12 Nov 2023 12:58:38 -0500
Subject: [PATCH 10/12] wip

---
 avUi/change-lang-directive/change-lang-directive.js | 4 ++--
 dist/appCommon-v10.0.2.js                           | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
index 58fe5150..f405b57e 100644
--- a/avUi/change-lang-directive/change-lang-directive.js
+++ b/avUi/change-lang-directive/change-lang-directive.js
@@ -80,11 +80,11 @@ angular.module('avUi')
         angular.element('#ng-app').attr('lang', scope.deflang);
 
         // async load moment i18n
-        /*angularLoad
+        angularLoad
           .loadScript(ConfigService.base + '/locales/moment/' + lang + '.js')
           .then(function () {
             amMoment.changeLocale(lang);
-          });*/
+          });
       };
     }
 
diff --git a/dist/appCommon-v10.0.2.js b/dist/appCommon-v10.0.2.js
index d0bc5f9e..ae774aa6 100644
--- a/dist/appCommon-v10.0.2.js
+++ b/dist/appCommon-v10.0.2.js
@@ -1132,7 +1132,10 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                 ipCookie("lang", lang, _.extend({
                     expires: 360,
                     path: "/"
-                }, ConfigService.i18nextCookieOptions)), scope.deflang = lang, angular.element("#ng-app").attr("lang", scope.deflang);
+                }, ConfigService.i18nextCookieOptions)), scope.deflang = lang, angular.element("#ng-app").attr("lang", scope.deflang), 
+                angularLoad.loadScript(ConfigService.base + "/locales/moment/" + lang + ".js").then(function() {
+                    amMoment.changeLocale(lang);
+                });
             };
         },
         templateUrl: "avUi/change-lang-directive/change-lang-directive.html"

From 71e55661313e5ec55f9335f718da0be9755c2bfb Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Sun, 12 Nov 2023 13:07:22 -0500
Subject: [PATCH 11/12] wip

---
 avUi/change-lang-directive/change-lang-directive.js | 2 +-
 dist/appCommon-v10.0.2.js                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
index f405b57e..4d1f2141 100644
--- a/avUi/change-lang-directive/change-lang-directive.js
+++ b/avUi/change-lang-directive/change-lang-directive.js
@@ -50,7 +50,7 @@ angular.module('avUi')
       scope.changeLang = function(lang)
       {
         $i18next.options.lng = lang;
-        $i18next.options.useLocalStorage = true;
+        //$i18next.options.useLocalStorage = true;
 
         // load i18n_overrides if any
         if (angular.isDefined($window.i18nOverride))
diff --git a/dist/appCommon-v10.0.2.js b/dist/appCommon-v10.0.2.js
index ae774aa6..61e4d4b0 100644
--- a/dist/appCommon-v10.0.2.js
+++ b/dist/appCommon-v10.0.2.js
@@ -1126,7 +1126,7 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
                     angular.element("#lang-dropdown-toggle").click();
                 }, 0);
             }), scope.changeLang = function(lang) {
-                $i18next.options.lng = lang, $i18next.options.useLocalStorage = !0, angular.isDefined($window.i18nOverride) && $window.i18n.preload([ lang ], function() {
+                $i18next.options.lng = lang, angular.isDefined($window.i18nOverride) && $window.i18n.preload([ lang ], function() {
                     I18nOverride($window.i18nOverride, !0);
                 }), console.log("setting cookie");
                 ipCookie("lang", lang, _.extend({

From f728616d9bfaf17def8b3da92f6d606534eb7c64 Mon Sep 17 00:00:00 2001
From: Findeton <felix@sequentech.io>
Date: Sun, 12 Nov 2023 13:26:39 -0500
Subject: [PATCH 12/12] wip

---
 .../change-lang-directive.js                  | 20 ++++++++++++-------
 dist/appCommon-v10.0.2.js                     | 11 ++++++----
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/avUi/change-lang-directive/change-lang-directive.js b/avUi/change-lang-directive/change-lang-directive.js
index 4d1f2141..ca7ac143 100644
--- a/avUi/change-lang-directive/change-lang-directive.js
+++ b/avUi/change-lang-directive/change-lang-directive.js
@@ -28,13 +28,15 @@ angular.module('avUi')
     amMoment,
     ConfigService,
     $window,
-    I18nOverride
+    I18nOverride,
+    Authmethod
   ) {
     function link(scope, element, attrs)
     {    
       scope.deflang = window.i18n.lng();
       angular.element('#ng-app').attr('lang', scope.deflang);
       scope.langs =  $i18next.options.lngWhitelist;
+      var isAdmin = Authmethod.isAdmin();
       function triggerDropdown()
       {
         setTimeout(function () {
@@ -50,7 +52,9 @@ angular.module('avUi')
       scope.changeLang = function(lang)
       {
         $i18next.options.lng = lang;
-        //$i18next.options.useLocalStorage = true;
+        if (!isAdmin) {
+          $i18next.options.useLocalStorage = true;
+        }
 
         // load i18n_overrides if any
         if (angular.isDefined($window.i18nOverride))
@@ -80,11 +84,13 @@ angular.module('avUi')
         angular.element('#ng-app').attr('lang', scope.deflang);
 
         // async load moment i18n
-        angularLoad
-          .loadScript(ConfigService.base + '/locales/moment/' + lang + '.js')
-          .then(function () {
-            amMoment.changeLocale(lang);
-          });
+        if (isAdmin) {
+          angularLoad
+            .loadScript(ConfigService.base + '/locales/moment/' + lang + '.js')
+            .then(function () {
+              amMoment.changeLocale(lang);
+            });
+        }
       };
     }
 
diff --git a/dist/appCommon-v10.0.2.js b/dist/appCommon-v10.0.2.js
index 61e4d4b0..374c1042 100644
--- a/dist/appCommon-v10.0.2.js
+++ b/dist/appCommon-v10.0.2.js
@@ -1115,25 +1115,28 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
             });
         }), $rootScope.$broadcast("i18nextLanguageChange", $window.i18n.lng()));
     };
-} ]), angular.module("avUi").directive("avChangeLang", [ "$i18next", "ipCookie", "angularLoad", "amMoment", "ConfigService", "$window", "I18nOverride", function($i18next, ipCookie, angularLoad, amMoment, ConfigService, $window, I18nOverride) {
+} ]), angular.module("avUi").directive("avChangeLang", [ "$i18next", "ipCookie", "angularLoad", "amMoment", "ConfigService", "$window", "I18nOverride", "Authmethod", function($i18next, ipCookie, angularLoad, amMoment, ConfigService, $window, I18nOverride, Authmethod) {
     return {
         restrict: "AE",
         scope: {},
         link: function(scope, element, attrs) {
             scope.deflang = window.i18n.lng(), angular.element("#ng-app").attr("lang", scope.deflang), 
-            scope.langs = $i18next.options.lngWhitelist, element.on("click", function() {
+            scope.langs = $i18next.options.lngWhitelist;
+            var isAdmin = Authmethod.isAdmin();
+            element.on("click", function() {
                 setTimeout(function() {
                     angular.element("#lang-dropdown-toggle").click();
                 }, 0);
             }), scope.changeLang = function(lang) {
-                $i18next.options.lng = lang, angular.isDefined($window.i18nOverride) && $window.i18n.preload([ lang ], function() {
+                $i18next.options.lng = lang, isAdmin || ($i18next.options.useLocalStorage = !0), 
+                angular.isDefined($window.i18nOverride) && $window.i18n.preload([ lang ], function() {
                     I18nOverride($window.i18nOverride, !0);
                 }), console.log("setting cookie");
                 ipCookie("lang", lang, _.extend({
                     expires: 360,
                     path: "/"
                 }, ConfigService.i18nextCookieOptions)), scope.deflang = lang, angular.element("#ng-app").attr("lang", scope.deflang), 
-                angularLoad.loadScript(ConfigService.base + "/locales/moment/" + lang + ".js").then(function() {
+                isAdmin && angularLoad.loadScript(ConfigService.base + "/locales/moment/" + lang + ".js").then(function() {
                     amMoment.changeLocale(lang);
                 });
             };