jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Johannes Zellner
2021-02-15 17:41:59 +01:00
parent 1efcfc69f4
commit 6427f16743
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/profile.js
+8 -3
View File
@@ -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; });
});
});
src/views/settings.js
+7 -1
View File
@@ -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;
});