From 57c3bf343473799bbe92af2a6890bf1ce73549c0 Mon Sep 17 00:00:00 2001 From: "Stephen V. Williams" Date: Sat, 27 Apr 2013 15:46:51 -0600 Subject: [PATCH] * ../footer.ftl modified to user i18n() instead due to assign collision * ../identity.ftl modified english terms to using i18n * themes/wilma/i18n/* added properties for identity --- themes/wilma/i18n/all.properties | 14 +++++++++++++- themes/wilma/i18n/all_es.properties | 18 +++++++++++++++++- themes/wilma/templates/footer.ftl | 14 +++++++------- themes/wilma/templates/identity.ftl | 19 ++++++++++--------- 4 files changed, 47 insertions(+), 18 deletions(-) diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties index 631f31f7..7b3a01f9 100644 --- a/themes/wilma/i18n/all.properties +++ b/themes/wilma/i18n/all.properties @@ -9,4 +9,16 @@ menu_powered = Powered by menu_about = About menu_contactus = Contact Us menu_support = Support -menu_version = Version \ No newline at end of file +menu_version = Version + +menu_logout = Log out +menu_login = Log in +menu_loginfull = Log in to manage this site + +identity_title = VIVO | connect share discover +identity_index = Index +identity_edit = Edit Page +identity_admin = Site Admin +identity_myprofile = My profile +identity_myaccount = My account +identity_user = user diff --git a/themes/wilma/i18n/all_es.properties b/themes/wilma/i18n/all_es.properties index 2c1fee12..314905e6 100644 --- a/themes/wilma/i18n/all_es.properties +++ b/themes/wilma/i18n/all_es.properties @@ -10,4 +10,20 @@ menu_powered = Desarrollado por menu_about = Respecto a menu_contactus = Contáctenos menu_support = Apoyar -menu_version = Versión \ No newline at end of file +menu_version = Versión + +menu_login = Iniciar la sesión +menu_loginfull = Iniciar sesión para administrar este sitio + +identity_title = VIVO | unir compartir descubrir +identity_index = Îndex +identity_edit = Editar página +identity_myprofile = Mi encuesta +identity_myaccount = Mi cuenta +identity_user = usuario + +#Items Vetted by Pedro +# +menu_logout = Terminar + +identity_admin = Administrador diff --git a/themes/wilma/templates/footer.ftl b/themes/wilma/templates/footer.ftl index 6d24ad15..7aa1ab03 100644 --- a/themes/wilma/templates/footer.ftl +++ b/themes/wilma/templates/footer.ftl @@ -1,5 +1,5 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#assign i18n = i18n() > + diff --git a/themes/wilma/templates/identity.ftl b/themes/wilma/templates/identity.ftl index 5cb2a278..47d5848d 100644 --- a/themes/wilma/templates/identity.ftl +++ b/themes/wilma/templates/identity.ftl @@ -1,7 +1,8 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->