Idioma y nombre a mostrar configurables

debian/changelog

@@ -1,4 +1,4 @@
-hedera-web (1.405.12) stable; urgency=low
+hedera-web (1.405.13) stable; urgency=low
 
   * Initial Release.
 

forms/account/conf/locale/ca.json

@@ -4,6 +4,8 @@
 	,"Username": "Nom d'usuari"
 	,"Password": "Contrasenya"
 	,"Email": "Correu electrònic"
+	,"Display name": "Nom a mostrar"
+	,"Language": "Idioma"
 	,"Billing": "Facturació"
 	,"Receive invoices by email": "Rebre factures per correu electrònic"
 	

forms/account/conf/locale/en.json

@@ -4,6 +4,8 @@
 	,"Username": "Username"
 	,"Password": "Password"
 	,"Email": "Email"
+	,"Display name": "Display name"
+	,"Language": "Language"
 	,"Billing": "Billing"
 	,"Receive invoices by email": "Receive invoices by email"
 	

forms/account/conf/locale/es.json

@@ -4,6 +4,8 @@
 	,"Username": "Nombre de usuario"
 	,"Password": "Contraseña"
 	,"Email": "Correo electrónico"
+	,"Display name": "Nombre a mostrar"
+	,"Language": "Idioma"
 	,"Billing": "Facturación"
 	,"Receive invoices by email": "Recibir facturas por correo electrónico"
 	

forms/account/conf/locale/fr.json

@@ -4,6 +4,8 @@
 	,"Username": "Utilisateur"
 	,"Password": "Mot de passe"
 	,"Email": "Courriel"
+	,"Display name": "Nom à afficher"
+	,"Language": "Langage"
 	,"Billing": "Facturation"
 	,"Receive invoices by email": "Recevoir des factures par e-mail"
 	

forms/account/conf/locale/pt.json

@@ -4,6 +4,8 @@
 	,"Username": "Nome de usuario"
 	,"Password": "Palavra-Passe"
 	,"Email": "E-Mail"
+	,"Display name": "Nome para mostrar"
+	,"Language": "Linguagem"
 	,"Billing": "Facturação"
 	,"Receive invoices by email": "Receber facturas por e-mail"
 	

forms/account/conf/ui.xml

@@ -11,7 +11,8 @@
 	<db-form id="user-form">
 		<db-model property="model" id="user-model" updatable="true">
 			<custom>
-				SELECT u.id, u.name, u.email, u.recoverPass, c.mail, c.user_id
+				SELECT u.id, u.name, u.email, u.recoverPass,
+						u.nickname, u.lang, c.mail, c.user_id
 					FROM account.userView u
 						LEFT JOIN customer_view c
 							ON u.id = c.user_id
@@ -47,15 +48,29 @@
 		<div class="form">
 			<div class="form-group">
 				<label for="user-name"><t>Username</t></label>
-				<htk-text column="name" form="user-form"/>
+				<htk-text form="user-form" column="name"/>
 			</div>
 			<div class="form-group">
 				<label for="email"><t>Email</t></label>
-				<htk-entry column="email" form="user-form"></htk-entry>
+				<htk-entry form="user-form" column="email"></htk-entry>
+			</div>
+			<div class="form-group">
+				<label for="nickname"><t>Display name</t></label>
+				<htk-entry form="user-form" column="nickname"/>
+			</div>
+			<div class="form-group">
+				<label for="lang"><t>Language</t></label>
+				<htk-combo form="user-form" column="lang">
+					<db-model property="model">
+						<custom>
+							SELECT code, name FROM language WHERE active
+						</custom>
+					</db-model>
+				</htk-combo>
 			</div>
 			<div class="form-group">
 				<label for="mail"><t>Receive invoices by email</t></label>
-				<htk-check column="mail" form="user-form"/>
+				<htk-check form="user-form" column="mail"/>
 			</div>
 		</div>
 	</div>