From 4fd5c60a3252171f71e5a64c1edf7184d248c797 Mon Sep 17 00:00:00 2001 From: Johannes Wilm Date: Sun, 3 Jan 2016 16:06:05 +0100 Subject: [PATCH 1/4] fix two errors in Brazilian translation file --- avatar/locale/pt_BR/LC_MESSAGES/django.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/avatar/locale/pt_BR/LC_MESSAGES/django.po b/avatar/locale/pt_BR/LC_MESSAGES/django.po index e70e1dc1..1a43c635 100644 --- a/avatar/locale/pt_BR/LC_MESSAGES/django.po +++ b/avatar/locale/pt_BR/LC_MESSAGES/django.po @@ -22,7 +22,7 @@ msgid "" "%(ext)s is an invalid file extension. Authorized extensions are : %" "(valid_exts_list)s" msgstr "Extensão informada inválida. Os Formatos permitidos são : %" - +"(valid_exts_list)s" #: forms.py:38 #, python-format msgid "" @@ -37,7 +37,7 @@ msgid "" "You already have %(nb_avatars)d avatars, and the maximum allowed is %" "(nb_max_avatars)d." msgstr "Você já possui %(nb_avatars)d fotos. O máximo permitido é %" - +"(nb_max_avatars)d." #: forms.py:56 forms.py:67 msgid "Choices" msgstr "Opções" From 7a1435557f469c6b4bb1a8c6a587cb0d28c4c8e9 Mon Sep 17 00:00:00 2001 From: Johannes Wilm Date: Sun, 3 Jan 2016 16:08:31 +0100 Subject: [PATCH 2/4] one fix errors in Brazilian translation file --- avatar/locale/pt_BR/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avatar/locale/pt_BR/LC_MESSAGES/django.po b/avatar/locale/pt_BR/LC_MESSAGES/django.po index 1a43c635..aad3f837 100644 --- a/avatar/locale/pt_BR/LC_MESSAGES/django.po +++ b/avatar/locale/pt_BR/LC_MESSAGES/django.po @@ -21,7 +21,7 @@ msgstr "" msgid "" "%(ext)s is an invalid file extension. Authorized extensions are : %" "(valid_exts_list)s" -msgstr "Extensão informada inválida. Os Formatos permitidos são : %" +msgstr "%(ext)s é uma extensão informada inválida. Os Formatos permitidos são : %" "(valid_exts_list)s" #: forms.py:38 #, python-format From af45e43c46a22f3168ab946bf914a45eae9ade19 Mon Sep 17 00:00:00 2001 From: Johannes Wilm Date: Sun, 3 Jan 2016 16:10:24 +0100 Subject: [PATCH 3/4] Remove replace urlpatterns with simple array, make compatible with Django 1.9 --- avatar/urls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/avatar/urls.py b/avatar/urls.py index b4b19b1f..623e2528 100644 --- a/avatar/urls.py +++ b/avatar/urls.py @@ -2,11 +2,11 @@ from django.conf.urls import patterns, url except ImportError: # Django < 1.4 - from django.conf.urls.defaults import patterns, url + from django.conf.urls.defaults import url from avatar import views -urlpatterns = patterns('', +urlpatterns = [ url(r'^add/$', views.add, name='avatar_add'), url(r'^change/$', views.change, name='avatar_change'), url(r'^delete/$', views.delete, name='avatar_delete'), @@ -19,4 +19,4 @@ url(r'^list/(?P[\+\w\@\.]+)/(?P[\d]+)/$', views.avatar, name='avatar'), -) +] From 6b1aa840f8279a160ca7499e2404adf84642974b Mon Sep 17 00:00:00 2001 From: Johannes Wilm Date: Mon, 4 Jan 2016 16:15:30 +0100 Subject: [PATCH 4/4] remove patterns import --- avatar/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avatar/urls.py b/avatar/urls.py index 623e2528..2608787a 100644 --- a/avatar/urls.py +++ b/avatar/urls.py @@ -1,5 +1,5 @@ try: - from django.conf.urls import patterns, url + from django.conf.urls import url except ImportError: # Django < 1.4 from django.conf.urls.defaults import url