- Start working on I18n support

wise-webapp/src/main/webapp/WEB-INF/classes/messages_en.properties

@@ -111,7 +111,6 @@ CAPTCHA_ERROR=Enter the letters as they are shown in the image above.
 DETAIL_INFORMATION=Detail Information
 CREATOR=Creator
 CREATION_TIME=Creation Time
-OWNER=Owner
 VIEWS=Views
 STATE=State
 COLLABORATORS=Collaborators
@@ -140,7 +139,6 @@ RECENT_FILES=Recent Maps
 MINDMAP_DETAIL = Mind Map Detail
 EDIT=Edit
 INSERT=Insert
-WISE_IT=Wise It!
 EDITOR.LAST_SAVED=last modification by {0}
 SHARE_IT=Share It
 ACCOUNT_DETAIL=Do you want to change you user options?. Here is the place.
@@ -167,10 +165,8 @@ SVG_EXPORT_FORMAT_DETAILS=Scalable Vector Graphics (SVG) is an XML markup langua
 PDF_EXPORT_FORMAT_DETAILS=Get your map as Portable Document Format(PDF) to share use in your presentations.
 IMG_EXPORT_FORMAT_DETAILS=Get a graphic representation of your map including all colors and shapes to reuse in documents or for archiving
 FREEMIND_EXPORT_FORMAT_DETAILS = FreeMind is a nice desktop mind mapping application that has the great benefit of being free.
-WISEMAPPING_EXPORT_FORMAT_DETAILS = Export you map as native WiseMapping document format.
+WISEMAPPING_EXPORT_FORMAT_DETAILS = Export your map as WiseMapping document format.
-
 DELETE_MAP=Delete Confirmation
-
 TERMSOFUSE=Terms of Use
 PRIVACYPOLICY= Privacy Policy
 EXPORT_DETAILS=Export this map in the format that you want and start using it in your presentations or sharing by email
@@ -192,16 +188,12 @@ BLOG_INCLUSION=You can customize the code snippet to embed this map on your blog
 BLOG_SNIPPET=Copy this snippet of code to embed in your blog or page
 OPEN=Open
 OPEN_MSG=Open map for edition
-
 ZOOM=Zoom
 ZOOM_IN=Zoom In
 ZOOM_OUT=Zoom Out
-IN=In
-OUT=Out
 HISTORY=History
 TOPIC=Topic
 TOPIC_BACKGROUND_COLOR=Topic Background Color
-BACKGROUND_COLOR=BgColor
 TOPIC_BORDER_COLOR=Topic Border Color
 BORDER_COLOR=Border Color
 BORDER=Border
@@ -217,7 +209,6 @@ TOPIC_RELATIONSHIP=Relationship
 RELATION=Relationship
 TOPIC_NOTE=Add Note
 NOTE=Note
-
 FONT=Font
 FONT_TYPE=Font Type
 TYPE=Type
@@ -232,13 +223,12 @@ COLOR=Color
 SHARE=Share
 UNEXPECTED_ERROR=Outch!!. An unexpected error has occurred.
 UNEXPECTED_ERROR_DETAILS=We're sorry, an error has occurred and we can't process your request. Please try again, or go to the home page.
-UNEXPECTED_ERROR_SERVER_ERROR=We're sorry, an error has occurred and we can't process your request. Refresh the page and try again. If the problem persist, contact the administrator.
+UNEXPECTED_ERROR_SERVER_ERROR=We're sorry, an error has occurred and we can't process your request. Refresh the page and try again. If the problem persist, contactenos a support@wisemapping.com
 NO_ENOUGH_PERMISSIONS=Outch!!. This  map is not available anymore.
 NO_ENOUGH_PERMISSIONS_DETAILS=You do not have enough right access to see this map. This map has been changed to private or deleted.
 SHARING=Sharing
 IMPORT_MINDMAP_INFO=You can import FreeMind 0.9 and WiseMapping maps to your list of maps. Select the file you want to import.
 PRINT=Print
-MIND_FILE=File
 IMPORT_MAP_ERROR=FreeMind file could not be imported. {0}
 MAP_TITLE_ALREADY_EXISTS=You have already a map with the same name
 EMBEDDED_VIEWER=Embed a map viewer in your own web site, blog or post!
@@ -248,33 +238,19 @@ FREEMIND_EXPORT_IMPORT_MESSAGE=You can now easily import and export mind maps fr
 EDITOR_TOOLBAR_IMPROVED=Usability Improvement: The editor toolbar has been redesign
 EDITOR_TOOLBAR_IMPROVED_MESSAGE= The toolbar has been redesign to improve its usability.
 COLLABORATE=Collaborate
-GO_TO= Go to my Wisemaps
+GO_TO= Go to my maps
-
 NEWS_AND_ARTICLES=News & Articles
 NEWS_TITLE_EMBEDDED_MAPS=Embed your maps in anyplace
 NEWS_DESC_EMBEDDED_MAPS=With this new feature, you can embed your maps in blogs and web pages.
 NEWS_TITLE_FREEMIND=FreeMind import and export
 NEWS_DESC_FREEMIND=Now, you can import and export your FreeMind maps.
-NEWS_TITLE_KEYBOARD_NAVIGATION=WiseMapping Makes Creation of mind maps More Easily and PowerFul
 NEWS_DESC_KEYBOARD_NAVIGATION=WiseMapping let's you create the most powerfull mind maps using the keyboard
-
-MOST_POPULAR_MAPS=Most Popular Maps
 JOIN_WISEMAPPING=Join WiseMapping
 IT_IS_FREE=It's free!
-CREATE_EDIT_ACCESS_FROM_ANYWHERE=Create, edit and access your mindmaps from anywhere over the Web
-
-USABILITY_EDITOR_IMPROVED= Usability Improvement: Help button in the Mind Map Editor
 EDITOR_HELP=A Help button has been placed at the bottom-left corner of the editor. From there you can see all the editor keyboard shortcuts you can use while editing your maps, and a quick tutorial on how to use the editor.
-
-USABILITY_EDITOR_IMPROVED_SHRINK= Usability Improvement: Collapse/Expand nodes
 SHRINK_TEXT=You can now collapse and expand nodes by clicking on the node's dot, or by pressing the space bar button.
-
 EDITOR_LINKS=Mind Map feature: Add links to the topics
 EDITOR_LINKS_SHORT=Add links to the topics
-EDITOR_LINKS_TEXT=You can add Links to the topics very easily using the link icon in the toolbar.
-
-IMPORT_EXPORT_IMPROVEMENTS=We have done some improvements in the import and export features
-
 #####FOOTER
 COPYRIGHT=Powered by WiseMapping
 TERMS_AND_CONDITIONS=Terms and Conditions
@@ -282,23 +258,16 @@ CONTACT=Contact
 
 ACCOUNT_ACTIVED= Your account has been activated
 ACCOUNT_ACTIVED_FAIL = Account Activation failed
-VIEW_ALL_RESULTS= Show All Results
 BROWSE=Browse
-SEARCH_MSG=Discover publich mind maps created by people like you.
-SEARCH_PUBLIC=Search Public Mind Maps
 UNDO_EDITION=Undo Edition
 UNDO=Undo
 REDO_EDITION=Redo Edition
 REDO=Redo
-
-HISTORY_MSG=Looking for an old modification of you map?. Here is the place.
 NO_HISTORY_RESULTS= No History Information was found.
-HISTORY_INFO = Here is the list of the last revisions of you map.
 REVERT=revert
 INSTALL_CFG=You need to install the Google Chrome Frame Plugin
 INSTALL_CFG_REASON = We used to support IE 7/8 by rendering VML instead of SVG. In a few words, VML was the SVG equivalent in the Microsoft world, and we have invested a lot of energy in VML during several years solving several performance and instability issues among others things. Since Internet Explorer 9 has support for HTML 5.0 (thus SVG support), we decided to deprecate the support of VML. The side effect of this is that all users using Internet Explorer 7/8 will have to install a plugin from Google that enables the display of HTML 5.0 web pages.<br/>You might have to reopen the browser after you have installed the plugin.<br/><br/>We highly recommend using Firefox, Chrome or Internet Explorer 9 where this plugin is not required and the performance is much better.
 INSTALL_CFG_CLICK_HERE=To install Google Chrome Frame Plugin click here
-
 INVALID_EMAIL_ERROR = The e-mail was not verified
 BROWSER_NOT_SUPPOERTED= Current Browser is not supported.
 CHECK_BROWSERS= You can check supported browser at
@@ -308,3 +277,4 @@ IMPORT=Import
 EMBEDDED_MAP_SIZE=* Note: You can change embedded map size modifying 'height' and 'width' style properties. You can also adjust the zoom factor modifying 'zoom' parameter from the URL.
 EXPORT_FORMAT_RESTRICTIONS=Exporting to Image, PDF or SVG is available only in the editor toolbar.
 STARRED=Starred
+LOADING_MSG=Loading ...

wise-webapp/src/main/webapp/WEB-INF/classes/messages_es.properties

@@ -2,6 +2,8 @@ NAME=Nombre
 DESCRIPTION=Descripción
 OK=Ok
 WISEMAPPING=WiseMapping
+SITE.TITLE=WiseMapping
+SITE.SLOGAN=COMPLETE
 ADD=Agregar
 ACTIONS=Acciones
 ADD_COLLABORATORS=Agregar Colaboradores
@@ -42,7 +44,6 @@ FAQ=Preguntas Frecuentes
 SHORT_FAQ=FAQ
 LOGIN=Login
 SUBJECT=Asunto
-SUBJECT_MESSAGE= ha compartido un mapa mental con usted en WiseMapping.com
 MSG=Mensaje
 PROBLEM_DETAIL=Descripción
 EXPORT=Exportar
@@ -65,7 +66,7 @@ DELETE_SELECTED_CONFIRMATION=Todos los mapas seleccionados serán borrados
 DELETE_CONFIRMATION=Esta seguro de que quiere borrar este mapa?
 DELETE_SELECTED=Borrado seleccionado
 DELETE=Borrar
-YES=Si
+YES=si
 NO=No
 
 EDITOR.LOADING=Cargando...
@@ -73,37 +74,24 @@ SAVE=Guardar
 DISCARD_CHANGES=Descartar cambios
 ABOUT=Acerca
 ABOUT_TITLE=Que es WiseMapping?
-BLOG=Blog
-BLOG_TITLE=WiseMapping Blog
-NEWS=Noticias
 HOME=Inicio
 LOGIN_ERROR=Usuario/contraseña no válido/a.
 USER_INACTIVE=Disculpe, su cuenta aun no ha sido activada. Usted recibira una notificación por email tan pronto la activemos.
 CREW=The Crew
-ALREADY_A_MEMBER=Ya tenes una cuenta en WiseMapping?
+ALREADY_A_MEMBER=Ya un miembro ?
 WORD_VERIFICATION=Verificación de palabra
 TERM_OF_THE_SERVICE=Términos de servicio:
 FORGOT_PASSWORD_MESSAGE=Ingrese su e-mail para iniciar el proceso de recuperación de su contraseña.
 LOADING_MSG=Cargando...
-SEARCH_TITLE=Busqueda por WiseMaps
-SEARCH_TEXT=Busqueda sobre mapas publicos utilizando el titulo o la etiqueta
 SEARCH_FIELD=Título o etiqueta del mapa
-SEARCH=Busqueda
-SEARCH_RESULTS=Resultados
-NO_SEARCH_RESULTS=No se encontró ningun mapa.
-NO_SEARCH_TERM=No ingresó un criterio de busqueda.
-ADVANCE_SEARCH=Busqueda avanzada
-SIMPLE_SEARCH=Busqueda simple
 TRYNOW= Prueba la Demo!
-VIDEO=WiseMapping en 2 minutos
-
 FIELD_REQUIRED=Campo requerido
 EMAIL_ALREADY_EXIST=e-mail ya existente
 NO_VALID_EMAIL_ADDRESS=e-mail invalido
 USERNAME_ALREADY_EXIST=Nombre de usuario ya existente
 PASSWORD_MISSMATCH=La contraseña no concuerda
 TYPE_CHARACTER_BELOW=Ingrese los caracteres de la imagen.
-WISEMAPPING_ACCOUNT_MESSAGE=Por favor verifique la informacion que ha ingresado y lea los condiciones del servicio.
+WISEMAPPING_ACCOUNT_MESSAGE=Por favor, verifique la informacion que ha ingresado y lea las condiciones del servicio.
 REGISTRATION_CLICK_ADVICE= Seleccionando 'Registración' esta aceptando las condiciones de uso de arriba y la politica de privacidad.
 REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community.<br/> Registration is <b> Free</b> and takes just a moment.
 CAPTCHA_ERROR=Enter the letters as they are shown in the image above.
@@ -138,7 +126,6 @@ RECENT_FILES=Mapas Recientes
 MINDMAP_DETAIL = Detalle de Mind Map
 EDIT=Editar
 INSERT=Insertar
-WISE_IT=Wise It!
 EDITOR.LAST_SAVED=ultima modificaci&oacute;n hecha por {0}
 SHARE_IT=Compartilo
 ACCOUNT_DETAIL=Desea cambiar sus preferencias? Este es el lugar.
@@ -214,9 +201,8 @@ NO_ENOUGH_PERMISSIONS=Outch!!. EL mapa buscado no se encuentra disponible.
 NO_ENOUGH_PERMISSIONS_DETAILS=No tiene suficiente permisos de acceso para ver este mapa. El mapa no es mas publico o ha sido borrado.
 SHARING=Colaboraci&oacute;n
 IMPORT_MINDMAP=Importar mapa
-IMPORT_MINDMAP_DETAILS=Tiene mapas creados con FreeMind?. Ningun problema, los puede importar!.
+IMPORT_MINDMAP_DETAILS=
 PRINT=Imprimir
-FREE_MIND_FILE=Archivo de mapa mentaa
 IMPORT_MAP_ERROR=El archivo importado no parece ser un archivo FreeMind v&aacute;lido
 MAP_TITLE_ALREADY_EXISTS=Nombre de mapa ya existente.
 EMBEDDED_VIEWER=Incluya un visor de mapa en su sitio web, blog o post.
@@ -227,7 +213,6 @@ EDITOR_TOOLBAR_IMPROVED=La barra de herramientas ha sido redise&ntilder;ada.
 EDITOR_TOOLBAR_IMPROVED_MESSAGE=La barra de herramientas ha sido redise&ntilde;ada para mejorar la usabilidad.
 COLLABORATE=Colaborar
 PRINT_FEATURE_IMPLEMENTED=Ahora puedes imprimir tus mapas
-PRINT_FEATURE_IMPLEMENTED_MESSAGE=Ahora usted puede imprimir f&aacute;cilmente sus mapas desde el editor o desde el listado de mapas
 EMBEDDED_MAP_SIZE=* Note: You can change embedded map size modifying 'height' and 'width' style properties. You can also adjust the zoom factor modifying 'zoom' parameter from the URL.
 
 NEWS_AND_ARTICLES=Noticias y Articulos
@@ -235,12 +220,11 @@ NEWS_TITLE_EMBEDDED_MAPS=Incluya sus mapas en cualquier lugar
 NEWS_DESC_EMBEDDED_MAPS=Con esta nueva funcionalidad puede incluir sus mapas en blogs y sitios web.
 NEWS_TITLE_FREEMIND=Importar y exportar mapas de FreeMind
 NEWS_DESC_FREEMIND=Ahora, puede importar y exportar sus mapas con formato de FreeMind.
-NEWS_TITLE_KEYBOARD_NAVIGATION=La creacion de mapas mentales es mas facil que nunca!
+NEWS_TITLE_KEYBOARD_NAVIGATION=
 NEWS_DESC_KEYBOARD_NAVIGATION=WiseMapping lo deja crear sus mapas mentales utilzando solo el teclado.
 
 JOIN_WISEMAPPING=Utilice WiseMapping
 IT_IS_FREE=Es gratis!
-CREATE_EDIT_ACCESS_FROM_ANYWHERE=Crear, editar y acceder a sus mapas mentales desde cualquier lugar de Internet
 
 #FOOTER
 TERMS_AND_CONDITIONS=T&eacute;rminos and Condiciones
@@ -251,10 +235,21 @@ KEYBOARD_MSG=Estos son los atajos de teclado que puede utilizar en el editor!
 FIRST_STEPS=Los Primeros Pasos en el Editor
 FIRST_STEPS_MSG=Haga estos primeros pacitos en 2 minutos, y comience a correr en 5!
 BROWSER=Browse
-SEARCH_MSG=Search and discover mind maps created by people like you.
-SEARCH_PUBLIC=Buscar mapas p&uacute;blicos
 UNDO_EDITION=Undo Edition
 REDO_EDITION=Redo Edition
 REVERT=revert
 EXPORT_FORMAT_RESTRICTIONS=Important: Exporting to Image, PDF or SVG is available only in the editor toolbar.
 STARRED=Starred
+LINK=URL
+ACCOUNT_ACTIVED=Su cuenta ha sido activada
+ACCOUNT_ACTIVED_FAIL=COMPLETE
+WISEMAPPING_EXPORT_FORMAT=WiseMapping
+WISEMAPPING_EXPORT_FORMAT_DETAILS=Expota tu mapa\\ en formato\\ WiseMapping.\\
+YOUR_ROLE=Tu Role
+CHANGE_PASSWORD_SUCCESS=Password fue cambiado exitosamente
+CONFIRM_NEW_PASSWORD=Confirmar\\ password
+COPYRIGHT=Impulsado por WiseMapping
+UNEXPECTED_ERROR_SERVER_ERROR=Lo sentimos, un error ha ocurrido y no es posible procesar su pedido. Recargue la pagina y intentolo nuevamente. Si el problema persiste, contactenos a support@wisemapping.com
+UNDO=Rehacer
+TYPE=Tipo
+NOTE=Nota

wise-webapp/src/main/webapp/WEB-INF/classes/messages_fr.properties

@@ -42,7 +42,6 @@ FAQ = Questions fr\u00e9quentes
 SHORT_FAQ = FAQ
 LOGIN = Identifiant
 SUBJECT = Objet
-SUBJECT_MESSAGE = a partag\u00e9 une carte mentale avec vous sur WiseMapping
 MSG = Message
 PROBLEM_DETAIL = Description
 EXPORT = Exporter
@@ -68,13 +67,11 @@ YES = oui
 NO = non
 EDITOR.LOADING = T\u00e9l\u00e9chargement...
 SITE.TITLE=WiseMapping
+SITE.SLOGAN=COMPLETE
 SAVE = Sauver
 DISCARD_CHANGES = Abandonner les changements
 ABOUT = Qui sommes-nous?
 ABOUT_TITLE = Le projet WiseMapping
-BLOG = Blog
-BLOG_TITLE = Blog
-NEWS = Actualit\u00e9s
 KEYBOARD = Raccourcis clavier
 KEYBOARD_MSG = Raccourcis clavier \u00e0 utiliser dans l\'application.
 FIRST_STEPS = Cr\u00e9er une premi\u00e8re carte.
@@ -88,17 +85,7 @@ WORD_VERIFICATION = V\u00e9rification orthographe
 TERM_OF_THE_SERVICE = Conditions d\'utilisation
 FORGOT_PASSWORD_MESSAGE = Merci d\'entrer votre adresse email afin de pouvoir vous renvoyer votre mot de passe.
 LOADING_MSG = T\u00e9l\u00e9chargement...
-SEARCH_TITLE = Rechercher / Trouver des Cartes Mentale
-SEARCH_TEXT = Rechercher une Carte Mentale publique en saisissant son titre ou un mot-cl\u00e9.
-SEARCH_FIELD = Titre de la carte ou mot-cl\u00e9.
-SEARCH = Rechercher
-SEARCH_RESULTS = R\u00e9sultats de la recherche
-NO_SEARCH_RESULTS = Aucun r\u00e9sultat n\'a \u00e9t\u00e9 trouv\u00e9. Soyez le premier \u00e0 publier une carte mentale \u00e0 ce sujet!
-NO_SEARCH_TERM = Aucun mot n\'a \u00e9t\u00e9 saisi.
-ADVANCE_SEARCH = Recherche avanc\u00e9e
-SIMPLE_SEARCH = Recherche simple
 TRYNOW = Essayer la d\u00e9mo!
-VIDEO = WiseMapping en 2 minutes.
 FIELD_REQUIRED = Champs obligatoires.
 EMAIL_ALREADY_EXIST = Adresse email d\u00e9j\u00e90 utilis\u00e9e
 NO_VALID_EMAIL_ADDRESS = Email non valide
@@ -170,7 +157,6 @@ PDF_EXPORT_FORMAT_DETAILS = Enregistrez votre carte en format PDF (Portable Docu
 DELETE_MAP = Confirmation de suppression
 TERMSOFUSE = Conditions d\'Utilisations
 PRIVACYPOLICY = Politique de Confidentialit\u00e9
-EXPORT_DETAILS = 
 PUBLIC_MAP_VIEW = Informations sur les cartes publiques
 HERE = ici
 DETAILS = D\u00e9tails
@@ -190,12 +176,9 @@ OPEN_MSG = Ouvrir une carte
 ZOOM = Zoom
 ZOOM_IN = Zoom avant
 ZOOM_OUT = Zoom arri\u00e8re
-IN = Zoom +
-OUT = Zoom -
 HISTORY = Historique
 TOPIC = Sujet
 TOPIC_BACKGROUND_COLOR = Couleur de l\'arri\u00e8re-plan du noeud
-BACKGROUND_COLOR = Couleur de l\'arri\u00e8re-plan
 TOPIC_BORDER_COLOR = Couleur du cadre du noeud
 BORDER_COLOR = Couleur du cadre
 BORDER = Cadre
@@ -229,7 +212,7 @@ NO_ENOUGH_PERMISSIONS = Oups!! Cette carte n\'est plus disponible.
 NO_ENOUGH_PERMISSIONS_DETAILS = Vous ne pouvez pas acc\u00e9der \u00e0 cette carte. Cette carte est d\u00e9sormais priv\u00e9e ou a \u00e9t\u00e9 supprim\u00e9e.
 SHARING = Partager
 IMPORT_MINDMAP = Importer une carte
-IMPORT_MINDMAP_DETAILS = Vous avez d\u00e9j\u00e0 cr\u00e9\u00e9 des cartes sur FreeMind ou FreePlane? Pas de probl\u00e9me, importez-les!
+IMPORT_MINDMAP_DETAILS =
 PRINT = Imprimer
 IMPORT_MAP_ERROR = Le fichier import\u00e9 ne semble pas \u00eatre un fichier FreeMind valide.
 MAP_TITLE_ALREADY_EXISTS = Le titre de la carte existe d\u00e9j\u00e0.
@@ -241,9 +224,17 @@ EDITOR_TOOLBAR_IMPROVED=Usability Improvement = La barre d\'outil \u00e0 \u00e9t
 EDITOR_TOOLBAR_IMPROVED_MESSAGE = La barre d\'outil a \u00e9t\u00e9 redessin\u00e9e afin d\'am\u00e9liorer son utilisation.
 COLLABORATE = Contribuer
 PRINT_FEATURE_IMPLEMENTED = Imprimer la carte maintenant.
-PRINT_FEATURE_IMPLEMENTED_MESSAGE = Vous pouvez maintenant imprimer vos cartes \u00e0 partir de l\'\u00e9diteur et de la liste de cartes!
 EMBEDDED_MAP_SIZE=* Note
 EDITOR_LINKS=Mind Map feature
-NEWS_ADD_ICON=Mind Map feature
+EXPORT_FORMAT_RESTRICTIONS=Important: Exporting to Image, PDF or SVG is available only in the editor toolbar only.
-EXPORT_FORMAT_RESTRICTIONS=Important: Exporting to Image, PDF or SVG is available only in the editor toolbar only.\
 STARRED=Starred
+ACCOUNT_ACTIVED=COMPLETE
+WISEMAPPING_EXPORT_FORMAT=WiseMapping
+WISEMAPPING_EXPORT_FORMAT_DETAILS=COMPLETE
+YOUR_ROLE=COMPLETE
+ACCOUNT_ACTIVED_FAIL=COMPLETE
+CHANGE_PASSWORD_SUCCESS=COMPLETE
+CONTACT=COMPLETE
+COPYRIGHT=COMPLETE
+CONFIRM_NEW_PASSWORD=COMPLETE
+UNEXPECTED_ERROR_SERVER_ERROR=COMPLETE

wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml

@@ -36,7 +36,7 @@
             </property>
         </bean>
         <bean id="localeChangeInterceptor" class="org.springframework.web.servlet.i18n.LocaleChangeInterceptor">
-            <property name="paramName" value="locale"/>
+            <property name="paramName" value="language"/>
         </bean>
     </mvc:interceptors>
 
@@ -87,7 +87,7 @@
         <property name="maxUploadSize" value="522240"/>
     </bean>
 
-    <bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+    <bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource" >
         <property name="basenames">
             <list>
                 <value>messages</value>

wise-webapp/src/main/webapp/jsp/header.jsp

@@ -12,7 +12,7 @@
 
     </div>
     <div class="modal-footer">
-        <button class="btn btn-cancel" data-dismiss="modal">Close</button>
+        <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CLOSE"/></button>
     </div>
 </div>
 <div id="header">
@@ -21,19 +21,19 @@
             <c:when test="${principal != null}">
                 <div id="headerActions">
                     <spring:message code="WELCOME"/>, ${principal.firstname}
-                    | <span><a href="${pageContext.request.contextPath}/c/maps/"><spring:message
+                    | <span><a href="/c/maps/"><spring:message
                         code="MY_WISEMAPS"/></a></span>
                     | <span><a id="userSettingsBtn" href="#"
                                title="<spring:message code="ACCOUNT_DETAIL"/>"><spring:message
                         code="ACCOUNT"/></a></span>
-                    | <span><a href="${pageContext.request.contextPath}/c/logout"
+                    | <span><a href="/c/logout"
                                title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
                 </div>
             </c:when>
             <c:when test="${param.removeSignin!=true}">
                 <div id="headerActions">
                     <spring:message code="ALREADY_A_MEMBER"/>
-                    <span><a href="${pageContext.request.contextPath}/c/login" title="<spring:message code="SIGN_IN"/>">
+                    <span><a href="/c/login" title="<spring:message code="SIGN_IN"/>">
                         <spring:message code="SIGN_IN"/>
                     </a></span>
                 </div>
@@ -41,20 +41,20 @@
         </c:choose>
         <div class="header_languages">
             <div class="header_language_flag">
-                <a href="?language=en"><img src="../images/flag-uk.gif" alt="English"></a>
+                <a href="/c/login?language=en"><img src="/images/flag-uk.gif" alt="English"></a>
             </div>
             <div class="header_language_flag">
-                <a href="?language=fr"><img src="../images/flag-fr.gif" alt="Frances"></a>
+                <a href="/c/login?language=fr"><img src="/images/flag-fr.gif" alt="Frances"></a>
             </div>
             <div class="header_language_flag">
-                <a href="?language=es"><img src="../images/flag-es.gif" alt="Español"></a>
+                <a href="/c/login?language=es"><img src="/images/flag-es.gif" alt="Español"></a>
             </div>
         </div>
     </div>
 </div>
 <c:if test="${param.onlyActionHeader!=true}">
     <div id="headerContent">
-        <a href="${pageContext.request.contextPath}/c/home" title="Homepage">
+        <a href="/c/home" title="Homepage">
             <div id="headerLogo">&nbsp;</div>
         </a>
 

wise-webapp/src/main/webapp/jsp/login.jsp

@@ -2,7 +2,6 @@
 
 <%@ include file="/jsp/init.jsp" %>
 
-
 <script type="text/javascript" language="javascript">
     $(function() {
         $('.btn-primary').click(function() {

wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp

@@ -74,7 +74,7 @@
     <div id="mindplot" onselectstart="return false;"></div>
 
     <div id="embFooter">
-        <a href="${pageContext.request.contextPath}/c/home" target="new">
+        <a href="/c/home" target="new">
             <div id="footerLogo"></div>
         </a>
 

wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp

@@ -112,7 +112,7 @@
     <div id="printLogo"></div>
 
     <div id="embFooter">
-        <a href="${pageContext.request.contextPath}/c/home" target="new">
+        <a href="/c/home" target="new">
             <div id="footerLogo"></div>
         </a>