Commit 25a01873 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Localize search messages

parent ac3989ce

.idea/workspace.xml

+38 −36
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
  <component name="ChangeListManager">

    <list default="true" id="a18ea2b9-bbc4-496b-b324-f0c9ff012408" name="Default" comment="">

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/my_notes.md" afterPath="$PROJECT_DIR$/my_notes.md" />

      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/opds_catalog/feeds.py" afterPath="$PROJECT_DIR$/opds_catalog/feeds.py" />

    </list>

    <ignored path="sopds.iws" />

    <ignored path=".idea/workspace.xml" />
@@ -48,11 +50,11 @@ 
  </component>

  <component name="FileEditorManager">

    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">

      <file leaf-file-name="feeds.py" pinned="false" current-in-tab="true">

      <file leaf-file-name="feeds.py" pinned="false" current-in-tab="false">

        <entry file="file://$PROJECT_DIR$/opds_catalog/feeds.py">

          <provider selected="true" editor-type-id="text-editor">

            <state vertical-scroll-proportion="3.1590552">

              <caret line="125" column="117" selection-start-line="125" selection-start-column="117" selection-end-line="125" selection-end-column="117" />

            <state vertical-scroll-proportion="0.0">

              <caret line="117" column="204" selection-start-line="117" selection-start-column="204" selection-end-line="117" selection-end-column="204" />

              <folding>

                <element signature="e#0#27#0" expanded="true" />

              </folding>
@@ -141,12 +143,12 @@ 
          </provider>

        </entry>

      </file>

      <file leaf-file-name="my_notes.md" pinned="false" current-in-tab="false">

      <file leaf-file-name="my_notes.md" pinned="false" current-in-tab="true">

        <entry file="file://$PROJECT_DIR$/my_notes.md">

          <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">

            <state split_layout="FIRST">

              <first_editor vertical-scroll-proportion="0.0">

                <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="62" />

              <first_editor vertical-scroll-proportion="0.3810345">

                <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />

                <folding />

              </first_editor>

              <second_editor />
@@ -202,14 +204,14 @@ 
        <option value="$PROJECT_DIR$/opds_catalog/settings.py" />

        <option value="$PROJECT_DIR$/opds_catalog/migrations/__init__.py" />

        <option value="$PROJECT_DIR$/scan.log" />

        <option value="$PROJECT_DIR$/my_notes.md" />

        <option value="$PROJECT_DIR$/opds_catalog/templates/search.html" />

        <option value="$PROJECT_DIR$/opds_catalog/templates/opensearch.html" />

        <option value="$PROJECT_DIR$/opds_catalog/urls.py" />

        <option value="$PROJECT_DIR$/opds_catalog/opdsdb.py" />

        <option value="$PROJECT_DIR$/opds_catalog/management/commands/sopds.py" />

        <option value="$PROJECT_DIR$/opds_catalog/feeds.py" />

        <option value="$PROJECT_DIR$/opds_catalog/models.py" />

        <option value="$PROJECT_DIR$/opds_catalog/feeds.py" />

        <option value="$PROJECT_DIR$/my_notes.md" />

      </list>

    </option>

  </component>
@@ -697,7 +699,7 @@ 
        <state vertical-scroll-proportion="0.0">

          <caret line="7" column="95" selection-start-line="7" selection-start-column="95" selection-end-line="7" selection-end-column="95" />

          <folding>

            <element signature="e#1#33#0" expanded="true" />

            <element signature="e#1#33#0" expanded="false" />

          </folding>

        </state>

      </provider>
@@ -979,25 +981,11 @@ 
        <state vertical-scroll-proportion="0.0">

          <caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />

          <folding>

            <element signature="e#1#33#0" expanded="true" />

            <element signature="e#1#33#0" expanded="false" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/my_notes.md">

      <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">

        <state split_layout="FIRST">

          <first_editor vertical-scroll-proportion="0.0">

            <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="62" />

            <folding />

          </first_editor>

          <second_editor />

        </state>

      </provider>

      <provider editor-type-id="MultiMarkdownFxPreviewEditor">

        <state />

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/sopds/urls.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">
@@ -1062,16 +1050,6 @@ 
        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/models.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="90" column="9" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />

          <folding>

            <element signature="e#0#28#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/views.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">
@@ -1082,13 +1060,37 @@ 
    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/feeds.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="3.1590552">

          <caret line="125" column="117" selection-start-line="125" selection-start-column="117" selection-end-line="125" selection-end-column="117" />

        <state vertical-scroll-proportion="0.0">

          <caret line="117" column="204" selection-start-line="117" selection-start-column="204" selection-end-line="117" selection-end-column="204" />

          <folding>

            <element signature="e#0#27#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/opds_catalog/models.py">

      <provider selected="true" editor-type-id="text-editor">

        <state vertical-scroll-proportion="0.0">

          <caret line="90" column="9" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />

          <folding>

            <element signature="e#0#28#0" expanded="true" />

          </folding>

        </state>

      </provider>

    </entry>

    <entry file="file://$PROJECT_DIR$/my_notes.md">

      <provider selected="true" editor-type-id="split-provider[text-editor;MultiMarkdownPreviewEditor]">

        <state split_layout="FIRST">

          <first_editor vertical-scroll-proportion="0.3810345">

            <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />

            <folding />

          </first_editor>

          <second_editor />

        </state>

      </provider>

      <provider editor-type-id="MultiMarkdownFxPreviewEditor">

        <state />

      </provider>

    </entry>

  </component>

</project>
 
 No newline at end of file

my_notes.md

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ manage.py compilemessages 
http://djbook.ru/rel1.5/topics/i18n/translation.html

http://job-blog.bullgare.ru/2011/02/%D0%B8%D0%BD%D1%82%D0%B5%D1%80%D0%BD%D0%B0%D1%86%D0%B8%D0%BE%D0%BD%D0%B0%D0%BB%D0%B8%D0%B7%D0%B0%D1%86%D0%B8%D1%8F-%D0%B8-%D0%BB%D0%BE%D0%BA%D0%B0%D0%BB%D0%B8%D0%B7%D0%B0%D1%86%D0%B8%D1%8F-django/



manage.py makemessages -l ru

manage.py compilemessages





## Тестировнаие в DJANGO

 - https://docs.djangoproject.com/en/dev/topics/testing/#assertions

 - https://habrahabr.ru/post/122156/

opds_catalog/locale/ru/LC_MESSAGES/django.po

+34 −14
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ msgid "" 
msgstr ""

"Project-Id-Version: PACKAGE VERSION\n"

"Report-Msgid-Bugs-To: \n"

"POT-Creation-Date: 2016-03-13 12:46+0300\n"

"POT-Creation-Date: 2016-03-20 19:47+0300\n"

"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,61 +19,81 @@ msgstr "" 
"10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%"

"100>=11 && n%100<=14)? 2 : 3);\n"



#: .\opds_catalog\feeds.py:98 .\opds_catalog\feeds.py:158

#: .\opds_catalog\feeds.py:160

#: .\opds_catalog\feeds.py:117 .\opds_catalog\feeds.py:283

#: .\opds_catalog\feeds.py:285

msgid "By catalogs"

msgstr "По каталогам"



#: .\opds_catalog\feeds.py:98

#: .\opds_catalog\feeds.py:118

#, python-format

msgid "Catalogs: %(catalogs)s, books: %(books)s."

msgstr "Каталогов: %(catalogs)s, книг: %(books)s."



#: .\opds_catalog\feeds.py:99

#: .\opds_catalog\feeds.py:119

msgid "By authors"

msgstr "По авторам"



#: .\opds_catalog\feeds.py:99

#: .\opds_catalog\feeds.py:120

#, python-format

msgid "Authors: %(authors)s."

msgstr "Авторов: %(authors)s."



#: .\opds_catalog\feeds.py:100

#: .\opds_catalog\feeds.py:121

msgid "By titles"

msgstr "По наименованиям"



#: .\opds_catalog\feeds.py:100

#: .\opds_catalog\feeds.py:122

#, python-format

msgid "Books: %(books)s."

msgstr "Книг: %(books)s."



#: .\opds_catalog\feeds.py:101

#: .\opds_catalog\feeds.py:123

msgid "By genres"

msgstr "По жанрам"



#: .\opds_catalog\feeds.py:101

#: .\opds_catalog\feeds.py:124

#, python-format

msgid "Genres: %(genres)s."

msgstr "Жанров: %(genres)s."



#: .\opds_catalog\feeds.py:102

#: .\opds_catalog\feeds.py:125

msgid "By series"

msgstr "По сериям"



#: .\opds_catalog\feeds.py:102

#: .\opds_catalog\feeds.py:126

#, python-format

msgid "Series: %(series)s."

msgstr "Серий: %(series)s."



#: .\opds_catalog\feeds.py:103

#: .\opds_catalog\feeds.py:127

msgid "Book shelf"

msgstr "Книжная полка"



#: .\opds_catalog\feeds.py:103

#: .\opds_catalog\feeds.py:128

#, python-format

msgid "Books readed: %(bookshelf)s."

msgstr "Книг прочитано: %(bookshelf)s."



#: .\opds_catalog\feeds.py:174

msgid "Search by titles"

msgstr "Поиск по наименованиям"



#: .\opds_catalog\feeds.py:174

msgid "Search books by title"

msgstr "Поиск книг по наименованию"



#: .\opds_catalog\feeds.py:175

msgid "Search by authors"

msgstr "Поиск авторов"



#: .\opds_catalog\feeds.py:175

msgid "Search authors by name"

msgstr "Поиск авторов по имени"



#: .\opds_catalog\feeds.py:176

msgid "Search genres"

msgstr "Поиск жанров"



#: .\opds_catalog\templates\book_description.html:6

msgid "Book name:"

msgstr "Название:"