Skip to content

Commit 36ef8ee

Browse files
committed
Merge pull request #2 from joni2back/translations
App translations (english, spanish, portuguese)
2 parents fe42ae7 + 2bacecf commit 36ef8ee

13 files changed

+320
-108
lines changed

assets/css/main.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ textarea.code {
2020
}
2121

2222
.btn,
23+
.dropdown-menu,
2324
.panel, .panel-heading,
2425
.modal .modal-content {
2526
border-radius: 0!important;

assets/ext/angular-cookies.min.js

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/ext/angular-translate.min.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var FileManagerApp = angular.module('FileManagerApp', []);
1+
var FileManagerApp = angular.module('FileManagerApp', ['pascalprecht.translate', 'ngCookies']);
22

33
FileManagerApp.directive('ngFile', function($parse) {
44
return {

assets/js/controller.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FileManagerApp.controller('FileManagerCtrl', [
2-
'$scope', '$rootScope', '$config', 'item', 'fileNavigator', 'fileUploader',
3-
function($scope, $rootScope, $config, Item, FileNavigator, FileUploader) {
2+
'$scope', '$translate', '$cookies', '$config', 'item', 'fileNavigator', 'fileUploader',
3+
function($scope, $translate, $cookies, $config, Item, FileNavigator, FileUploader) {
44

55
$scope.appName = $config.appName;
66
$scope.orderProp = ['model.type', 'model.name'];
@@ -9,10 +9,16 @@ FileManagerApp.controller('FileManagerCtrl', [
99
$scope.fileNavigator = new FileNavigator();
1010
$scope.fileUploader = FileUploader;
1111
$scope.uploadFileList = [];
12-
$scope.viewTemplate = sessionStorage.viewTemplate || 'main-icons.html';
12+
$scope.viewTemplate = $cookies.viewTemplate || 'main-icons.html';
13+
$scope.language = $cookies.language || 'en';
1314

1415
$scope.setTemplate = function(name) {
15-
$scope.viewTemplate = sessionStorage.viewTemplate = name;
16+
$scope.viewTemplate = $cookies.viewTemplate = name;
17+
};
18+
19+
$scope.changeLanguage = function (locale) {
20+
$scope.language = $cookies.language = locale;
21+
$translate.use(locale);
1622
};
1723

1824
$scope.touch = function(item) {
@@ -23,13 +29,14 @@ FileManagerApp.controller('FileManagerCtrl', [
2329

2430
$scope.smartRightClick = function(item) {
2531
var $contextMenu = $("#context-menu").hide();
32+
var selectors = ".main-navigation .table-files td a, .iconset a.thumbnail";
2633
$scope.touch(item);
27-
$(window.document).on("contextmenu", ".table-files td a, .iconset a.thumbnail", function(e) {
34+
$(window.document).on("contextmenu", selectors, function(e) {
2835
$contextMenu.css({
2936
left: e.pageX,
3037
top: e.pageY
3138
}).show();
32-
return false;
39+
e.preventDefault();
3340
});
3441
};
3542

@@ -134,5 +141,6 @@ FileManagerApp.controller('FileManagerCtrl', [
134141
});
135142
};
136143

144+
$translate.use($scope.language);
137145
$scope.fileNavigator.refresh();
138146
}]);

0 commit comments

Comments
 (0)