Skip to content

Commit f501993

Browse files
committed
set lang by request query param
1 parent 30e5923 commit f501993

File tree

3 files changed

+31
-11
lines changed

3 files changed

+31
-11
lines changed

assets/js/config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
(function() {
88
angular.module('FileManagerApp').constant("$config", {
99
appName: "https://github.com/joni2back/angular-filemanager",
10-
listUrl: "bridges/php/handler.php",
10+
defaultLang: "en",
11+
12+
listUrl: "bridges/php/handler.php",
1113
uploadUrl: "/hosting/filemanager/upload",
1214

1315
renameUrl: "/hosting/filemanager/item/rename",

assets/js/controller.js

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,17 @@
1616
$scope.fileNavigator = new FileNavigator();
1717
$scope.fileUploader = FileUploader;
1818
$scope.uploadFileList = [];
19-
$scope.viewTemplate = $cookies.viewTemplate || 'main-icons.html';
20-
$scope.language = $cookies.language || 'en';
21-
22-
$translate.use($scope.language);
23-
$scope.fileNavigator.refresh();
19+
$scope.viewTemplate = $cookies.viewTemplate || 'main-table.html';
2420

2521
$scope.setTemplate = function(name) {
2622
$scope.viewTemplate = $cookies.viewTemplate = name;
2723
};
2824

2925
$scope.changeLanguage = function (locale) {
30-
$scope.language = $cookies.language = locale;
31-
$translate.use(locale);
26+
if (locale) {
27+
return $translate.use($cookies.language = locale);
28+
}
29+
$translate.use($cookies.language || $config.defaultLang);
3230
};
3331

3432
$scope.touch = function(item) {
@@ -139,5 +137,19 @@
139137
$('#uploadfile').modal('hide');
140138
});
141139
};
140+
141+
$scope.getQueryParam = function(param) {
142+
var found;
143+
window.location.search.substr(1).split("&").forEach(function(item) {
144+
if (param === item.split("=")[0]) {
145+
found = item.split("=")[1];
146+
}
147+
});
148+
return found;
149+
};
150+
151+
$scope.changeLanguage($scope.getQueryParam('lang'));
152+
$scope.fileNavigator.refresh();
153+
142154
}]);
143155
})();

assets/js/translations.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
(function() {
77
angular.module('FileManagerApp').config(function($translateProvider) {
88
$translateProvider.translations('en', {
9+
filemanager: "File Manager",
910
language: "Language",
1011
english: "English",
1112
spanish: "Spanish",
@@ -69,10 +70,12 @@
6970
error_compressing: "An error occurred compressing the file or folder",
7071
error_extracting: "An error occurred extracting the file",
7172
error_creating_folder: "An error occurred creating the folder",
72-
error_getting_content: "An error occurred getting the content of the file"
73+
error_getting_content: "An error occurred getting the content of the file",
74+
sure_to_start_compression_with: "Are you sure to compress"
7375
});
7476

7577
$translateProvider.translations('pt', {
78+
filemanager: "Gerenciador de arquivos",
7679
language: "Língua",
7780
english: "Inglês",
7881
spanish: "Espanhol",
@@ -136,10 +139,12 @@
136139
error_compressing: "Ocorreu um erro ao comprimir o arquivo ou pasta",
137140
error_extracting: "Ocorreu um erro ao extrair o arquivo",
138141
error_creating_folder: "Ocorreu um erro ao criar a pasta",
139-
error_getting_content: "Ocorreu um erro ao obter o conteúdo do arquivo"
142+
error_getting_content: "Ocorreu um erro ao obter o conteúdo do arquivo",
143+
sure_to_start_compression_with: "Tem certeza que deseja comprimir"
140144
});
141145

142146
$translateProvider.translations('es', {
147+
filemanager: "Administrador de archivos",
143148
language: "Idioma",
144149
english: "Ingles",
145150
spanish: "Español",
@@ -203,7 +208,8 @@
203208
error_compressing: "Ocurrio un error al intentar comprimir el archivo",
204209
error_extracting: "Ocurrio un error al intentar extraer el archivo",
205210
error_creating_folder: "Ocurrio un error al intentar crear la carpeta",
206-
error_getting_content: "Ocurrio un error al obtener el contenido del archivo"
211+
error_getting_content: "Ocurrio un error al obtener el contenido del archivo",
212+
sure_to_start_compression_with: "Esta seguro que desea comprimir"
207213
});
208214
});
209215
})();

0 commit comments

Comments
 (0)