Added proper russian translation of the template code. The form validation messages are not yet translated. This refs #36

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,72 +1,141 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-13 22:07+0300\n"
+"POT-Creation-Date: 2013-06-09 17:35+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
 
-#: templates/base.html:22
+#: templates/base.html:27
 msgid "All threads"
-msgstr "Все ники"
+msgstr "Все темы"
+
+#: templates/base.html:33
+msgid "Settings"
+msgstr "Настройки"
+
+#: templates/base.html:40
+msgid "Up"
+msgstr "Вверх"
 
-#: templates/posting_general.html:26
-msgid "View"
-msgstr "Просмотр"
+#: templates/posting_general.html:18
+msgid "Tag: "
+msgstr "Тег: "
 
-#: templates/posting_general.html:31
+#: templates/posting_general.html:35 templates/posting_general.html.py:79
+#: templates/thread.html:27
+#, fuzzy
+msgid "Post image"
+msgstr "Изображение сообщения"
+
+#: templates/posting_general.html:46
+msgid "Reply"
+msgstr "Ответ"
+
+#: templates/posting_general.html:53 templates/thread.html:107
 msgid "replies"
 msgstr "ответов"
 
-#: templates/posting_general.html:32
+#: templates/posting_general.html:54 templates/thread.html:108
 msgid "images"
 msgstr "изображений"
 
-#: templates/posting_general.html:33
-msgid "gets"
-msgstr "геты"
-
-#: templates/posting_general.html:35 templates/posting_general.html.py:67
-#: templates/thread.html:31
+#: templates/posting_general.html:56 templates/posting_general.html.py:127
+#: templates/thread.html:49
 msgid "Tags"
 msgstr "Теги"
 
-#: templates/posting_general.html:52
+#: templates/posting_general.html:109
 msgid "Create new thread"
-msgstr "Создать новую нить"
+msgstr "Создать новую тему"
 
-#: templates/posting_general.html:55 templates/thread.html:50
+#: templates/posting_general.html:112 templates/thread.html:71
 msgid "Title"
 msgstr "Заголовок"
 
-#: templates/posting_general.html:59 templates/thread.html:54
+#: templates/posting_general.html:117 templates/thread.html:76
 msgid "Text"
 msgstr "Текст"
 
-#: templates/posting_general.html:63 templates/thread.html:58
+#: templates/posting_general.html:122 templates/thread.html:81
 msgid "Image"
-msgstr "Картинка"
+msgstr "Изображение"
 
-#: templates/posting_general.html:70 templates/thread.html:61
+#: templates/posting_general.html:136 templates/thread.html:91
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/posting_general.html:72
-msgid "Tags must be delimited by spaces. Text or image is required."
-msgstr "Теги должны быть разделены пробелами. Текст или изображение обязательны."
+#: templates/posting_general.html:152
+#, fuzzy
+msgid "Pages:"
+msgstr "Страницы: "
+
+#: templates/settings.html:13
+msgid "Theme"
+msgstr "Тема"
+
+#: templates/settings.html:29
+msgid "Save"
+msgstr "Сохранить"
+
+#: templates/tags.html:7
+msgid "tags"
+msgstr "тегов"
+
+#: templates/thread.html:39
+msgid "Get!"
+msgstr "Гет!"
+
+#: templates/thread.html:68
+msgid "Reply to thread"
+msgstr "Ответить в тему"
+
+#: templates/thread.html:93
+msgid "Basic markdown syntax."
+msgstr "Базовый синтаксис markdown."
 
-#: templates/thread.html:47
-msgid "Reply to the thread"
-msgstr "Ответить в нить"
+#: templates/thread.html:94
+msgid "Example: "
+msgstr "Пример: "
+
+#: templates/thread.html:94
+msgid "italic"
+msgstr "курсив"
+
+#: templates/thread.html:95
+msgid "bold"
+msgstr "полужирный"
+
+#: templates/thread.html:96
+msgid "Quotes can be inserted with"
+msgstr "Цитаты могут быть вставлены при помощи"
+
+#: templates/thread.html:97
+msgid "Links to answers can be inserted with"
+msgstr "Ссылки на ответы могут быть вставлены с помощью"
+
+#: templates/thread.html:109
+msgid "Last update: "
+msgstr "Последнее обновление: "
+
+#~ msgid "View"
+#~ msgstr "Просмотр"
+
+#~ msgid "gets"
+#~ msgstr "гетов"
+
+#~ msgid "Tags must be delimited by spaces. Text or image is required."
+#~ msgstr ""
+#~ "Теги должны быть разделены пробелами. Текст или изображение обязательны."

boards/templates/thread.html

@@ -1,110 +1,112 b''
 {% extends "base.html" %}
 
 {% load i18n %}
 {% load markup %}
 
 {% block head %}
     <title>Neboard - {{ posts.0.title }}</title>
 {% endblock %}
 
 {% block content %}
     <script src="{{ STATIC_URL }}js/thread.js"></script>
 
 	{% if posts %}
         <div id="posts">
 		{% for post in posts %}
             {% if posts.0.can_bump %}
                 <div class="post" id="{{ post.id }}">
             {% else %}
                 <div class="post dead_post" id="{{ post.id }}">
             {% endif %}
             {% if post.image %}
                 <div class="image">
                     <a
                             class="fancy"
                             href="{{ post.image.url }}"><img
                             src="{{ post.image.url_200x150 }}"
                             alt="{% trans 'Post image' %}" />
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ post.title }}</span>
                     <a class="post_id" href="#{{ post.id }}">
                         (#{{ post.id }})</a>
                     [{{ post.pub_time }}]
                     {% if post.is_get %}
                         <span class="get">
                             {% trans "Get!" %}
                         </span>
                     {% endif %}
                 </div>
                 {% autoescape off %}
                 {{ post.text.rendered }}
                 {% endautoescape %}
             </div>
             {% if post.tags.all %}
                 <div class="metadata">
                     <span class="tags">{% trans 'Tags' %}:
                         {% for tag in post.tags.all %}
                             <a class="tag" href="{% url 'tag' tag.name %}">
                                 {{ tag.name }}</a>
                         {% endfor %}
                     </span>
                 </div>
             {% endif %}
             </div>
 		{% endfor %}
         </div>
 	{% else %}
 		No thread found.
         <hr />
 	{% endif %}
 
     <form id="form" enctype="multipart/form-data" method="post"
             >{% csrf_token %}
         <div class="post-form-w">
             <div class="form-title">{% trans "Reply to thread" %}</div>
             <div class="post-form">
                 <div class="form-row">
                     <div class="form-label">{% trans 'Title' %}</div>
                     <div class="form-input">{{ form.title }}</div>
                     <div class="form-errors">{{ form.title.errors }}</div>
                 </div>
                 <div class="form-row">
                     <div class="form-label">{% trans 'Text' %}</div>
                     <div class="form-input">{{ form.text }}</div>
                     <div class="form-errors">{{ form.text.errors }}</div>
                 </div>
                 <div class="form-row">
                     <div class="form-label">{% trans 'Image' %}</div>
                     <div class="form-input">{{ form.image }}</div>
                     <div class="form-errors">{{ form.image.errors }}</div>
                 </div>
                 <div class="form-row">
                     {{ form.captcha }}
                 </div>
             </div>
 
             <div class="form-submit"><input type="submit"
                                             value="{% trans "Post" %}"/></div>
-            <div>Use <a
-                    href="http://daringfireball.net/projects/markdown/basics">
-                markdown</a> syntax for posting.</div>
-            <div>Example: *<i>italic</i>*, **<b>bold</b>**</div>
-            <div>Insert quotes with "&gt;"</div>
+            <div><a href="http://daringfireball.net/projects/markdown/basics">
+                {% trans 'Basic markdown syntax.' %}</a></div>
+            <div>{% trans 'Example: ' %}*<i>{% trans 'italic' %}</i>*,
+                **<b>{% trans 'bold' %}</b>**</div>
+            <div>{% trans 'Quotes can be inserted with' %} "&gt;"</div>
+            <div>{% trans 'Links to answers can be inserted with' %} "&gt;&gt;
+                123"</div>
         </div>
     </form>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
         {{ posts.0.get_reply_count }} {% trans 'replies' %},
         {{ posts.0.get_images_count }} {% trans 'images' %}.
         {% trans 'Last update: ' %}{{ posts.0.last_edit_time }}
     </span>
 
 {% endblock %}
  No newline at end of file

neboard/settings.py

@@ -1,195 +1,195 b''
 # Django settings for neboard project.
 import os
 import markdown
 from boards.mdx_neboard import markdown_extended
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     # ('Your Name', '[e-mail]'),
     ('admin', '[e-mail]')
 )
 
 MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': 'database.db',                      # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
     }
 }
 
 # 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.
 # In a Windows environment this must be set to your system time zone.
 TIME_ZONE = 'Europe/Kiev'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'ru'
+LANGUAGE_CODE = 'ru-RU'
 
 SITE_ID = 1
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
 
 # If you set this to False, Django will not format dates, numbers and
 # calendars according to the current locale.
 USE_L10N = True
 
 # If you set this to False, Django will not use timezone-aware datetimes.
 USE_TZ = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
 MEDIA_ROOT = './media/' 
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
 MEDIA_URL = '/media/'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = ''
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/static/'
 
 # Additional locations of static files
 # It is really a hack, put real paths, not related
 STATICFILES_DIRS = (
     os.path.dirname(__file__) + '/boards/static',
 
 #    '/d/work/python/django/neboard/neboard/boards/static',
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
 )
 
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '@1rc$o(7=tt#kd+4s$u6wchm**z^)4x90)7f6z(i&55@o11*8o'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
 #     'django.template.loaders.eggs.Loader',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.media',
     'django.core.context_processors.static',
     'django.core.context_processors.request',
     'django.contrib.auth.context_processors.auth',
 )
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
 #    'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     # Uncomment the next line for simple clickjacking protection:
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
 
 ROOT_URLCONF = 'neboard.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'neboard.wsgi.application'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
     'templates',
 )
 
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     # Uncomment the next line to enable the admin:
      'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'django.contrib.markup',
     'django_cleanup',
     'boards',
     'captcha',
 )
 
 # TODO: NEED DESIGN FIXES
 CAPTCHA_OUTPUT_FORMAT = (u' %(hidden_field)s '
                          u'<div class="form-label">%(image)s</div>'
                          u'<div class="form-text">%(text_field)s</div>')
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.
 # See http://docs.djangoproject.com/en/dev/topics/logging for
 # more details on how to customize your logging configuration.
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
     'filters': {
         'require_debug_false': {
             '()': 'django.utils.log.RequireDebugFalse'
         }
     },
     'handlers': {
         'mail_admins': {
             'level': 'ERROR',
             'filters': ['require_debug_false'],
             'class': 'django.utils.log.AdminEmailHandler'
         }
     },
     'loggers': {
         'django.request': {
             'handlers': ['mail_admins'],
             'level': 'ERROR',
             'propagate': True,
         },
     }
 }
 
 MARKUP_FIELD_TYPES = (
     ('markdown', markdown_extended),
 )
 # Custom imageboard settings
 MAX_POSTS_PER_THREAD = 10 # Thread bumplimit
 MAX_THREAD_COUNT = 500 # Old threads will be deleted to preserve this count
 THREADS_PER_PAGE = 10
 SITE_NAME = 'Neboard'
 
 THEMES = [
     ('md', 'Mystic Dark'),
     ('sw', 'Snow White') ]
 DEFAULT_THEME = 'md'
 
 POPULAR_TAGS = 10
 LAST_REPLIES_COUNT = 3
 
 ENABLE_CAPTCHA = True
  No newline at end of file