Commit 3726d960 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Erradica uso de banderas para los idiomas 

Emplea nombres de idiomas en su versión original para representarlos en
el selector (tanto interno como externo).

Refactoriza vistas externas para aclarar un poco la lógica seguida.

Actualiza submódulo.

Fix #98.
parent 4c03cbac

client-app/src/component/user/LanguageSelector.js

+8 −30
Original line number Diff line number Diff line 
define([

	'src/redmicConfig'

	, 'dojo/_base/declare'

	'dojo/_base/declare'

	, 'dojo/_base/kernel'

	, 'dojo/_base/lang'

	, 'put-selector/put'
@@ -10,8 +9,7 @@ define([ 
	, 'src/component/base/_ShowOnEvt'

	, 'src/component/layout/listMenu/ListMenu'

], function(

	redmicConfig

	, declare

	declare

	, kernel

	, lang

	, put
@@ -43,13 +41,11 @@ define([ 
			this.listMenuConfig = this._merge([{

				parentChannel: this.getChannel(),

				items: [{

					icon: 'flag-icon-background.flag-icon-es',

					label: this.i18n.es,

					label: 'Español',

					callback: '_changeLanguage',

					value: 'es'

				},{

					icon: 'flag-icon-background.flag-icon-gb',

					label: this.i18n.en,

					label: 'English',

					callback: '_changeLanguage',

					value: 'en'

				}]
@@ -58,7 +54,9 @@ define([ 


		_initialize: function() {



			this.listMenu = new declare([ListMenu, _ShowOnEvt]).extend(_ShowInTooltip)(this.listMenuConfig);

			var LanguageTooltipDefinition = declare([ListMenu, _ShowOnEvt]).extend(_ShowInTooltip);



			this.listMenu = new LanguageTooltipDefinition(this.listMenuConfig);

		},



		_defineSubscriptions: function() {
@@ -75,7 +73,7 @@ define([ 


			put(this.domNode, '[title=$]', this.i18n.language);



			var languageIcon = this._getLanguageIcon(globalThis.lang);

			var languageIcon = 'fa.fa-language';

			put(this.domNode, 'i.' + languageIcon);



			this._publish(this.listMenu.getChannel('ADD_EVT'), {
@@ -98,26 +96,6 @@ define([ 
				hostnameWithoutLang = hostname.replace(kernel.locale + '.', '');



			globalThis.location.href = protocol + '//' + language + '.' + hostnameWithoutLang;

		},



		_getLanguageIcon: function(currentLanguage) {



			var iconClasses;



			if (currentLanguage === 'es') {

				iconClasses = 'flag.flag-icon-background.flag-icon-es';

			} else if (currentLanguage === 'en') {

				iconClasses = 'flag.flag-icon-background.flag-icon-gb';

			} else {

				iconClasses = 'fa.fa-language';

			}



			return iconClasses;

		},



		_getNodeToShow: function() {



			return this.domNode;

		}

	});

});

client-app/src/oldapp/user/views/WhatIsRedmicView.js

+11 −0
Original line number Diff line number Diff line
@@ -36,6 +36,17 @@ define([ 
			this.inherited(arguments);



			on(this.domNode, "click", lang.hitch(this, this._onCloseWhatIsRedmic));

		},



		_onCloseWhatIsRedmic: function(/*event*/ evt) {

			// summary:

			//		Función que cierra la vista que muestra información de redmic.

			//	tags:

			//		callback private



			if (globalThis.location.pathname.includes(this.whatIsRedmicPath)) {

				globalThis.location.href = this.loginPath;

			}

		}

	});

});

client-app/src/oldapp/user/views/_ExternalUserBaseView.js

+9 −26
Original line number Diff line number Diff line
@@ -45,14 +45,14 @@ define([ 


			this.config = {

				baseTemplateProps: {

					_onShowWhatIsRedmic: this._onShowWhatIsRedmic,

					_onCloseWhatIsRedmic: this._onCloseWhatIsRedmic,

					_onShowWhatIsRedmic: lang.hitch(this, this._onShowWhatIsRedmic),

					_getManagerNode: this._getManagerNode,

					_changeLang: this._changeLang

				},

				baseClass: '',

				replaceReg: /\%\[([^\]]+)\]/g,

				whatIsRedmicPath: 'what-is-redmic'

				whatIsRedmicPath: '/what-is-redmic',

				loginPath: '/login'

			};



			lang.mixin(this, this.config, args);
@@ -92,35 +92,18 @@ define([ 
		_onShowWhatIsRedmic: function(event) {

			// summary:

			//		Función que muestra información de redmic.

			//		*** Se ejecuta en el ámbito del template

			//

			//	tags:

			//		callback private

			//



			event.stopPropagation();

			var path = 'what-is-redmic';

			if (globalThis.location.href.indexOf(path) < 0) {

				globalThis.location.href = path;

			} else {

				globalThis.history.back();

			}

		},



		_onCloseWhatIsRedmic: function(/*event*/ evt) {

			// summary:

			//		Función que cierra la vista que muestra información de redmic.

			//		*** Se ejecuta en el ámbito del template

			//

			//	tags:

			//		callback private

			//

			var path = this.whatIsRedmicPath;



			setTimeout(lang.hitch(this, function() {

				if (globalThis.location.href.indexOf(this.whatIsRedmicPath) >= 0) {

					globalThis.history.back();

			if (globalThis.location.pathname.includes(path)) {

				globalThis.location.href = this.loginPath;

			} else {

				globalThis.location.href = path;

			}

			}), 200);

		}

	});

});

client-app/src/oldapp/user/views/templates/ExternalUserBase.html

+4 −3
Original line number Diff line number Diff line
@@ -2,9 +2,10 @@ 
	%[template]

	<!-- Footer -->

	<footer>

		<div class="flags">

			<a data-dojo-attach-event="click: _changeLang" data-dojo-props="es" class="flag-icon-background flag-icon-es"></a>

			<a data-dojo-attach-event="click: _changeLang" data-dojo-props="en" class="flag-icon-background flag-icon-gb"></a>

		<div class="languages">

			<span class="fa fa-language"></span>

			<a data-dojo-attach-event="click: _changeLang" data-dojo-props="es">Español</a>

			<a data-dojo-attach-event="click: _changeLang" data-dojo-props="en">English</a>

		</div>

		<div>

		</div>

style @ 2fbcc291

Compare 2c154fbc to 2fbcc291
Original line number Diff line number Diff line 
Subproject commit 2c154fbcaf5866894bb0637f4bc6a855fa801aaf
 
Subproject commit 2fbcc291ab56505669c73792a2b16abf58fe7c38