Always show English versions of languages to avoid re-setting issues

2021-02-15 17:41:59 +01:00
parent 1efcfc69f4
commit 6427f16743
2 changed files with 15 additions and 4 deletions
@@ -9,8 +9,8 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
    $scope.config = Client.getConfig();
    $scope.apps = Client.getInstalledApps();

-    $scope.language;
-    $scope.languages;
+    $scope.language = '';
+    $scope.languages = [];

    $scope.$watch('language', function (newVal, oldVal) {
        if (newVal === oldVal) return;
@@ -607,7 +607,12 @@ angular.module('Application').controller('ProfileController', ['$scope', '$trans
        $translate.onReady(function () {
            var usedLang = $translate.use() || $translate.fallbackLanguage();

-            $scope.languages = Client.getAvailableLanguages().map(function (l) { return { display: $translate.instant('lang.'+l), id: l }});
+            $scope.languages = Client.getAvailableLanguages().map(function (l) {
+                return {
+                    display: $translate.instant('lang.'+l, {}, undefined, 'en'),
+                    id: l
+                };
+            });
            $scope.language = $scope.languages.find(function (l) { return l.id === usedLang; });
        });
    });