[#117] Language change

fundacion-sadosky · Aug 27, 2024 · 85dc6bb · 85dc6bb
1 parent 33359a8
commit 85dc6bb
Show file tree

Hide file tree

Showing 6 changed files with 1,369 additions and 1,733 deletions.
diff --git a/app/assets/javascripts/home/main.js b/app/assets/javascripts/home/main.js
@@ -11,7 +11,7 @@ angular
 	.controller('errorController', ['$scope', 'errorService', 'alertService', ErrorController])
 	.controller('headerController', ['$scope', 'userService', '$location', '$modal', 'hotkeys','appConf', HeaderController])
 	.service('notificationsService', ['$log','$rootScope', 'cryptoService', 'userService', NotificationsService])
-	.controller('notificationsController', [ '$scope', '$log', '$i18next', 'notificationsService', 'userService', 'inboxService', NotificationsController])
+	.controller('notificationsController', [ '$scope', '$rootScope', '$log', '$timeout', '$route', '$i18next', 'notificationsService', 'userService', 'inboxService', NotificationsController])
     .config(['$routeProvider', function($routeProvider) {
 		$routeProvider
 			.when('/configuracion', {templateUrl: '/assets/javascripts/home/views/configuracion.html'});

diff --git a/app/assets/javascripts/home/notificationsController.js b/app/assets/javascripts/home/notificationsController.js
@@ -1,7 +1,7 @@
 define([], function() {
 'use strict';
 
-function NotificationsController($scope, $log, $i18next, notificationsService, userService, inboxService) {
+function NotificationsController($scope, $rootScope, $log, $timeout, $route, $i18next, notificationsService, userService, inboxService) {
 
 	$scope.notiCount = 0;
 	$scope.stall = true;
@@ -68,7 +68,16 @@ function NotificationsController($scope, $log, $i18next, notificationsService, u
 			nextLangBack = "en";
 		}
 		$i18next.options.lng = nextLangFront;
-		userService.setLanguage(nextLangBack);
+		// userService.setLanguage(nextLangBack);
+		$rootScope.language = nextLangFront;
+		$route.reload();
+		$rootScope.$apply();
+		$timeout(function() {
+			$rootScope.$broadcast('languageChanged');
+			$rootScope.$broadcast('languageChanged');
+			$rootScope.$digest();
+		});
+		$scope.apply();
 	};
 
 }

diff --git a/app/assets/javascripts/home/views/notifications.html b/app/assets/javascripts/home/views/notifications.html
@@ -2,10 +2,10 @@
 
 	<div class="centered-text" title="Cambio de Idioma">
 		<span
-			ng-click="changeLanguage()">
-			<i class="bold" ng-if="getLanguage() === 'en'" title="English">EN</i>
-			<i class="bold" ng-if="getLanguage() === 'fr'" title="Frances">EN</i>
-			<i class="bold" ng-if="getLanguage() === 'es-AR'" title="Español">ES</i>
+			ng-click="changeLanguage()"
+		>
+			<a href="#/home" class="bold" ng-if="getLanguage() === 'en'" title="English">EN</a>
+			<a href="#/home" class="bold" ng-if="getLanguage() === 'es-AR'" title="Español">ES</a>
 		</span>
 	</div>
 

diff --git a/app/views/index.scala.html b/app/views/index.scala.html
@@ -1,5 +1,5 @@
 @(manifest: Html, mode: String)<!DOCTYPE html>
-<html lang="en">
+@*<html lang="en">*@
 @manifest
 
     <head>