Merge pull request #208 from stratatech/master

Russian translations + some fixes related to translations

django_notify/locale/ru/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-25 23:57+0800\n"
+"POT-Creation-Date: 2013-10-25 15:45+0400\n"
 "PO-Revision-Date: 2013-03-17 19:30+CET\n"
 "Last-Translator: Rostislav Grigoriev <hjcnbckfd@gmail.com>\n"
 "Language-Team: \n"
@@ -19,76 +19,76 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: __init__.py:52
+#: __init__.py:55
 msgid "You supplied a target_object that's not an instance of a django Model."
 msgstr "Указанный вами target_object не экземляр django-модели"
 
-#: models.py:14
+#: models.py:18
 msgid "unique key"
 msgstr "уникальный ключ"
 
-#: models.py:16
+#: models.py:23
 msgid "verbose name"
 msgstr "наименование"
 
-#: models.py:25
+#: models.py:34
 msgid "type"
 msgstr "тип"
 
-#: models.py:26
+#: models.py:35
 msgid "types"
 msgstr "типы"
 
-#: models.py:31
+#: models.py:47
 msgid "interval"
 msgstr "интервал"
 
-#: models.py:35
+#: models.py:52
 #, python-format
 msgid "Settings for %s"
 msgstr "Настройки для %s"
 
-#: models.py:40 models.py:41
+#: models.py:57 models.py:58
 msgid "settings"
 msgstr "настройки"
 
-#: models.py:48
+#: models.py:68
 msgid "Leave this blank to subscribe to any kind of object"
 msgstr "Оставьте это поле пустым, чтобы подписаться на любой объект"
 
-#: models.py:53
+#: models.py:78
 #, python-format
 msgid "Subscription for: %s"
 msgstr "Подписка для: %s"
 
-#: models.py:58
+#: models.py:83
 msgid "subscription"
 msgstr "подписка"
 
-#: models.py:59
+#: models.py:84
 msgid "subscriptions"
 msgstr "подписки"
 
-#: models.py:65
+#: models.py:96
 msgid "link for notification"
 msgstr "ссылка уведомления"
 
-#: models.py:71
+#: models.py:106
 msgid "occurrences"
 msgstr "вхождения"
 
-#: models.py:72
+#: models.py:108
 msgid ""
 "If the same notification was fired multiple times with no intermediate "
 "notifications"
 msgstr ""
 "Если уведомление было вызвано несколько раз без промежуточного уведомления."
 
-#: models.py:125
+#: models.py:170
 msgid "notification"
 msgstr "уведомление"
 
-#: models.py:126
+#: models.py:171
 msgid "notifications"
 msgstr "уведомления"
 
@@ -97,7 +97,7 @@ msgid "You have new notifications"
 msgstr "Нет новых уведомлений"
 
 #: settings.py:38
-msgid "instant"
+msgid "instantly"
 msgstr "немедленно"
 
 #: settings.py:39
@@ -113,21 +113,21 @@ msgstr "раз в неделю"
 msgid "%d times"
 msgstr "%d раз"
 
-#: templates/emails/notification_email_message.txt:2
+#: templates/emails/notification_email_message.txt:1
 #, python-format
 msgid "Dear %(username)s,"
 msgstr "Дорогой %(username)s,"
 
-#: templates/emails/notification_email_message.txt:4
+#: templates/emails/notification_email_message.txt:3
 #, python-format
-msgid " These are the %(digest)s notifications from %(site)s."
+msgid "These are the %(digest)s notifications from %(site)s."
 msgstr " Для вас %(digest)s уведомлений от %(site)s."
 
-#: templates/emails/notification_email_message.txt:10
+#: templates/emails/notification_email_message.txt:9
 msgid "Thanks for using our site!"
 msgstr "Спасибо, что пользуетесь сайтом!"
 
-#: templates/emails/notification_email_message.txt:12
+#: templates/emails/notification_email_message.txt:11
 msgid "Sincerely"
 msgstr "Искренне"
 

django_notify/settings.py

 from django.conf import settings as django_settings
 from django import VERSION as DJANGO_VERSION
+from django.utils.translation import ugettext_lazy as _
 
-_ = lambda x: x
 
 DB_TABLE_PREFIX = 'notify'
 

wiki/forms.py

@@ -307,7 +307,7 @@ class PermissionsForm(PluginSettingsFormMixin, forms.ModelForm):
     owner_username = forms.CharField(required=False, label=_(u'Owner'),
                                      help_text=_(u'Enter the username of the owner.'))
     group = forms.ModelChoiceField(models.Group.objects.all(), empty_label=_(u'(none)'),
-                                     required=False)
+                                     label=_(u'Group'), required=False)
     if settings.USE_BOOTSTRAP_SELECT_WIDGET:
         group.widget= SelectWidgetBootstrap()
     

wiki/plugins/notifications/forms.py

@@ -14,10 +14,10 @@ from wiki.plugins.notifications import models
 
 class SettingsModelChoiceField(forms.ModelChoiceField):
     def label_from_instance(self, obj):
-        return _(u"Receive notifications %(interval)s" % {
+        return _(u"Receive notifications %(interval)s") % {
                        'interval': obj.get_interval_display()
                    }
-               )
+               
 
 
 class ArticleSubscriptionModelMultipleChoiceField(forms.ModelMultipleChoiceField):
@@ -105,6 +105,7 @@ class SubscriptionForm(PluginSettingsFormMixin, forms.Form):
     settings = SettingsModelChoiceField(
         Settings,
         empty_label=None,
+        label=_(u'Settings')
     )
     edit = forms.BooleanField(
         required=False,