From 6427f16743d5d44befa4cda53ba73dcc0d5cc81d Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Mon, 15 Feb 2021 17:41:59 +0100
Subject: [PATCH] Always show English versions of languages to avoid re-setting
 issues

---
 src/views/profile.js  | 11 ++++++++---
 src/views/settings.js |  8 +++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/profile.js b/src/views/profile.js
index 282ccb566..7ab63e49b 100644
--- a/src/views/profile.js
+++ b/src/views/profile.js
@@ -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; });
         });
     });
diff --git a/src/views/settings.js b/src/views/settings.js
index 3edd4a674..df5782cfc 100644
--- a/src/views/settings.js
+++ b/src/views/settings.js
@@ -417,7 +417,13 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             Client.getLanguage(function (error, usedLang) {
                 if (error) return console.error('Unable to fetch language:', error);
 
-                $scope.language.availableLanguages = Client.getAvailableLanguages().map(function (l) { return { display: $translate.instant('lang.'+l), id: l }});
+                $scope.language.availableLanguages = Client.getAvailableLanguages().map(function (l) {
+                    return {
+                        // we only show those in english for easier restore
+                        display: $translate.instant('lang.'+l, {}, undefined, 'en'),
+                        id: l
+                    };
+                });
                 $scope.language.currentLanguage = $scope.language.availableLanguages.find(function (l) { return l.id === usedLang; });
                 $scope.language.language = $scope.language.currentLanguage;
             });