# HG changeset patch # User verrierj # Date 1325600312 -3600 # Node ID 7b7325dc4aecceca8896ceef239a83e0d0b65186 # Parent f4cb93c06b42989e4fe8e1980f405a8177143d8d Add translations for uneditable groups + change size of modal windows diff -r f4cb93c06b42 -r 7b7325dc4aec src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Tue Jan 03 14:26:19 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Tue Jan 03 15:18:32 2012 +0100 @@ -34,10 +34,8 @@ if (checkbox.is(":checked")) { $("#removeall").trigger("click"); $("#sharelist option").css('color', ''); - $("#sharelist, #selectedlist").attr("disabled", "disabled"); - } else { - $("#sharelist, #selectedlist").removeAttr("disabled"); - } + $("#shareproject").trigger("click"); + } } $(document).ready(function() { diff -r f4cb93c06b42 -r 7b7325dc4aec src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html Tue Jan 03 14:26:19 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html Tue Jan 03 15:18:32 2012 +0100 @@ -12,12 +12,14 @@ {% if group.change %} - - {% trans 'Change this group' %} + + {% trans 'Change this group' %} {{ group.name }} {% else %} - + + + {{ group.name }} {% endif %} @@ -28,7 +30,9 @@ {% if not user.is_superuser and not search_active %} - + + + {% trans "Projects shared with me only" %} diff -r f4cb93c06b42 -r 7b7325dc4aec src/ldt/ldt/locale/en/LC_MESSAGES/django.po --- a/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Tue Jan 03 14:26:19 2012 +0100 +++ b/src/ldt/ldt/locale/en/LC_MESSAGES/django.po Tue Jan 03 15:18:32 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-03 14:14+0100\n" +"POT-Creation-Date: 2012-01-03 14:38+0100\n" "PO-Revision-Date: 2010-02-17 03:53+0100\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: LANGUAGE \n" @@ -524,7 +524,11 @@ msgid "Change this group" msgstr "Create a group" -#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:32 +#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:21 +msgid "You are not allowed to edit this group" +msgstr "You are not allowed to change this group" + +#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:34 msgid "Projects shared with me only" msgstr "Projects shared with me only" @@ -585,6 +589,7 @@ msgstr "remove all" #: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:8 +#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:40 #: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:41 msgid "choose a profile image" msgstr "choose a profile image" diff -r f4cb93c06b42 -r 7b7325dc4aec src/ldt/ldt/locale/fr/LC_MESSAGES/django.po --- a/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Tue Jan 03 14:26:19 2012 +0100 +++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Tue Jan 03 15:18:32 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-03 14:15+0100\n" +"POT-Creation-Date: 2012-01-03 14:37+0100\n" "PO-Revision-Date: 2010-03-09 15:52+0100\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: LANGUAGE \n" @@ -517,7 +517,11 @@ msgid "Change this group" msgstr "Modifier ce groupe" -#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:32 +#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:21 +msgid "You are not allowed to edit this group" +msgstr "vous n'avez pas l'autorisation de modifier ce groupe" + +#: .\ldt_utils\templates\ldt\ldt_utils\partial\groupslist.html.py:34 msgid "Projects shared with me only" msgstr "Projets partagés avec moi uniquement" @@ -577,6 +581,7 @@ msgstr "tout enlever" #: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:8 +#: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:40 #: .\ldt_utils\templates\ldt\ldt_utils\partial\picture.html.py:41 msgid "choose a profile image" msgstr "choisir une image de profil" diff -r f4cb93c06b42 -r 7b7325dc4aec src/ldt/ldt/static/ldt/js/projectscontents.js --- a/src/ldt/ldt/static/ldt/js/projectscontents.js Tue Jan 03 14:26:19 2012 +0100 +++ b/src/ldt/ldt/static/ldt/js/projectscontents.js Tue Jan 03 15:18:32 2012 +0100 @@ -148,7 +148,8 @@ setTimeout(function() { target.next(".searchajaxloader").show(); target.nextAll(".searchclear").hide(); - var filterVal = "_" + escape(target.realVal()); + //var filterVal = "_" + escape(target.realVal()); + var filterVal = "_" + target.realVal(); url = url.replace('__FILTER__',filterVal); url = url.replace('__ID_GROUP__',$('#id_group').val()); $.ajax({ diff -r f4cb93c06b42 -r 7b7325dc4aec src/ldt/ldt/user/views.py --- a/src/ldt/ldt/user/views.py Tue Jan 03 14:26:19 2012 +0100 +++ b/src/ldt/ldt/user/views.py Tue Jan 03 15:18:32 2012 +0100 @@ -13,24 +13,20 @@ @login_required def profile(request): msg = '' - user_language = request.user.get_profile().language + profile = request.user.get_profile() + user_language = profile.language if request.method == "POST": profile_form = ProfileForm(request.user, request.POST, instance=request.user) language_form = LanguageChangeForm(request.user, request.POST) password_form = PasswordChangeForm(request.user) - #assert False, "before : %s " % request.user.username - if profile_form.is_valid() and language_form.is_valid(): profile_form.save() language_form.save() set_language(request) msg = _("Your profile has been updated.") - user_language = request.user.get_profile().language - - - #assert False, "after: %s " % request.user.username + user_language = language_form.cleaned_data['language'] else: language_form = LanguageChangeForm()