diff --git a/paramecio/citoplasma/sessions.py b/paramecio/citoplasma/sessions.py index 61a404f..b9d75eb 100644 --- a/paramecio/citoplasma/sessions.py +++ b/paramecio/citoplasma/sessions.py @@ -176,7 +176,9 @@ else: s={'token': token} - response.set_cookie(config.cookie_name, token, path=config.session_opts['session.path']) + #response.set_cookie(config.cookie_name, token, path=config.session_opts['session.path']) + #Set-Cookie: phango_session=n2ro4lghim75p8vjseb5v3lhap; path=/experiment2/ + response.set_header('Set-Cookie', '%s=%s; path=%s' % (config.cookie_name, token, config.session_opts['session.path']) ) request.environ['session']=s diff --git a/paramecio/i18n/admin.py b/paramecio/i18n/admin.py index 70aef82..136ab4d 100644 --- a/paramecio/i18n/admin.py +++ b/paramecio/i18n/admin.py @@ -18,12 +18,6 @@ I18n.l['en-US']['admin']['send_email']='Email for recovery your password' I18n.l['en-US']['admin']['send_password_email']='Your new password' -I18n.l['en-US']['admin']['welcome_to_admin_dashboard']='Welcome to Admin dashboard' - -I18n.l['en-US']['admin']['from_here_you_can_configure_your_site']='From here you can configure your site' - -I18n.l['en-US']['admin']['sign_up']='Paramecio Sign up' - I18n.l['en-US']['admin']['login']='Paramecio Login' I18n.l['en-US']['admin']['remember_login']='Remember login?' @@ -32,8 +26,16 @@ I18n.l['en-US']['admin']['recovery_password']='Recovery password?' I18n.l['en-US']['admin']['remember_tries']='Remember that only have 3 attempts' +I18n.l['en-US']['admin']['welcome_to_admin_dashboard']='Welcome to Admin dashboard' + +I18n.l['en-US']['admin']['from_here_you_can_configure_your_site']='From here you can configure your site' + +I18n.l['en-US']['admin']['sign_up']='Paramecio Sign up' + I18n.l['en-US']['admin']['applications']='Applications' +I18n.l['en-US']['admin']['translation_saved_sucessfully']='Translation saved sucessfully' + I18n.l['en-US']['admin']['modules']='Modules' I18n.l['en-US']['admin']['change_module_to_translate']='Change module to translate' @@ -58,12 +60,6 @@ I18n.l['es-ES']['admin']['send_email']='Email para recuperar tu contraseña' I18n.l['es-ES']['admin']['send_password_email']='Tu nuevo password' -I18n.l['es-ES']['admin']['welcome_to_admin_dashboard']='Bienvenido al panel de administrador' - -I18n.l['es-ES']['admin']['from_here_you_can_configure_your_site']='Desde aquí puedes configurar tu site' - -I18n.l['es-ES']['admin']['sign_up']='Registrarse en Paramecio' - I18n.l['es-ES']['admin']['login']='Login Paramecio' I18n.l['es-ES']['admin']['remember_login']='¿Recordar login?' @@ -72,8 +68,16 @@ I18n.l['es-ES']['admin']['recovery_password']='¿Recuperar password?' I18n.l['es-ES']['admin']['remember_tries']='Recuerda que sólo tienes 3 intentos' +I18n.l['es-ES']['admin']['welcome_to_admin_dashboard']='Bienvenido al panel de administrador' + +I18n.l['es-ES']['admin']['from_here_you_can_configure_your_site']='Desde aquí puedes configurar tu site' + +I18n.l['es-ES']['admin']['sign_up']='Registrarse en Paramecio' + I18n.l['es-ES']['admin']['applications']='Aplicaciones' +I18n.l['es-ES']['admin']['translation_saved_sucessfully']='Translation saved sucessfully' + I18n.l['es-ES']['admin']['modules']='Modulos' I18n.l['es-ES']['admin']['change_module_to_translate']='Cambiar modulo para traducir' diff --git a/paramecio/i18n/common.py b/paramecio/i18n/common.py index 7238328..f36d3a0 100644 --- a/paramecio/i18n/common.py +++ b/paramecio/i18n/common.py @@ -6,25 +6,29 @@ I18n.l['en-US']=I18n.l.get('en-US', {}) I18n.l['en-US']['common']=I18n.l['en-US'].get('common', {}) -I18n.l['en-US']['common']['repeat_password']='Repeat Password' +I18n.l['en-US']['common']['password_no_match']='Passwords doesn\'t match' -I18n.l['en-US']['common']['error_passwords_no_match']='Error: passwords doesn\'t match' +I18n.l['en-US']['common']['recovery_password']='Recovery password' -I18n.l['en-US']['common']['error_username_or_password_exists']='Error: username or email exists in database' +I18n.l['en-US']['common']['error_login']='Error, wrong username or password' + +I18n.l['en-US']['common']['login']='Login' + +I18n.l['en-US']['common']['sign_up']='Sign up' I18n.l['en-US']['common']['yes']='Yes' I18n.l['en-US']['common']['no']='No' -I18n.l['en-US']['common']['password_no_match']='Passwords doesn\'t match' +I18n.l['en-US']['common']['repeat_password']='Repeat Password' -I18n.l['en-US']['common']['recovery_password']='Recovery password' +I18n.l['en-US']['common']['error_passwords_no_match']='Error: passwords doesn\'t match' -I18n.l['en-US']['common']['sign_up']='Sign up' +I18n.l['en-US']['common']['error_username_exists']='Error: username already exists' -I18n.l['en-US']['common']['error_login']='Error, wrong username or password' +I18n.l['en-US']['common']['error_email_exists']='Error: this email is already being used' -I18n.l['en-US']['common']['login']='Login' +I18n.l['en-US']['common']['last']='Last' I18n.l['en-US']['common']['options']='Options' @@ -38,42 +42,44 @@ I18n.l['en-US']['common']['edit_new_item']='Edit item' I18n.l['en-US']['common']['task_successful']='Task successful' +I18n.l['en-US']['common']['add_item']='Add new item' + I18n.l['en-US']['common']['search']='Search' I18n.l['en-US']['common']['pages']='Pages' -I18n.l['en-US']['common']['add_item']='Add new item' - I18n.l['en-US']['common']['home']='Home' I18n.l['en-US']['common']['delete_item_you_sure']='Are you sure for delete this item?' -I18n.l['en-US']['common']['last']='Last' - I18n.l['es-ES']=I18n.l.get('es-ES', {}) I18n.l['es-ES']['common']=I18n.l['es-ES'].get('common', {}) -I18n.l['es-ES']['common']['repeat_password']='Repeat Password' - -I18n.l['es-ES']['common']['error_passwords_no_match']='Error: passwords doesn\'t match' - -I18n.l['es-ES']['common']['error_username_or_password_exists']='Error: username or email exists in database' - -I18n.l['es-ES']['common']['yes']='Yes' - -I18n.l['es-ES']['common']['no']='No' - I18n.l['es-ES']['common']['password_no_match']='Passwords doesn\'t match' I18n.l['es-ES']['common']['recovery_password']='Recovery password' -I18n.l['es-ES']['common']['sign_up']='Sign up' - I18n.l['es-ES']['common']['error_login']='Error, wrong username or password' I18n.l['es-ES']['common']['login']='Login' +I18n.l['es-ES']['common']['sign_up']='Sign up' + +I18n.l['es-ES']['common']['yes']='Yes' + +I18n.l['es-ES']['common']['no']='No' + +I18n.l['es-ES']['common']['repeat_password']='Repeat Password' + +I18n.l['es-ES']['common']['error_passwords_no_match']='Error: passwords doesn\'t match' + +I18n.l['es-ES']['common']['error_username_exists']='Error: username already exists' + +I18n.l['es-ES']['common']['error_email_exists']='Error: this email is already being used' + +I18n.l['es-ES']['common']['last']='Last' + I18n.l['es-ES']['common']['options']='Options' I18n.l['es-ES']['common']['edit']='Edit' @@ -86,15 +92,13 @@ I18n.l['es-ES']['common']['edit_new_item']='Edit item' I18n.l['es-ES']['common']['task_successful']='Task successful' +I18n.l['es-ES']['common']['add_item']='Add new item' + I18n.l['es-ES']['common']['search']='Search' I18n.l['es-ES']['common']['pages']='Pages' -I18n.l['es-ES']['common']['add_item']='Add new item' - I18n.l['es-ES']['common']['home']='Home' I18n.l['es-ES']['common']['delete_item_you_sure']='Are you sure for delete this item?' -I18n.l['es-ES']['common']['last']='Last' -