From e3d90f6d594500b75dbdc25e348844b7db5d5da2 Mon Sep 17 00:00:00 2001 From: Victor Safronovich Date: Mon, 12 Nov 2012 11:21:56 +0600 Subject: [PATCH 1/6] added russian l10n --- knowledge/locale/ru/LC_MESSAGES/django.mo | Bin 0 -> 6751 bytes knowledge/locale/ru/LC_MESSAGES/django.po | 311 ++++++++++++++++++++++ 2 files changed, 311 insertions(+) create mode 100644 knowledge/locale/ru/LC_MESSAGES/django.mo create mode 100644 knowledge/locale/ru/LC_MESSAGES/django.po diff --git a/knowledge/locale/ru/LC_MESSAGES/django.mo b/knowledge/locale/ru/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..eb26a02509d9cafef213f0df6ef9e4ed9ee09b13 GIT binary patch literal 6751 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 GUi}@2hc-t5 literal 0 HcmV?d00001 diff --git a/knowledge/locale/ru/LC_MESSAGES/django.po b/knowledge/locale/ru/LC_MESSAGES/django.po new file mode 100644 index 0000000..6b111ac --- /dev/null +++ b/knowledge/locale/ru/LC_MESSAGES/django.po @@ -0,0 +1,311 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the django-knowledge package. +# Victor Safronovich , 2012. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-11-12 10:53+0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Victor Safronovich \n" +"Language-Team: LANGUAGE \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" + +#: .\forms.py:46 .\models.py:12 +msgid "Internal" +msgstr "Внутренний" + +#: .\models.py:10 +msgid "Public" +msgstr "Открытый" + +#: .\models.py:11 +msgid "Private" +msgstr "Закрытый" + +#: .\models.py:17 +msgid "Inherit" +msgstr "Наследовать" + +#: .\models.py:33 +msgid "Category" +msgstr "Категория" + +#: .\models.py:34 .\templates\django_knowledge\sidebar.html.py:18 +msgid "Categories" +msgstr "Категории" + +#: .\models.py:49 +msgid "Alert" +msgstr "Уведомление" + +#: .\models.py:50 +msgid "Check this if you want to be alerted when a new response is added." +msgstr "Нажмите, чтобы получать уведомления о новых ответах." + +#: .\models.py:55 +msgid "Name" +msgstr "Название" + +#: .\models.py:56 +msgid "Enter your first and last name." +msgstr "Введите ваше имя и фамилию." + +#: .\models.py:58 +msgid "Email" +msgstr "Эл. адрес" + +#: .\models.py:59 +msgid "Enter a valid email address." +msgstr "Введите правильный электронный адрес." + +#: .\models.py:146 .\models.py:165 +msgid "Question" +msgstr "Вопрос" + +#: .\models.py:147 +msgid "Enter your question or suggestion." +msgstr "Введите ваш вопрос или предложение" + +#: .\models.py:149 +msgid "Description" +msgstr "Описание" + +#: .\models.py:150 +msgid "Please offer details. Markdown enabled." +msgstr "Пожалуйста, опишите детали. Доступен синтаксис Markdown" + +#: .\models.py:153 .\models.py:256 +msgid "Status" +msgstr "Статус" + +#: .\models.py:166 +msgid "Questions" +msgstr "Вопросы" + +#: .\models.py:253 .\models.py:265 +msgid "Response" +msgstr "Ответ" + +#: .\models.py:254 +msgid "Please enter your response. Markdown enabled." +msgstr "Пожалуйста, введите ваш ответ. Доступен синтаксис Markdown" + +#: .\models.py:266 +msgid "Responses" +msgstr "Ответы" + +#: .\templates\django_knowledge\ask.html.py:5 +#: .\templates\django_knowledge\ask.html.py:9 +#: .\templates\django_knowledge\list.html.py:42 +msgid "Ask a Question" +msgstr "Задайте вопрос" + +#: .\templates\django_knowledge\ask.html.py:15 +msgid "Please log in to ask a question." +msgstr "Пожалуйста, войдите в систему, чтобы задать вопрос" + +#: .\templates\django_knowledge\form.html.py:9 +msgid "required" +msgstr "обязательный" + +#: .\templates\django_knowledge\index.html.py:5 +msgid "Support" +msgstr "Поддержка" + +#: .\templates\django_knowledge\index.html.py:10 +#, python-format +msgid "Top %(count)s Questions" +msgstr "%(count)s популярных вопросов" + +#: .\templates\django_knowledge\inner.html.py:13 +msgid "Start typing your question here." +msgstr "Начните вводить ваш вопрос тут." + +#: .\templates\django_knowledge\list.html.py:20 +msgid "No results found." +msgstr "Не найдены результаты." + +#: .\templates\django_knowledge\list.html.py:28 +msgid "previous" +msgstr "предыдущий" + +#: .\templates\django_knowledge\list.html.py:31 +#, python-format +msgid "page %(number)s of %(page)s" +msgstr "страница %(number)s из %(page)s" + +#: .\templates\django_knowledge\list.html.py:34 +msgid "next" +msgstr "следующий" + +#: .\templates\django_knowledge\question_list.html.py:5 +msgid "no responses" +msgstr "ответов нет" + +#: .\templates\django_knowledge\question_list.html.py:5 +msgid "accepted" +msgstr "принят" + +#: .\templates\django_knowledge\question_list.html.py:5 +#: .\templates\django_knowledge\thread.html.py:19 +#: .\templates\django_knowledge\thread.html.py:44 +msgid "staff" +msgstr "персонал" + +#: .\templates\django_knowledge\sidebar.html.py:5 +msgid "My Questions" +msgstr "Мои вопросы" + +#: .\templates\django_knowledge\sidebar.html.py:29 +msgid "Navigate" +msgstr "Навигация" + +#: .\templates\django_knowledge\sidebar.html.py:33 +msgid "Ask a question or give suggestion." +msgstr "Задайте вопрос или сделайте предложение." + +#: .\templates\django_knowledge\sidebar.html.py:34 +msgid "Return to homepage." +msgstr "Вернуться на главную страницу." + +#: .\templates\django_knowledge\thread.html.py:20 +#: .\templates\django_knowledge\thread.html.py:45 +msgid "user" +msgstr "пользователь" + +#: .\templates\django_knowledge\thread.html.py:41 +msgid "accepted answer" +msgstr "ответ принят" + +#: .\templates\django_knowledge\thread.html.py:42 +msgid "poster" +msgstr "автор" + +#: .\templates\django_knowledge\thread.html.py:56 +msgid "No responses yet." +msgstr "На данный момент ответов нет" + +#: .\templates\django_knowledge\thread.html.py:69 +msgid "This question has been closed." +msgstr "Этот вопрос закрыт" + +#: .\templates\django_knowledge\thread.html.py:71 +msgid "Please log in to respond." +msgstr "Пожалуйста, войдите в систему для ответа" + +#: .\templates\django_knowledge\welcome.html.py:4 +msgid "Welcome to our Support Center." +msgstr "Добро пожаловать в Центр Поддержки" + +#: .\templates\django_knowledge\welcome.html.py:5 +msgid "Search for answers to your questions below, or ask your own." +msgstr "Поиск ответов на вопросы, или задайте свой новый вопрос." + +#: .\templates\django_knowledge\emails\message.html.py:6 +#: .\templates\django_knowledge\emails\message.txt.py:4 +#, python-format +msgid "Hello %(name)s," +msgstr "Здравствуйте, %(name)s" + +#: .\templates\django_knowledge\emails\message.html.py:9 +#, python-format +msgid "" +"\n" +" We just wanted to let you know that a new response has been added to " +"the question \"%(title)s\". You can visit it here: %(domain)s%(url)s.\n" +" " +msgstr "" +"\n" +"Только что был получен новый ответ на ваш вопрос \"%(title)s\".\n" +"Вы можете ознакомиться с ним по ссылке: %(domain)s%(url)s.\n" +" " + +#: .\templates\django_knowledge\emails\message.html.py:17 +#: .\templates\django_knowledge\emails\message.txt.py:13 +msgid "" +"You are receiving these messages because you checked the 'alert' box when " +"you originally posted." +msgstr "Вы получили это сообщение, потому что вы отметили галку" +" \"уведомления\", когда создавали вопрос" + +#: .\templates\django_knowledge\emails\message.html.py:21 +#, python-format +msgid "" +"\n" +" We just wanted to let you know that a new question has been added: " +"\"%(title)s\". You can visit it here: %(domain)" +"s%(url)s\n" +" " +msgstr "" +"\n" +"Только что был получен новый вопрос \"%(title)s\"." +"Вы можете ознакомиться с ним по ссылке: %(domain)s%(url)s\n" +" " + +#: .\templates\django_knowledge\emails\message.html.py:29 +#: .\templates\django_knowledge\emails\message.txt.py:23 +msgid "You are receiving these messages because you are a staff member." +msgstr "Вы получили это письмо, потому что входите в группу персонал" + +#: .\templates\django_knowledge\emails\message.html.py:32 +#, python-format +msgid "" +"Thank you,\n" +" %(name)s team" +msgstr "" +"С наилучшими пожеланиями,\n" +" Ваша комманда %(name)s" + +#: .\templates\django_knowledge\emails\message.txt.py:7 +#, python-format +msgid "" +"\n" +" We just wanted to let you know that a new response has been added to the " +"question \"%(title)s\". You can visit it here: %(domain)s%(url)s\n" +" " +msgstr "" +"\n" +"Только что был получен новый ответ на ваш вопрос \"%(title)s\".\n" +"Вы можете ознакомиться с ним по ссылке: %(domain)s%(url)s.\n" +" " + +#: .\templates\django_knowledge\emails\message.txt.py:17 +#, python-format +msgid "" +"\n" +" We just wanted to let you know that a new question has been added: \"%" +"(title)s\". You can visit it here: %(domain)s%(url)s\n" +" " +msgstr "" +"\n" +"Только что был получен новый вопрос \"%(title)s\"." +"Вы можете ознакомиться с ним по ссылке: %(domain)s%(url)s\n" +" " + +#: .\templates\django_knowledge\emails\message.txt.py:26 +#, python-format +msgid "" +"Thank you,\n" +"%(name)s team" +msgstr "" +"С наилучшими пожеланиями,\n" +" Ваша комманда %(name)s" + +#: .\templates\django_knowledge\emails\subject.txt.py:1 +#, python-format +msgid "New response on \"%(title)s\" on %(name)s." +msgstr "Новый ответ на \"%(title)s\" от %(name)s." + +#: .\templates\django_knowledge\emails\subject.txt.py:1 +#, python-format +msgid "New question \"%(title)s\" on %(name)s." +msgstr "Новый вопрос \"%(title)s\" on %(name)s." From 10635aacc8c0429e4750ac9650800650056ac69b Mon Sep 17 00:00:00 2001 From: Victor Safronovich Date: Mon, 12 Nov 2012 11:25:09 +0600 Subject: [PATCH 2/6] translate search button --- knowledge/locale/ru/LC_MESSAGES/django.mo | Bin 6751 -> 6785 bytes knowledge/locale/ru/LC_MESSAGES/django.po | 31 +++++++++++------- .../templates/django_knowledge/inner.html | 4 ++- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/knowledge/locale/ru/LC_MESSAGES/django.mo b/knowledge/locale/ru/LC_MESSAGES/django.mo index eb26a02509d9cafef213f0df6ef9e4ed9ee09b13..1207e544c48d64d5b113f4b26aded2ca2083e3e3 100644 GIT binary patch delta 1188 zcmXZcPe{{Y9LMpm?q@pFHC>z8YKp`1Pgd%de~J*vAU#MOv_p_ej9scjCp$D+b|`{~ zCDcKpi=d}q9jrXmAtK5!2s}h~=r9PvKS+NmdVk#SVb5OA^X&Kh`##TapJP|!spU#% z(nyENyT}^_W`p?F!xyQf$ZQt9_!J*w8ZT}!yMyaUlT8$x`S2#z;e9N{c`U(K*o%v} z6$3QVFJ(0pG;uxFU@vNbG2DjNkv=wwd~AxZGMq*Svu^tw)>D6h4Vc3U^n3HxVGH#b z*5VjeGrwJz0l&tnkNr~&RF&)N(g#CeS4H;iGFPK|gP&tV$RU=I87 z7=xX~+o(srR|{S26o{pYJeurO$+S6A?$a3 zh}z*#Jb+;iyaxyH0^Y(|{F9=ffu^hTcOZ)z@C~w9TSo101GT`&&U~aAk*;*+PE}B^&mr=D zvMypXxhZqPiI(r9#A{%Me`z)m`sMi#`LcDS delta 1178 zcmXZcPe{{Y9LMqR+;45InKs*OIm)tf%QUsEbOo&r9_k=^5DG!5C}`BB0tsRm1$pqG zqo8B|Af-!6lGo37_I!pV?&`SYbAXpO7It?>AeG7jZL=U=SZ*0H^RE&fqHa zGRVBVRngGK5!{IFs0Dhl3NIjY>?-oHQNBWW138o3amVlDR{9Syf%CWqZDrXoHq+gL z_1KFs_P2918W|WxZS)uk%AO-@*evp~mu`RF?Jr>sl-Ht+(L%1(ms9sF&3rCI4jGq8vvLHem<0;7L4%o%qUq9;huJEP{QECtUNW$mVb- zmN1J+F8nN>#z}mK+UH7)yT`FS4MjSE9LlCqk-bG7>^BmW`PY|Uo;WI^wA=4OuGDtv zH&hk9Tq??(?!TSdLRHaPD!a>AA>f2!oo+`b)8dMReXX(3?9@hf&`MMF$D`M9J2hE2 z;xtq?(c-1I3Tj(n#A!+@cPbg`Hmd%K5c2SF8&jt?;&H P(#4@rb+A~7e)IkV7}#>< diff --git a/knowledge/locale/ru/LC_MESSAGES/django.po b/knowledge/locale/ru/LC_MESSAGES/django.po index 6b111ac..0030fa6 100644 --- a/knowledge/locale/ru/LC_MESSAGES/django.po +++ b/knowledge/locale/ru/LC_MESSAGES/django.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-12 10:53+0600\n" +"POT-Creation-Date: 2012-11-12 11:23+0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Victor Safronovich \n" "Language-Team: LANGUAGE \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" +"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" #: .\forms.py:46 .\models.py:12 msgid "Internal" @@ -125,10 +125,14 @@ msgstr "Поддержка" msgid "Top %(count)s Questions" msgstr "%(count)s популярных вопросов" -#: .\templates\django_knowledge\inner.html.py:13 +#: .\templates\django_knowledge\inner.html.py:14 msgid "Start typing your question here." msgstr "Начните вводить ваш вопрос тут." +#: .\templates\django_knowledge\inner.html.py:15 +msgid "Search" +msgstr "Поиск" + #: .\templates\django_knowledge\list.html.py:20 msgid "No results found." msgstr "Не найдены результаты." @@ -226,7 +230,8 @@ msgid "" msgstr "" "\n" "Только что был получен новый ответ на ваш вопрос \"%(title)s\".\n" -"Вы можете ознакомиться с ним по ссылке: %(domain)s%(url)s.\n" +"Вы можете ознакомиться с ним по ссылке: %" +"(domain)s%(url)s.\n" " " #: .\templates\django_knowledge\emails\message.html.py:17 @@ -234,8 +239,9 @@ msgstr "" msgid "" "You are receiving these messages because you checked the 'alert' box when " "you originally posted." -msgstr "Вы получили это сообщение, потому что вы отметили галку" -" \"уведомления\", когда создавали вопрос" +msgstr "" +"Вы получили это сообщение, потому что вы отметили галку \"уведомления\", " +"когда создавали вопрос" #: .\templates\django_knowledge\emails\message.html.py:21 #, python-format @@ -247,8 +253,8 @@ msgid "" " " msgstr "" "\n" -"Только что был получен новый вопрос \"%(title)s\"." -"Вы можете ознакомиться с ним по ссылке: %(domain)s%(url)s\n" +"Только что был получен новый вопрос \"%(title)s\".Вы можете ознакомиться с " +"ним по ссылке: %(domain)s%(url)s\n" " " #: .\templates\django_knowledge\emails\message.html.py:29 @@ -275,7 +281,8 @@ msgid "" msgstr "" "\n" "Только что был получен новый ответ на ваш вопрос \"%(title)s\".\n" -"Вы можете ознакомиться с ним по ссылке: %(domain)s%(url)s.\n" +"Вы можете ознакомиться с ним по ссылке: %" +"(domain)s%(url)s.\n" " " #: .\templates\django_knowledge\emails\message.txt.py:17 @@ -287,8 +294,8 @@ msgid "" " " msgstr "" "\n" -"Только что был получен новый вопрос \"%(title)s\"." -"Вы можете ознакомиться с ним по ссылке: %(domain)s%(url)s\n" +"Только что был получен новый вопрос \"%(title)s\".Вы можете ознакомиться с " +"ним по ссылке: %(domain)s%(url)s\n" " " #: .\templates\django_knowledge\emails\message.txt.py:26 diff --git a/knowledge/templates/django_knowledge/inner.html b/knowledge/templates/django_knowledge/inner.html index 8770d70..8a47609 100644 --- a/knowledge/templates/django_knowledge/inner.html +++ b/knowledge/templates/django_knowledge/inner.html @@ -10,7 +10,9 @@
- +
From e606ab225872425a0bf5338d9f595809949981db Mon Sep 17 00:00:00 2001 From: Victor Safronovich Date: Mon, 12 Nov 2012 13:06:23 +0600 Subject: [PATCH 3/6] translate results of search --- knowledge/locale/ru/LC_MESSAGES/django.mo | Bin 6785 -> 7078 bytes knowledge/locale/ru/LC_MESSAGES/django.po | 32 +++++++++++++----- .../templates/django_knowledge/list.html | 6 ++-- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/knowledge/locale/ru/LC_MESSAGES/django.mo b/knowledge/locale/ru/LC_MESSAGES/django.mo index 1207e544c48d64d5b113f4b26aded2ca2083e3e3..01811499b9949846463957799b473fef91bc804d 100644 GIT binary patch delta 1653 zcmaLXOK4PA9LMp0#)-xx+D1(pC#ha*qM0^P6OGR#3<_zqRw@DMBA^l{F&HOhW(|E`5N4uZgY6)T{zZS7#P33f4usP=p#3(T!lgznPmwq4Y54e$F{F_ndS8 z=YQvP>y<63Crg4CjM71^rIrWGy7ApSE|jifvun5;C-F6&!JG5Ve!!LmX4N>2d}V*) zV*Cp~!B<#{l_h3;%;T~X!&qjPvOyZUaRjx2leiKuq9(}V2lxb;%U&QKd&8w1-(wKV z7Z%1Vu%3Ph8!&ttlaV@?5x>71 zmonas`h7pPVGL{VI(qoP|Na?j{#mSLeS1qoAzVg0R$vo;gnRw|5sc73i-&L;wV`?* zUy)gd+IR;l5`DbHDY z=m&|XLOhFASh=L|q>cCm{VwEVKl)z9L-Z$+DXfNY$;PF`zmrBg1I>62BlrvI?BAjm z2rVNz*vzF8J5dw#pcXog8}Jmi;%(f7Pce+O+;jvxu?Mf?9xSOM{s(Dvvx+9n_)a51 zut%tDoiwZ%{QH*p(lNg>v0j8 z7{PXo;YqxPf1@V)DOAXf%czLmM@>A7Jd_2yaxw4&xUO|;s>NcwKO-ZOt zQk4H@8>x$^%2FOAUzE8j%Iq!F9aKeN6}674W0@;0enYRP%4VuwK^0CapBsvn%4({P zNC~{ozAn6*%6^4!B~`~US2#WkP}fiiRK7HFRdOk;Dq9O!yRVgcl=L_Ak7Y)S%L3J2 z-%#9ZiyrT&Z%9NB$9s>46K(71X3j2ffzZ*RZwF%iUVTIF&~PjnjfWFnJen9DOeQk> zOGk><4#fO>dk-h0{X_B5gUNy9VAP+(n;T6(ENd)Eq+gev4sP7OVN+(b{EuMWxXb3g z_j2cQr`#>~YwrAi?&7P8OT}R~;l|xvci&C@YbUuemu2`jeU&@orre#(Y}MmHv%BND dNq38(yDsCVnE#%;_ka6L|Gs=b+p7un{R3HS;;sMy delta 1364 zcmY+^OGs2v9LMp$)A)X*V>;>7%%oYVS^3IG5rb3(b6IA$a1|-Ck!-UfypC0P5A$#qb8rs3a31rq zltSK%S%?R9T!SI(LNzdm>+ve`j*TK88{?}0$I*+9TRx37{>0rFV8bKWgJA>lF?IrCZ>7dq=>PQ;64yGpbZ*UmX`@fS?ZjpINO>PY)@?YrcC^%!rd9|&i4w6ED zUb@2i&(f-BOLbnfl3KlXl0t`A5l(&U`cj))l8RQoLwd>!6N#y;)6Pt0zQ\n" "Language-Team: LANGUAGE \n" @@ -104,7 +104,7 @@ msgstr "Ответы" #: .\templates\django_knowledge\ask.html.py:5 #: .\templates\django_knowledge\ask.html.py:9 -#: .\templates\django_knowledge\list.html.py:42 +#: .\templates\django_knowledge\list.html.py:44 msgid "Ask a Question" msgstr "Задайте вопрос" @@ -133,20 +133,34 @@ msgstr "Начните вводить ваш вопрос тут." msgid "Search" msgstr "Поиск" -#: .\templates\django_knowledge\list.html.py:20 +#: .\templates\django_knowledge\list.html.py:13 +#, python-format +msgid "Showing %(counter)s results" +msgstr "Найдено %(counter)s элементов" + +#: .\templates\django_knowledge\list.html.py:14 +#, python-format +msgid " for %(search)s" +msgstr "для фразы %(search)s" + +#: .\templates\django_knowledge\list.html.py:15 +#, python-format +msgid "in %(category_title)s category" +msgstr "в категории %(category_title)s" + +#: .\templates\django_knowledge\list.html.py:22 msgid "No results found." msgstr "Не найдены результаты." -#: .\templates\django_knowledge\list.html.py:28 +#: .\templates\django_knowledge\list.html.py:30 msgid "previous" msgstr "предыдущий" -#: .\templates\django_knowledge\list.html.py:31 -#, python-format -msgid "page %(number)s of %(page)s" -msgstr "страница %(number)s из %(page)s" +#: .\templates\django_knowledge\list.html.py:33 +msgid "page %(number)s of %(pages)s" +msgstr "страница %(number)s из %(pages)s" -#: .\templates\django_knowledge\list.html.py:34 +#: .\templates\django_knowledge\list.html.py:36 msgid "next" msgstr "следующий" diff --git a/knowledge/templates/django_knowledge/list.html b/knowledge/templates/django_knowledge/list.html index cadf745..ff0e156 100644 --- a/knowledge/templates/django_knowledge/list.html +++ b/knowledge/templates/django_knowledge/list.html @@ -10,7 +10,9 @@
{# dunno how to do translation on this nasty block... #} -

Showing {{ counter }} results{% if search %} for {{ search }}{% endif %}{% if category %} in {{ category.title }} category{% endif %}:

+

{% blocktrans %}Showing {{ counter }} results{% endblocktrans %} + {% if search %}{% blocktrans %} for {{ search }}{% endblocktrans %}{% endif %} + {% if category %}{% blocktrans with category_title=category.title %}in {{ category_title }} category{% endblocktrans %}{% endif %}:

{% include 'django_knowledge/question_list.html' with questions=questions.object_list %} @@ -28,7 +30,7 @@

Showing {{ counter }} results{% if search %} for {{ search }}{% end ← {% trans "previous" %} {% endif %} -   {% blocktrans with number=questions.number pages=questions.paginator.num_pages %}page {{ number }} of {{ page }}{% endblocktrans %}   +   {% blocktrans with number=questions.number pages=questions.paginator.num_pages %}page {{ number }} of {{ pages }}{% endblocktrans %}   {% if questions.has_next %} {% trans "next" %} → From 9382a97e9cfaae68263dc7969a005ff2031d8758 Mon Sep 17 00:00:00 2001 From: Victor Safronovich Date: Mon, 12 Nov 2012 13:27:46 +0600 Subject: [PATCH 4/6] translate submit button text and submit after --- knowledge/locale/ru/LC_MESSAGES/django.mo | Bin 7078 -> 7460 bytes knowledge/locale/ru/LC_MESSAGES/django.po | 37 +++++++++++++----- knowledge/templates/django_knowledge/ask.html | 2 +- .../templates/django_knowledge/list.html | 3 +- .../templates/django_knowledge/thread.html | 2 +- 5 files changed, 31 insertions(+), 13 deletions(-) diff --git a/knowledge/locale/ru/LC_MESSAGES/django.mo b/knowledge/locale/ru/LC_MESSAGES/django.mo index 01811499b9949846463957799b473fef91bc804d..c67cf25a0c455f0029f7e2c01684286b70895389 100644 GIT binary patch delta 1761 zcmYk+TWnNC9LMp0OUq>esV#-li;P;NB2+;Nr7cpCmLL zTjfEi0&E~K|B%`V`1EZ~ES&Bk!a60)2K+z;?4Lew&Jg-4{Kamiqt-&$sWLr20TPTGfJUe^jzSJsHGW4h4^)x zEi*fZKJ|wg?Fw$FD%Goqv+6&fmf-Vhvo&}P6@d`pIe@nzO_r=7{wkcHp%*8RciCTo zq1CK6^#&ezvOCjGr}g(R(^j?>~Td;bYi_r*J!dQcL`Ar*NHy z2sZP!NAYFckH6sKxRv$712y51r0Qa1i?m79nYd>d~Zt}lLCq$7`>MmZ{ z>46Hl(!FFI#TIfWd9~JHJy}U-UFTP65m`q_NgJg@g^(jjeOUQwMRmlb6E1x$ zmU2%HM^ouoBA(q7nqJp87)zI$Q^P|;iDcR(qs0!n-$Dn=4u<0qcl22F=yBH<=91`7 zN8_$Pk#xgDk#IViYBlwEI=XRSz&#O7mwGYKvx#9BPPtSf5tl=WR4Udt5N*xwUa?TV ztu429|q8E?*c1#i+TaEtCA=ppA#`6vBR N#vkF?e0Hw>%0Edq2EqUU delta 1411 zcmXxkOGs2v9LMqhOjD&Mc0+C$6oo$qF3Fq*Wo0-=?VkQh?A3xvXnYU?6KA*gm) z;6M>0g-W}D)-BqV3kwpVq$u48_5Izs9`3oHbMDNX$N&8AJnwnY8C%KEm^Df-)u9Ib zW<$8WiyNgs(`+6Ga0&n5eSE#!>=Cx^F)PIs@{xVPz4#Rm;cv{rqAW8mtLD~+b(m`w zvzs*Z!%5Tvrmza1paxjReYk>*Wj~S2Hn|1xA7)@6JN-NlYv`BbF^pgyj(gt02Kv)j z&HT1Zql^ci@hEPhCaPrFY|?5`6E+|pS%=q;c>Mt^;Q0{h``0mq6Ig)>ti})C=WD3( zH_%~z+oGWm77~w2Y`_w{;Ppo_LjM7dU<$RM8n&;txl^Yr_X%Vs=Z z;t2gEWC*JuT(Z7^_(y4kdC-CnF@kSVXTOD-puCXiU<Su|kMGlc}fKB2OC6*(pQBvpcD$sEWWr>Jh4r zWv8@y4ZWT!9aO!7Dx8#?8;X|7VXBTu3EXIx((k6SU*W5w>Ns`^$7g\n" "Language-Team: LANGUAGE \n" @@ -104,10 +104,20 @@ msgstr "Ответы" #: .\templates\django_knowledge\ask.html.py:5 #: .\templates\django_knowledge\ask.html.py:9 -#: .\templates\django_knowledge\list.html.py:44 +#: .\templates\django_knowledge\list.html.py:43 msgid "Ask a Question" msgstr "Задайте вопрос" +#: .\templates\django_knowledge\ask.html.py:13 +#: .\templates\django_knowledge\list.html.py:48 +msgid "Submit this support request" +msgstr "Задать вопрос" + +#: .\templates\django_knowledge\ask.html.py:13 +#: .\templates\django_knowledge\list.html.py:48 +msgid "and we'll get back to you as soon as possible." +msgstr "и мы ответим как можно быстрее" + #: .\templates\django_knowledge\ask.html.py:15 msgid "Please log in to ask a question." msgstr "Пожалуйста, войдите в систему, чтобы задать вопрос" @@ -133,34 +143,35 @@ msgstr "Начните вводить ваш вопрос тут." msgid "Search" msgstr "Поиск" -#: .\templates\django_knowledge\list.html.py:13 +#: .\templates\django_knowledge\list.html.py:12 #, python-format msgid "Showing %(counter)s results" msgstr "Найдено %(counter)s элементов" -#: .\templates\django_knowledge\list.html.py:14 +#: .\templates\django_knowledge\list.html.py:13 #, python-format msgid " for %(search)s" msgstr "для фразы %(search)s" -#: .\templates\django_knowledge\list.html.py:15 +#: .\templates\django_knowledge\list.html.py:14 #, python-format msgid "in %(category_title)s category" msgstr "в категории %(category_title)s" -#: .\templates\django_knowledge\list.html.py:22 +#: .\templates\django_knowledge\list.html.py:21 msgid "No results found." msgstr "Не найдены результаты." -#: .\templates\django_knowledge\list.html.py:30 +#: .\templates\django_knowledge\list.html.py:29 msgid "previous" msgstr "предыдущий" -#: .\templates\django_knowledge\list.html.py:33 +#: .\templates\django_knowledge\list.html.py:32 +#, python-format msgid "page %(number)s of %(pages)s" msgstr "страница %(number)s из %(pages)s" -#: .\templates\django_knowledge\list.html.py:36 +#: .\templates\django_knowledge\list.html.py:35 msgid "next" msgstr "следующий" @@ -211,6 +222,14 @@ msgstr "автор" msgid "No responses yet." msgstr "На данный момент ответов нет" +#: .\templates\django_knowledge\thread.html.py:66 +msgid "Respond to this question" +msgstr "Ответить на вопрос" + +#: .\templates\django_knowledge\thread.html.py:66 +msgid "and check back often for updates." +msgstr "и проверьте обновления" + #: .\templates\django_knowledge\thread.html.py:69 msgid "This question has been closed." msgstr "Этот вопрос закрыт" diff --git a/knowledge/templates/django_knowledge/ask.html b/knowledge/templates/django_knowledge/ask.html index 4ac3638..5b7b515 100644 --- a/knowledge/templates/django_knowledge/ask.html +++ b/knowledge/templates/django_knowledge/ask.html @@ -10,7 +10,7 @@

{% trans "Ask a Question" %}

{% if form %} - {% include "django_knowledge/form.html" with submit_value="Submit this support request" submit_and="and we'll get back to you as soon as possible." %} + {% include "django_knowledge/form.html" with submit_value=0|default:_("Submit this support request") submit_and=0|default:_("and we'll get back to you as soon as possible.") %} {% else %}

{% trans "Please log in to ask a question." %}

{% endif %} diff --git a/knowledge/templates/django_knowledge/list.html b/knowledge/templates/django_knowledge/list.html index ff0e156..d8c5bbd 100644 --- a/knowledge/templates/django_knowledge/list.html +++ b/knowledge/templates/django_knowledge/list.html @@ -9,7 +9,6 @@ {% block knowledge_widgets %}
- {# dunno how to do translation on this nasty block... #}

{% blocktrans %}Showing {{ counter }} results{% endblocktrans %} {% if search %}{% blocktrans %} for {{ search }}{% endblocktrans %}{% endif %} {% if category %}{% blocktrans with category_title=category.title %}in {{ category_title }} category{% endblocktrans %}{% endif %}:

@@ -46,7 +45,7 @@

{% trans "Ask a Question" %}

{% url knowledge_ask as form_url %} - {% include "django_knowledge/form.html" with submit_value="Submit this support request" submit_and="and we'll get back to you as soon as possible." submit_url=form_url %} + {% include "django_knowledge/form.html" with submit_value=0|default:_("Submit this support request") submit_and=0|default:_("and we'll get back to you as soon as possible.") submit_url=form_url %}
{% endif %} diff --git a/knowledge/templates/django_knowledge/thread.html b/knowledge/templates/django_knowledge/thread.html index 2f62e1f..fd1d77d 100644 --- a/knowledge/templates/django_knowledge/thread.html +++ b/knowledge/templates/django_knowledge/thread.html @@ -63,7 +63,7 @@
{{ response.get_name }} {% if form %} - {% include "django_knowledge/form.html" with submit_value="Respond to this question" submit_and="and check back often for updates." %} + {% include "django_knowledge/form.html" with submit_value=0|default:_("Respond to this question") submit_and=0|default:_("and check back often for updates.") %} {% else %} {% if question.locked %}

{% trans "This question has been closed." %}

From e71db69b4b58b940311ff7b6fd41613f35ccc3e2 Mon Sep 17 00:00:00 2001 From: Victor Safronovich Date: Mon, 12 Nov 2012 16:09:10 +0600 Subject: [PATCH 5/6] added locale dir to package --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 376826a..f95c731 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,7 @@ install_requires=['Markdown>=2.1.1','Django>=1.4'], packages=['knowledge'], package_data={'knowledge': [ + 'locale/*/LC_MESSAGES/*', 'migrations/*.py', 'static/knowledge/css/*', 'templates/django_knowledge/*.html', From 1aedcd5a0a71413b90d2e5197a36c3aab21d14eb Mon Sep 17 00:00:00 2001 From: Victor Safronovich Date: Tue, 13 Nov 2012 18:19:01 +0500 Subject: [PATCH 6/6] added counter var to translated block --- knowledge/templates/django_knowledge/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knowledge/templates/django_knowledge/list.html b/knowledge/templates/django_knowledge/list.html index d8c5bbd..3e3e04d 100644 --- a/knowledge/templates/django_knowledge/list.html +++ b/knowledge/templates/django_knowledge/list.html @@ -9,7 +9,7 @@ {% block knowledge_widgets %}
-

{% blocktrans %}Showing {{ counter }} results{% endblocktrans %} +

{% blocktrans with counter=questions.paginator.count %}Showing {{ counter }} results{% endblocktrans %} {% if search %}{% blocktrans %} for {{ search }}{% endblocktrans %}{% endif %} {% if category %}{% blocktrans with category_title=category.title %}in {{ category_title }} category{% endblocktrans %}{% endif %}: