gmane.comp.mobile.wammu.scm

[SCM] UNNAMED PROJECT branch, master,updated. e05f6a7c625138c048dfec7eafc5157d22509dbd

Michal Cihar — 2012-04-04T08:06:12

The following commit has been merged in the master branch:
commit e05f6a7c625138c048dfec7eafc5157d22509dbd
Author: Matías Bellone <matiasbellone< at >gmail.com>
Date:   Tue Apr 3 17:07:16 2012 +0200

    Translated using Weblate.

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 1bfa618..cc4815e 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
< at >< at > -7,7 +7,7 < at >< at > msgstr ""
 "Project-Id-Version: Wammu website\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-04-02 11:00+0200\n"
-"PO-Revision-Date: 2012-03-29 16:19+0200\n"
+"PO-Revision-Date: 2012-04-03 17:07+0200\n"
 "Last-Translator: Matías Bellone <matiasbellone< at >gmail.com>\n"
 "Language-Team: LANGUAGE <LL< at >li.org>\n"
 "Language: es\n"
< at >< at > -1872,16 +1872,15 < at >< at > msgstr ""
 "letras de tu traducción.\n"
 
 #: html/contribute/translate.html:92
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "You should follow terminology as defined for your language in <a href="
 "\"%(url)s\">dictionary fo

[SCM] UNNAMED PROJECT branch, master,updated. ab3afdcad18600aee5e8bfe25763b5509a343625

Michal Cihar — 2012-04-03T10:04:06

The following commit has been merged in the master branch:
commit 5f96d3e914c65986715d09e5fc03f89d92e7d876
Merge: bb690e285f2a28081ba70c90571ffcd21d001ca7 519c725f639e44fc159f90626926211ac4ee6c80
Author: Michal Čihař <weblate< at >l10n.cihar.com>
Date:   Tue Apr 3 05:02:05 2012 +0200

    Merge remote-tracking branch 'origin/master'

diff --combined locale/id/LC_MESSAGES/django.po
index ce77478,73ab777..6bf05c3
--- a/locale/id/LC_MESSAGES/django.po
+++ b/locale/id/LC_MESSAGES/django.po
< at >< at >< at > -3,20 -3,20 +3,20 < at >< at >< at >
  # This file is distributed under the same license as the PACKAGE package.
  # FIRST AUTHOR <EMAIL< at >ADDRESS>, YEAR.
  #
 -#, fuzzy
  msgid ""
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2012-03-30 11:20+0200\n"
+ "POT-Creation-Date: 2012-04-02 11:00+0200\n"
 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 -"Last-Translator: FULL NAME <EMAIL< at >ADDRESS>\n"
 +"PO-Revision-Date: 2012-03-30 11:23+0200\n"
 +"Last-Translator: Michal Čihař <michal< at >cihar.

[SCM] UNNAMED PROJECT branch, master,updated. ab3afdcad18600aee5e8bfe25763b5509a343625

Michal Cihar — 2012-04-03T10:04:06

The following commit has been merged in the master branch:
commit bb690e285f2a28081ba70c90571ffcd21d001ca7
Author: Michal Čihař <michal< at >cihar.com>
Date:   Sat Mar 31 05:02:11 2012 +0200

    Translated using Weblate.

diff --git a/locale/id/LC_MESSAGES/django.po b/locale/id/LC_MESSAGES/django.po
index f1da82a..ce77478 100644
--- a/locale/id/LC_MESSAGES/django.po
+++ b/locale/id/LC_MESSAGES/django.po
< at >< at > -3,20 +3,20 < at >< at >
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL< at >ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-03-30 11:20+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL< at >ADDRESS>\n"
+"PO-Revision-Date: 2012-03-30 11:23+0200\n"
+"Last-Translator: Michal Čihař <michal< at >cihar.com>\n"
 "Language-Team: LANGUAGE <LL< at >li.org>\n"
-"Language: \n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

[SCM] UNNAMED PROJECT branch, master,updated. ab3afdcad18600aee5e8bfe25763b5509a343625

Michal Cihar — 2012-04-03T10:04:06

The following commit has been merged in the master branch:
commit ab3afdcad18600aee5e8bfe25763b5509a343625
Author: Michal Čihař <michal< at >cihar.com>
Date:   Tue Apr 3 12:03:32 2012 +0200

    Fix header

diff --git a/locale/id/LC_MESSAGES/django.po b/locale/id/LC_MESSAGES/django.po
index 6bf05c3..a955336 100644
--- a/locale/id/LC_MESSAGES/django.po
+++ b/locale/id/LC_MESSAGES/django.po
< at >< at > -5,7 +5,7 < at >< at >
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Wammu website\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-04-02 11:00+0200\n"
 "PO-Revision-Date: 2012-03-30 11:23+0200\n"

[SCM] UNNAMED PROJECT branch, master,updated. 0.36-1181-gd0641b3

Michal Cihar — 2012-04-03T10:02:21

The following commit has been merged in the master branch:
commit b7199d9430c64b3cc561280b7542ed960646c0f8
Author: Burak Yavuz <hitowerdigit< at >hotmail.com>
Date:   Tue Apr 3 05:01:49 2012 +0200

    Translated using Weblate.

diff --git a/locale/tr/wammu.po b/locale/tr/wammu.po
index c1e1ba5..03f980d 100644
--- a/locale/tr/wammu.po
+++ b/locale/tr/wammu.po
< at >< at > -4,7 +4,7 < at >< at > msgstr ""
 "Project-Id-Version: wammu\n"
 "Report-Msgid-Bugs-To: michal< at >cihar.com\n"
 "POT-Creation-Date: 2011-12-06 10:10+0100\n"
-"PO-Revision-Date: 2012-03-30 22:06+0200\n"
+"PO-Revision-Date: 2012-04-01 08:15+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit< at >hotmail.com>\n"
 "Language-Team: Turkish <xfce-i18n< at >xfce.org>\n"
 "Language: tr\n"
< at >< at > -215,7 +215,7 < at >< at > msgstr[0] "%d karakter"
 
 #: Wammu/Composer.py:260
 msgid "Select predefined animation:"
-msgstr "Öntanımlı animasyonu seç:"
+msgstr "Öntanımlı canlandırma seç:"
 
 #: Wammu/Composer.py:297
 msgid "Select predefined sound:"
< at >< at > -223,7 +223,7 < at >< at > msgstr "Öntanımlı sesi s

[SCM] UNNAMED PROJECT branch, master,updated. 0.36-1181-gd0641b3

Michal Cihar — 2012-04-03T10:02:21

The following commit has been merged in the master branch:
commit d981cabbbadf6dea1c6cd4adb1c9b30b868e1ae8
Author: Burak Yavuz <hitowerdigit< at >hotmail.com>
Date:   Sat Mar 31 05:01:55 2012 +0200

    Translated using Weblate.

diff --git a/locale/tr/wammu.po b/locale/tr/wammu.po
index 14e160d..c1e1ba5 100644
--- a/locale/tr/wammu.po
+++ b/locale/tr/wammu.po
< at >< at > -4,7 +4,7 < at >< at > msgstr ""
 "Project-Id-Version: wammu\n"
 "Report-Msgid-Bugs-To: michal< at >cihar.com\n"
 "POT-Creation-Date: 2011-12-06 10:10+0100\n"
-"PO-Revision-Date: 2012-03-29 17:11+0200\n"
+"PO-Revision-Date: 2012-03-30 22:06+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit< at >hotmail.com>\n"
 "Language-Team: Turkish <xfce-i18n< at >xfce.org>\n"
 "Language: tr\n"
< at >< at > -21,12 +21,12 < at >< at > msgstr "Wammu Hakkında"
 #: Wammu/About.py:95
 #, python-format
 msgid "Running on Python %s"
-msgstr "Python %s da çalışıyor"
+msgstr "Python %s üzerinde çalışıyor"
 
 #: Wammu/About.py:96
 #, python-format
 msgid "Using wxPython %s"
-msgstr "%s wxPython kullanıyor"
+

[SCM] UNNAMED PROJECT branch, master,updated. 0.36-1181-gd0641b3

Michal Cihar — 2012-04-03T10:02:21

The following commit has been merged in the master branch:
commit d0641b324295edf3393878be01a7df27aa9b1530
Author: Michal Čihař <michal< at >cihar.com>
Date:   Tue Apr 3 12:00:51 2012 +0200

    Add Turkish docs

diff --git a/INSTALL.tr b/INSTALL.tr
new file mode 100644
index 0000000..74061c8
--- /dev/null
+++ b/INSTALL.tr
< at >< at > -0,0 +1,71 < at >< at >
+Wammu kurulumu
+==============
+
+Linux için paketler
+====================
+
+Pek çok dağıtım önceden yapılmış Wammu binarileriyle gelir, eğer
+kullanabilirseniz, kesinlikle en kolay şeydir. Ayrıca  Wammu web sitesinde
+<http://wammu.eu/download/wammu/> mevcut olan çoğu dağıtımlar için en son
+yayınlanan yapımın binari paketleri vardır.
+
+
+Kaynaklardan yapma
+==================
+
+Standart dağıt. uyg. kullanır, yani:
+
+    python setup.py build
+    sudo python setup.py install
+
+Çalıştırmak için python-gammu ve wxPython [1] (Evrensel kod etkinleştirilmiş
+yapım) kurulmuş olması ve bu programı kurmanız gerekir. Eğer Bluetooth
+cihaz

[SCM] UNNAMED PROJECT branch, master,updated. 0.36-1181-gd0641b3

Michal Cihar — 2012-04-03T10:02:21

The following commit has been merged in the master branch:
commit e4d6001671b29ece222c819f9f754e88ea31ab68
Author: Burak Yavuz <hitowerdigit< at >hotmail.com>
Date:   Mon Apr 2 18:38:01 2012 +0200

    Translated using Weblate.

diff --git a/locale/tr/docs.po b/locale/tr/docs.po
index 8d24578..371398a 100644
--- a/locale/tr/docs.po
+++ b/locale/tr/docs.po
< at >< at > -8,7 +8,7 < at >< at > msgstr ""
 "Project-Id-Version: Wammu-docs 0.34\n"
 "Report-Msgid-Bugs-To: michal< at >cihar.com\n"
 "POT-Creation-Date: 2011-01-06 16:40+0100\n"
-"PO-Revision-Date: 2012-03-30 21:30+0200\n"
+"PO-Revision-Date: 2012-04-02 18:38+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit< at >hotmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\n"
< at >< at > -123,12 +123,15 < at >< at > msgid ""
 "useful for development or when running from unpacked tarball without "
 "installation."
 msgstr ""
+"Yerel ayarları sistemdekiler yerine şu anki dizinden kullan. Bu çoğunlukla "
+"geliştirme için veya kurulumsuz açılmış tarball paketinden çalıştırıldığında "
+"faydal

[SCM] UNNAMED PROJECT branch, master,updated. 0.36-1181-gd0641b3

Michal Cihar — 2012-04-03T10:02:21

The following commit has been merged in the master branch:
commit 098249afc53281c3cfdf98d4c0b89b02ec21595c
Merge: b7199d9430c64b3cc561280b7542ed960646c0f8 e4d6001671b29ece222c819f9f754e88ea31ab68
Author: Michal Čihař <michal< at >cihar.com>
Date:   Tue Apr 3 12:00:24 2012 +0200

    Merge remote-tracking branches 'weblate/master' and 'weblate-doc/master'

[SCM] UNNAMED PROJECT branch, master,updated. 0.36-1181-gd0641b3

Michal Cihar — 2012-04-03T10:02:21

The following commit has been merged in the master branch:
commit 867f59692eb613708cadac84cdf20150ba77d03f
Author: Burak Yavuz <hitowerdigit< at >hotmail.com>
Date:   Sat Mar 31 05:02:06 2012 +0200

    Translated using Weblate.

diff --git a/locale/tr/docs.po b/locale/tr/docs.po
index f5c2600..8d24578 100644
--- a/locale/tr/docs.po
+++ b/locale/tr/docs.po
< at >< at > -8,7 +8,7 < at >< at > msgstr ""
 "Project-Id-Version: Wammu-docs 0.34\n"
 "Report-Msgid-Bugs-To: michal< at >cihar.com\n"
 "POT-Creation-Date: 2011-01-06 16:40+0100\n"
-"PO-Revision-Date: 2012-03-29 17:13+0200\n"
+"PO-Revision-Date: 2012-03-30 21:30+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit< at >hotmail.com>\n"
 "Language-Team: none\n"
 "Language: tr\n"
< at >< at > -40,29 +40,29 < at >< at > msgstr "Cep telefonu yöneticisi"
 #: wammu.1:3 wammu-configure.1:3
 #, no-wrap
 msgid "NAME"
-msgstr ""
+msgstr "ADI"
 
 #. type: Plain text
 #: wammu.1:5
 msgid "wammu - program for managing entries in your mobile phone"
-msgstr ""
+msgstr "wammu - cep telefonunuzaki girişleri yönetmek için p

[SCM] UNNAMED PROJECT branch, master,updated. 519c725f639e44fc159f90626926211ac4ee6c80

Michal Cihar — 2012-04-02T09:56:55

The following commit has been merged in the master branch:
commit 519c725f639e44fc159f90626926211ac4ee6c80
Author: Michal Čihař <michal< at >cihar.com>
Date:   Mon Apr 2 11:56:25 2012 +0200

    Update middleware list

diff --git a/settings.py b/settings.py
index ac5bc11..7e0d2d4 100644
--- a/settings.py
+++ b/settings.py
< at >< at > -29,6 +29,8 < at >< at > WEB_ROOT = os.path.dirname(os.path.abspath(__file__))
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
+# On Unix systems, a value of None will cause Django to use the same
+# timezone as the operating system.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
 TIME_ZONE = 'Europe/Prague'
< at >< at > -103,8 +105,9 < at >< at > MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
 #    'django.middleware.cache.FetchFromCacheMiddleware',
     'django.contrib.sessions.middleware.SessionM

[SCM] UNNAMED PROJECT branch, master,updated. b86f5e4c1d8f5e6c2598b1bb5c4e6af3df458981

Michal Cihar — 2012-04-02T09:51:11

The following commit has been merged in the master branch:
commit b86f5e4c1d8f5e6c2598b1bb5c4e6af3df458981
Author: Michal Čihař <michal< at >cihar.com>
Date:   Mon Apr 2 11:41:31 2012 +0200

    Cleanup config file

diff --git a/settings.py b/settings.py
index ec21c65..ac5bc11 100644
--- a/settings.py
+++ b/settings.py
< at >< at > -1,7 +1,7 < at >< at >
 # Django settings for wammu website project.
 # -*- coding: UTF-8 -*-
 
-from socket import gethostname
+import os
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
< at >< at > -24,6 +24,8 < at >< at > DATABASES = {
     }
 }
 
+WEB_ROOT = os.path.dirname(os.path.abspath(__file__))
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
< at >< at > -41,33 +43,50 < at >< at > SITE_ID = 1
 # to load the internationalization machinery.
 USE_I18N = True
 
-HOSTNAME = gethostname()
-if HOSTNAME == 'rincewind':
-    WEB_ROOT = '/home/mcihar/private/wammu_web/'
-elif HOSTNAME == 'raptor':
-

[SCM] UNNAMED PROJECT branch, master,updated. 4d7ea2d5fc0aaf3d13743f3fc6f04d481a52b986

Michal Cihar — 2012-04-02T09:11:03

The following commit has been merged in the master branch:
commit 4d7ea2d5fc0aaf3d13743f3fc6f04d481a52b986
Author: Michal Čihař <michal< at >cihar.com>
Date:   Mon Apr 2 11:10:27 2012 +0200

    Need an instance here

diff --git a/urls.py b/urls.py
index 7910d29..5e57fa6 100644
--- a/urls.py
+++ b/urls.py
< at >< at > -128,8 +128,8 < at >< at > urlpatterns = patterns('',
     (r'^tools/networks/$', 'tools.views.networks'),
 
     # RSS feeds
-    (r'^news/rss/$', RssNewsFeed),
-    (r'^news/atom/$', AtomNewsFeed),
+    (r'^news/rss/$', RssNewsFeed()),
+    (r'^news/atom/$', AtomNewsFeed()),
 
     # News
     (r'^news/$', 'news.views.index'),
< at >< at > -143,8 +143,8 < at >< at > urlpatterns = patterns('',
     (r'^download/(?P<program>[^/]*)/(?P<platform>[^/]*)/$', 'downloads.views.list'),
 
     # RSS feeds
-    (r'^phones/rss/$', RssPhonesFeed),
-    (r'^phones/atom/$', AtomPhonesFeed),
+    (r'^phones/rss/$', RssPhonesFeed()),
+    (r'^phones/atom/$', AtomPhonesFeed()),
 
 
     (r'^phones/csv/$', 'phonedb.views.phones_csv'),

[SCM] UNNAMED PROJECT branch, master,updated. b965dabc360aaf521a7444746eccd461ce408d70

Michal Cihar — 2012-04-02T09:00:59

The following commit has been merged in the master branch:
commit b965dabc360aaf521a7444746eccd461ce408d70
Author: Michal Čihař <michal< at >cihar.com>
Date:   Mon Apr 2 11:00:35 2012 +0200

    Reformat message

diff --git a/html/contribute/translate.html b/html/contribute/translate.html
index c0b82a2..05e9a31 100644
--- a/html/contribute/translate.html
+++ b/html/contribute/translate.html
< at >< at > -89,11 +89,7 < at >< at > is two letter code of your translation.
 </p>
 
 <p>
-{% blocktrans %}
-You should follow terminology as defined for your language in <a
-href="https://l10n.cihar.com/dictionaries/gammu/">dictionary for the project</a>.
-If it is not defined, you can help creating one!
-{% endblocktrans %}
+{% blocktrans with "https://l10n.cihar.com/dictionaries/gammu/" as url %}You should follow terminology as defined for your language in <a href="{{ url }}">dictionary for the project</a>. If it is not defined, you can help creating one!{% endblocktrans %}
 </p>
 
 <h3>{% trans "What is Important?" %}</h3>
diff --git a/lo

[SCM] UNNAMED PROJECT branch, master,updated. b965dabc360aaf521a7444746eccd461ce408d70

Michal Cihar — 2012-04-02T09:00:59

The following commit has been merged in the master branch:
commit cd2ca29baf0d56c6a8cd4195bf767a9857bc9223
Author: Michal Čihař <michal< at >cihar.com>
Date:   Mon Apr 2 10:59:23 2012 +0200

    Fix typo

diff --git a/html/contribute/translate.html b/html/contribute/translate.html
index b45ebc2..c0b82a2 100644
--- a/html/contribute/translate.html
+++ b/html/contribute/translate.html
< at >< at > -91,7 +91,7 < at >< at > is two letter code of your translation.
 <p>
 {% blocktrans %}
 You should follow terminology as defined for your language in <a
-href="https://l10n.cihar.com/dictionary/gammu/">dictionary for the project</a>.
+href="https://l10n.cihar.com/dictionaries/gammu/">dictionary for the project</a>.
 If it is not defined, you can help creating one!
 {% endblocktrans %}
 </p>

[SCM] UNNAMED PROJECT branch, master,updated. 9edefb201fc4fe728a8db68045d74dc81cb4fa70

Michal Cihar — 2012-04-02T08:58:48

The following commit has been merged in the master branch:
commit 9edefb201fc4fe728a8db68045d74dc81cb4fa70
Author: Michal Čihař <michal< at >cihar.com>
Date:   Mon Apr 2 10:58:17 2012 +0200

    Update po files

diff --git a/locale/cs/LC_MESSAGES/django.po b/locale/cs/LC_MESSAGES/django.po
index 059216b..5f49da3 100644
--- a/locale/cs/LC_MESSAGES/django.po
+++ b/locale/cs/LC_MESSAGES/django.po
< at >< at > -8,7 +8,7 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: Wammu web 2009\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-27 10:25+0200\n"
+"POT-Creation-Date: 2012-04-02 10:57+0200\n"
 "PO-Revision-Date: 2012-03-27 10:39+0200\n"
 "Last-Translator: Michal Čihař <michal< at >cihar.com>\n"
 "Language-Team: Czech <cs< at >li.org>\n"
< at >< at > -185,7 +185,7 < at >< at > msgid "About"
 msgstr "Informace"
 
 #: html/base.html:116 html/gammu.html:4 html/gammu.html.py:19
-#: html/contribute/translate.html:59
+#: html/contribute/translate.html:60
 msgid "Gammu"
 msgstr "Gammu"
 
< at >< at > -719,6 +719,7 < at >< at > msgid "Sponsors"
 msgstr "Podporují"
 
 #: ht

[SCM] UNNAMED PROJECT branch, master,updated. 9edefb201fc4fe728a8db68045d74dc81cb4fa70

Michal Cihar — 2012-04-02T08:58:48

The following commit has been merged in the master branch:
commit 02a5d19fb850f0b001f233b087772a1f399edcc9
Author: Michal Čihař <michal< at >cihar.com>
Date:   Mon Apr 2 10:57:22 2012 +0200

    Adjust links to l10n.cihar.com

diff --git a/html/contribute/translate.html b/html/contribute/translate.html
index 03ff707..b45ebc2 100644
--- a/html/contribute/translate.html
+++ b/html/contribute/translate.html
< at >< at > -55,9 +55,10 < at >< at > are separate translations projects:
 </p>
 
 <ul>
-<li><a href="https://l10n.cihar.com/projects/wammu">{% trans "Wammu" %}</a></li>
-<li><a href="https://l10n.cihar.com/projects/gammu">{% trans "Gammu" %}</a></li>
-<li><a href="https://l10n.cihar.com/projects/wammu_web">{% trans "This website" %}</a></li>
+<li><a href="https://l10n.cihar.com/projects/gammu/wammu">{% trans "Wammu" %}</a></li>
+<li><a href="https://l10n.cihar.com/projects/gammu/libgammu">{% trans "libGammu" %}</a></li>
+<li><a href="https://l10n.cihar.com/projects/gammu/gammu">{% trans "Gammu" %}</a></li>
+<li><a href="https://

[SCM] UNNAMED PROJECT branch, master,updated. 3dc5d84677ecda226625b81c701f5d71fe2e7362

Michal Cihar — 2012-04-02T08:53:25

The following commit has been merged in the master branch:
commit 3dc5d84677ecda226625b81c701f5d71fe2e7362
Author: Michal Čihař <michal< at >cihar.com>
Date:   Mon Apr 2 10:53:10 2012 +0200

    Another stupid typo

diff --git a/urls.py b/urls.py
index 9feb1fb..7910d29 100644
--- a/urls.py
+++ b/urls.py
< at >< at > -130,7 +130,6 < at >< at > urlpatterns = patterns('',
     # RSS feeds
     (r'^news/rss/$', RssNewsFeed),
     (r'^news/atom/$', AtomNewsFeed),
-}
 
     # News
     (r'^news/$', 'news.views.index'),

[SCM] UNNAMED PROJECT branch, master,updated. 9077f3476be07905bb1ce697b8ffb5364bf7b734

Michal Cihar — 2012-04-02T08:52:44

The following commit has been merged in the master branch:
commit 9077f3476be07905bb1ce697b8ffb5364bf7b734
Author: Michal Čihař <michal< at >cihar.com>
Date:   Mon Apr 2 10:52:28 2012 +0200

    Fix typo

diff --git a/urls.py b/urls.py
index a12458e..9feb1fb 100644
--- a/urls.py
+++ b/urls.py
< at >< at > -129,7 +129,7 < at >< at > urlpatterns = patterns('',
 
     # RSS feeds
     (r'^news/rss/$', RssNewsFeed),
-    (r'^news/atom': AtomNewsFeed),
+    (r'^news/atom/$', AtomNewsFeed),
 }
 
     # News

[SCM] UNNAMED PROJECT branch, master,updated. 25d29d8c96f310203004a481bb2df01710b9e39c

Michal Cihar — 2012-04-02T08:51:55

The following commit has been merged in the master branch:
commit 25d29d8c96f310203004a481bb2df01710b9e39c
Author: Michal Čihař <michal< at >cihar.com>
Date:   Mon Apr 2 10:51:12 2012 +0200

    Use new feeds syntax

diff --git a/urls.py b/urls.py
index b39d87c..a12458e 100644
--- a/urls.py
+++ b/urls.py
< at >< at > -9,16 +9,6 < at >< at > from downloads.models import Release
 import os
 import datetime
 
-newsfeeds = {
-    'rss': RssNewsFeed,
-    'atom': AtomNewsFeed,
-}
-
-phonesfeeds = {
-    'rss': RssPhonesFeed,
-    'atom': AtomPhonesFeed,
-}
-
 news_dict = {
     'queryset': Entry.objects.all(),
     'date_field': 'pub_date',
< at >< at > -138,8 +128,9 < at >< at > urlpatterns = patterns('',
     (r'^tools/networks/$', 'tools.views.networks'),
 
     # RSS feeds
-    (r'^news/(?P<url>(rss|atom).*)/$', 'django.contrib.syndication.views.feed',
-        {'feed_dict': newsfeeds}),
+    (r'^news/rss/$', RssNewsFeed),
+    (r'^news/atom': AtomNewsFeed),
+}
 
     # News
     (r'^news/$', 'news.views.index'),
< at >< at > -153,8 +144,10 < at >< at > urlpatterns = pat

[SCM] UNNAMED PROJECT branch, master,updated. 6cbe80a8150209c1b2088bed1c554c2252a9abfa

Michal Cihar — 2012-04-02T08:45:47

The following commit has been merged in the master branch:
commit 6cbe80a8150209c1b2088bed1c554c2252a9abfa
Author: Michal Čihař <michal< at >cihar.com>
Date:   Mon Apr 2 10:45:34 2012 +0200

    Really fix phonedb feeds

diff --git a/phonedb/feeds.py b/phonedb/feeds.py
index a918afa..79a63af 100644
--- a/phonedb/feeds.py
+++ b/phonedb/feeds.py
< at >< at > -1,5 +1,5 < at >< at >
 # -*- coding: UTF-8 -*-
-from django.contrib.syndication.feeds import Feed
+from django.contrib.syndication.views import Feed
 from phonedb.models import Vendor, Phone
 from django.utils.feedgenerator import Atom1Feed
 from django.utils.translation import ugettext as _