From 5f02d0860917e966869832f8c9851e52a31ef5d5 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 2 May 2011 01:17:21 -0400 Subject: [PATCH] Added Spanish translations for the user management app --- apps/user_management/__init__.py | 19 +--- apps/user_management/forms.py | 2 - .../locale/es/LC_MESSAGES/django.mo | Bin 0 -> 1785 bytes .../locale/es/LC_MESSAGES/django.po | 103 ++++++++++++++++++ apps/user_management/views.py | 10 +- 5 files changed, 111 insertions(+), 23 deletions(-) create mode 100644 apps/user_management/locale/es/LC_MESSAGES/django.mo create mode 100644 apps/user_management/locale/es/LC_MESSAGES/django.po diff --git a/apps/user_management/__init__.py b/apps/user_management/__init__.py index beff92e2ed..f2f08e3d42 100644 --- a/apps/user_management/__init__.py +++ b/apps/user_management/__init__.py @@ -1,10 +1,8 @@ from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.models import User -from navigation.api import register_links, register_menu, \ - register_model_list_columns, register_multi_item_links +from navigation.api import register_links, register_multi_item_links from permissions.api import register_permissions -from navigation.api import register_sidebar_template PERMISSION_USER_CREATE = 'user_create' PERMISSION_USER_EDIT = 'user_edit' @@ -13,9 +11,9 @@ PERMISSION_USER_DELETE = 'user_delete' register_permissions('user_management', [ {'name': PERMISSION_USER_CREATE, 'label': _(u'Create new users')}, - {'name': PERMISSION_USER_EDIT, 'label': _(u'Edit exising users')}, - {'name': PERMISSION_USER_VIEW, 'label': _(u'View exising users')}, - {'name': PERMISSION_USER_DELETE, 'label': _(u'Delete exising users')}, + {'name': PERMISSION_USER_EDIT, 'label': _(u'Edit existing users')}, + {'name': PERMISSION_USER_VIEW, 'label': _(u'View existing users')}, + {'name': PERMISSION_USER_DELETE, 'label': _(u'Delete existing users')}, ]) user_list = {'text': _(u'users'), 'view': 'user_list', 'famfam': 'user', 'permissions': {'namespace': 'user_management', 'permissions': [PERMISSION_USER_VIEW]}} @@ -26,12 +24,3 @@ user_multiple_delete = {u'text': _('delete'), 'view': 'user_multiple_delete', 'f register_links(User, [user_edit]) register_links('user_list', [user_add], menu_name=u'sidebar') register_multi_item_links(['user_list'], [user_multiple_delete]) - -#tags_menu = [ -# { -# 'text': _(u'tags'), 'view': 'tag_list', 'famfam': 'tag_blue', 'position': 4, 'links': [ -# tag_list -# ] -# }, -#] -#register_menu(tags_menu) diff --git a/apps/user_management/forms.py b/apps/user_management/forms.py index 3bcd271802..02da2437f8 100644 --- a/apps/user_management/forms.py +++ b/apps/user_management/forms.py @@ -1,5 +1,4 @@ from django import forms -from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.models import User @@ -7,4 +6,3 @@ class UserForm(forms.ModelForm): class Meta: model = User fields = ('username', 'first_name', 'last_name', 'email', 'is_active',) - diff --git a/apps/user_management/locale/es/LC_MESSAGES/django.mo b/apps/user_management/locale/es/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..668756e5ffcc4e7e8134770909cb6a48df6270c5 GIT binary patch literal 1785 zcma)+OK)5?6vqveM~8O`LP8+ih=^q2%S>pYnlx!cI;{dp8x1p27nP7_?&*!AJNCu) zohB@i_ymXztjbqF?085Z_8>N_ShK9e2Y|nQ@12GyJgl*QejMBXbFR<)Hh1b%hVmTh zOQ>I?zKnY70W>H-fdc#)Ou#?EXTan^#-0Z+foH%WxCAQj74VaqU)KDk<{x0NKl2b{ zkASa%PlHK4UIR~I+ykEk-vLj9H|zNk_%Oy9_&Kypzz)WzG5H3#0tQ_M4E}r!z6gE+ zE`#5IXTf{mtKb|&1il3>fVaRGz>h%u*k@>h-n-yq;8*qhx8NMcKY~I3ui&HL?_jXI z2SQ#f=*ALa9Llq(A%?*(go8bW8cNs?cVY==Jb?Tg#3sZg+!=JWP@59;uysrP z(3ISjb?1(9d)ynIQcj+@-y>c+vR%I5F8yz7SD9~Ek~l-top^?0SE@tlKsm2;R?qfQ z<@xbBYmKc$G=_YBVKGQqa`QNTk%GmNW804Ch%MOa=J`0v zN#W~wOwQdd^ZfAWdgbyzua`v%caE>`D!6w{y&QWrC01QH^Pg20FoM6anMIZbEnLe9 zvEX5B9NV#GpT=Hnrec?@Q$~0B&icl?>(_dGx7UAf^Tzd7p9*8W*mjvp#oJ}(#K3fU zYv;y5#OPy_xB}H(zTEC~MEksGFY|V%8~W$kZ5WC^O;tGjWV>^%EyPm{tkf=--ryzl z&4?_XNZ&YVmEjj{)p_4u-Y=5ECYhP8VVllMnUNTfoOJot`t@tWp#0+2*5zC!#%61+ z?al4pecw7syR~7oCyo0K3uyLq;9oCtsq_jT?@8;(uMP)S#fAHJLDy}vqNm3u#Z&3> z3nS%cw<8ueXW}UpLlt2N0L*nCQ3_-4nA)g0#qf#fA7eRYqlIoAj@@0 z(<4i)*IZGb@2cmAu#saSnQ;4wOEITvfjTuuB%YjG90@z3m|TP;k~yD{4oY-$en_9_ zW0hfhGA3C#`apTS3fOx(W>gFKcOzs_DRcFqtj%UeArqR*|K@j0ITKT^j#y*HnokmQ dPTCsHa`-w-o5=`&fMYW$@V94J9lnN+{RIF6<@5jm literal 0 HcmV?d00001 diff --git a/apps/user_management/locale/es/LC_MESSAGES/django.po b/apps/user_management/locale/es/LC_MESSAGES/django.po new file mode 100644 index 0000000000..bf905ecfc0 --- /dev/null +++ b/apps/user_management/locale/es/LC_MESSAGES/django.po @@ -0,0 +1,103 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-05-02 01:11-0400\n" +"PO-Revision-Date: 2011-05-02 01:14\n" +"Last-Translator: Roberto Rosario \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \n" +"X-Translated-Using: django-rosetta 0.5.6\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: __init__.py:15 +msgid "Create new users" +msgstr "Crear nuevos usuarios" + +#: __init__.py:16 +msgid "Edit existing users" +msgstr "Editar usuarios existentes" + +#: __init__.py:17 +msgid "View existing users" +msgstr "Ver usuarios existentes" + +#: __init__.py:18 +msgid "Delete existing users" +msgstr "Eliminar usuarios existentes" + +#: __init__.py:21 views.py:28 +msgid "users" +msgstr "usuarios" + +#: __init__.py:22 +msgid "edit" +msgstr "editar" + +#: __init__.py:23 views.py:80 +msgid "create new user" +msgstr "crear nuevo usuario" + +#: __init__.py:24 +msgid "delete" +msgstr "eliminar" + +#: views.py:32 +msgid "full name" +msgstr "nombre completo" + +#: views.py:36 +msgid "active" +msgstr "activo" + +#: views.py:54 +#, python-format +msgid "User \"%s\" updated successfully." +msgstr "Usuario \"%s\" actualizado exitsamente." + +#: views.py:60 +#, python-format +msgid "edit user: %s" +msgstr "editar usuario: %s" + +#: views.py:74 +#, python-format +msgid "User \"%s\" created successfully." +msgstr "Usuario \"%s\" ha creado exitosamente." + +#: views.py:96 +msgid "Must provide at least one user." +msgstr "Debe proveer al menos un usuario." + +#: views.py:106 +#, python-format +msgid "User \"%s\" deleted successfully." +msgstr "Usuario \"%s\" eliminado exitosamente." + +#: views.py:108 +#, python-format +msgid "Error deleting user \"%(user)s\": %(error)s" +msgstr "Error eliminando el usuario \"%(user)s\": %(error)s " + +#: views.py:115 +msgid "user" +msgstr "usuario" + +#: views.py:122 +#, python-format +msgid "Are you sure you wish to delete the user: %s?" +msgstr "¿Está seguro que desea eliminar el usuario: %s?" + +#: views.py:124 +#, python-format +msgid "Are you sure you wish to delete the users: %s?" +msgstr "¿Está seguro que desea eliminar los usuarios: %s?" diff --git a/apps/user_management/views.py b/apps/user_management/views.py index ad20f17487..b0b536f984 100644 --- a/apps/user_management/views.py +++ b/apps/user_management/views.py @@ -5,9 +5,6 @@ from django.template import RequestContext from django.contrib import messages from django.views.generic.list_detail import object_list from django.core.urlresolvers import reverse -from django.views.generic.create_update import create_object, delete_object, update_object -from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import ObjectDoesNotExist from django.contrib.auth.models import User from permissions.api import check_permissions @@ -17,6 +14,7 @@ from user_management import PERMISSION_USER_VIEW, \ PERMISSION_USER_DELETE from user_management.forms import UserForm + def user_list(request): check_permissions(request.user, 'user_management', [PERMISSION_USER_VIEW]) @@ -36,7 +34,7 @@ def user_list(request): 'name': _(u'active'), 'attribute': 'is_active' } - + ], 'multi_select_as_buttons': True, }, @@ -46,7 +44,7 @@ def user_list(request): def user_edit(request, user_id): check_permissions(request.user, 'user_management', [PERMISSION_USER_EDIT]) user = get_object_or_404(User, pk=user_id) - + if request.method == 'POST': form = UserForm(instance=user, data=request.POST) if form.is_valid(): @@ -66,7 +64,7 @@ def user_edit(request, user_id): def user_add(request): check_permissions(request.user, 'user_management', [PERMISSION_USER_CREATE]) - + if request.method == 'POST': form = UserForm(request.POST) if form.is_valid():