From 33b19a450fd1460bd3f24d380b6107fb7ef2407a Mon Sep 17 00:00:00 2001 From: Jailson Dias Date: Thu, 23 Mar 2017 13:58:09 -0300 Subject: [PATCH] Ajustes na web conferencia --- amadeus/locale/pt_BR/LC_MESSAGES/django.po | 8 +++++--- amadeus/templates/base.html | 2 +- webconference/locale/pt_BR/LC_MESSAGES/django.po | 25 ++++++++++++------------- webconference/templates/webconference/jitsi.html | 2 +- webconference/urls.py | 2 +- webconference/views.py | 4 ++-- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/amadeus/locale/pt_BR/LC_MESSAGES/django.po b/amadeus/locale/pt_BR/LC_MESSAGES/django.po index cac828f..f41ea66 100644 --- a/amadeus/locale/pt_BR/LC_MESSAGES/django.po +++ b/amadeus/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-22 17:37-0300\n" +"POT-Creation-Date: 2017-03-23 13:53-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -87,8 +87,10 @@ msgid "Theme" msgstr "Temas" #: amadeus/templates/base.html:179 -msgid "Web Conference Settings" -msgstr "Configurações da Web conferência" +#, fuzzy +#| msgid "Web Conference Settings" +msgid "Web Conference" +msgstr "Web conferência" #: amadeus/templates/base.html:199 amadeus/templates/base.html:254 msgid "Subjects" diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html index 1a90015..af46893 100644 --- a/amadeus/templates/base.html +++ b/amadeus/templates/base.html @@ -176,7 +176,7 @@
  • {% trans 'Mail Sender' %}
  • {% trans 'Security' %}
  • {% trans 'Theme' %}
    • -
  • {% trans 'Web Conference Settings' %}
    • +
  • {% trans 'Web Conference' %}
    • diff --git a/webconference/locale/pt_BR/LC_MESSAGES/django.po b/webconference/locale/pt_BR/LC_MESSAGES/django.po index 9dc3299..937e4bd 100644 --- a/webconference/locale/pt_BR/LC_MESSAGES/django.po +++ b/webconference/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-22 17:37-0300\n" +"POT-Creation-Date: 2017-03-23 13:53-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -62,7 +62,6 @@ msgid "End date/hour" msgstr "Data/hora de termino" #: webconference/models.py:13 -#: webconference/templates/webconference/jitsi.html:6 msgid "Web Conference" msgstr "Web Conferência" @@ -122,7 +121,7 @@ msgid "Settings: Conference" msgstr "Configurações: Web Conferência" #: webconference/templates/webconference/create.html:20 -#: webconference/views.py:246 +#: webconference/views.py:319 msgid "Create Web Conference" msgstr "Criar Web Conferência" @@ -135,18 +134,18 @@ msgstr "Editar: " msgid "Participate" msgstr "Participar" -#: webconference/views.py:49 +#: webconference/views.py:48 webconference/views.py:93 #, python-format msgid "%s - Web Conference" msgstr "%s - Web Conferência" -#: webconference/views.py:175 webconference/views.py:187 -#: webconference/views.py:306 webconference/views.py:308 -#: webconference/views.py:324 webconference/views.py:326 +#: webconference/views.py:247 webconference/views.py:259 +#: webconference/views.py:377 webconference/views.py:379 +#: webconference/views.py:395 webconference/views.py:397 msgid "Visualize" msgstr "Visualizar" -#: webconference/views.py:257 +#: webconference/views.py:330 #, fuzzy, python-format #| msgid "" #| "The Web conference '%s' was added to the Topic '%s' of the virtual " @@ -158,17 +157,17 @@ msgstr "" "A web conferência '%s' foi adicionada ao tópico '%s' do ambiente virtual " "'%s' com sucesso!" -#: webconference/views.py:370 +#: webconference/views.py:441 msgid "Update Web Conference" msgstr "Atualizar a web conferência" -#: webconference/views.py:381 +#: webconference/views.py:452 #, fuzzy, python-format #| msgid "Security settings updated successfully!" msgid "The Web conference \"%s\" was updated successfully!" msgstr "A web conferência '%s' foi atualizada com sucesso!" -#: webconference/views.py:419 +#: webconference/views.py:488 #, python-format msgid "" "The web conference \"%s\" was removed successfully from virtual environment " @@ -176,13 +175,13 @@ msgid "" msgstr "" "A web conferência '%s' foi removida com sucesso do ambiente virtual '%s'!" -#: webconference/views.py:453 +#: webconference/views.py:522 #, fuzzy #| msgid "Security settings updated successfully!" msgid "Conference settings updated successfully!" msgstr "Configurações de segurança atualizadas com sucesso!" -#: webconference/views.py:460 +#: webconference/views.py:529 #, fuzzy #| msgid "Conference Setting" msgid "Web Conference Settings" diff --git a/webconference/templates/webconference/jitsi.html b/webconference/templates/webconference/jitsi.html index b5eec6e..7668bae 100644 --- a/webconference/templates/webconference/jitsi.html +++ b/webconference/templates/webconference/jitsi.html @@ -60,7 +60,7 @@ var repeater = setInterval(function () { $.ajax({ method: "GET", - url: "{% url 'webconferences:participando'%}", + url: "{% url 'webconferences:participating'%}", dataType: 'json', data: {'slug':'{{name_room}}'}, success: function(response) { diff --git a/webconference/urls.py b/webconference/urls.py index 9e1698b..22c93ef 100644 --- a/webconference/urls.py +++ b/webconference/urls.py @@ -12,6 +12,6 @@ urlpatterns = [ url(r'^view/(?P[\w_-]+)/$', views.InsideView.as_view(), name = 'view'), url(r'^conference/(?P[\w_-]+)/$',views.Conference.as_view(), name = 'conference'), url(r'^finish/$',views.finish, name = 'exit'), - url(r'^participando/$',views.participando, name = 'participando'), + url(r'^participating/$',views.participating, name = 'participating'), url(r'^settings/$', views.ConferenceSettings.as_view(), name = 'settings'), ] diff --git a/webconference/views.py b/webconference/views.py index f32d21d..6bc16e9 100644 --- a/webconference/views.py +++ b/webconference/views.py @@ -120,8 +120,8 @@ class Conference(LoginRequiredMixin,LogMixin,generic.TemplateView): return context -@log_decorator('resources', 'participando', 'webconference') -def participando(request): +@log_decorator('resources', 'participating', 'webconference') +def participating(request): webconference = get_object_or_404(Webconference, slug = request.GET['slug']) log_context = {} log_context['category_id'] = webconference.topic.subject.category.id -- libgit2 0.21.2