From 5c3bfc2fbca01a8117b8843422407ed4088e3d1a Mon Sep 17 00:00:00 2001
From: Dmitry Shelepnev <mitshel@mail.ru>
Date: Sat, 7 Jan 2017 19:19:12 +0300
Subject: [PATCH] Fix tests on Ru-RU Language
---
opds_catalog/locale/ru/LC_MESSAGES/django.mo | Bin 4650 -> 4738 bytes
opds_catalog/locale/ru/LC_MESSAGES/django.po | 4 +---
opds_catalog/opdsdb.py | 5 +++--
opds_catalog/tests/test_feeds.py | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opds_catalog/locale/ru/LC_MESSAGES/django.mo b/opds_catalog/locale/ru/LC_MESSAGES/django.mo
index 3c66cbba09c54d57b975274b7c2939131c30090a..73c42f1fa86c2dbd3d47be7d580952432cbf5f34 100644
GIT binary patch
delta 1264
zcmZ3b(xh5{Pl#nI0|NttIRgWO3<Cqh6-EXIPX-2t9%hgz1H%Ru1_p5k28N9+3=EnK
z3=Ah(7#I{77#KdYFfgbwFffR)GBBhuFfdrNGBC(7Ffc5F(g#@~`W~<{Fi0^lF#KR;
zVBlq7U=U_wU=U?sU{GXZU=UznsAn)|V_*<uU|{fIV_;BXU|@)1gJ`H_gBUo2je&um
zfq`K=ls?YJz`)JGz;K<7fkA|Uf#ES!{|`0>1}+8$1}=7pyeK;Z11HELD6I{pP1zwH
zv1eys;9#g{V8~==U|?flU?^gTIHZytVqrHs*o6$U*%=sw85kJWurn~QGB7Y4V2AkR
z7&`-l7%0TpAwGHy)z8QQ(I?CSQK!Pez#z@Qz+l9|z#z%Mz~INhz#zoHz>vYgz`$S6
zz`#(=0r7D+2Lpoy0|Ub{4h9Au1_p-x91x4oaDZIO!0-TS;7h3dcPP!m$-uzQz`!8L
z2?+s7P6mdrj0_AaoD2*a3=9lX+zbp>3=9m;+zbrr3=9l)+zbpBAbYqO80y;@7#Qwz
zGcc$yFfgR^K%$_B2NFc<c^DXU7#J9C@<4pR#tTU!O1umVvJ4Ci_Pmg^5X;NJU<Wdo
zmw`c#fq`K!FGT+vsCqFzNLn!FgM@%LAH<wgK8AX595(Smd^#Pfa5Wz!Dh@;Gt9%R$
z@(c_N&-oY_%orFL*!dw2vg3!Si{ghkB!?dolD+&83s&$$EIi5&3EBHleLwgi4ipin
zXJ9a7U|_HlfG8{wU|`T<U|{GHfW+xm0f_u*0R{$b1_p+|0uT!{1tAV_5oBP{Wnf@P
z5M*FbWnf_F6NH$vMG)fSb5Q!3AjAXzptPJ21A{Wi-g+TOTqg-Z5=Fic0|O%iL^CKT
zL5=}sL{OFi<w#QyhXInXK-m$>1yi701WI6_#03^$fFxK@ngV$eltzpgAh`pSRYAE8
zl>WdjhiTwrU|=w2U|=v{fTRgf7UN)m1TQEAKq(od7UXLt5CfFJpk)Urt$@lA0jM}A
zu|b*OEDVZ55FZqUp!CB6icL_S1qB5t3o0@|@+?RZD9eEg7*H0|XJBA3VSt1bNKRw(
xToxZj@thomr2PEsVuhqi1yzl-(wv<5yu{qp%}-fRu}yB}QQ$-ft>&p`1ptx0YbgK#
delta 1210
zcmZotU8PcgPl#nI0|Ntt83O}@3<Cqh8Ab*MPX-2t8fK6v1H%Fq1_p5k28M+!3=EnK
z3=BJ27#I{77#JS2FfgbwFfg#NGBBhuFfeGdGBC(7FfdGl(i>SJ`Yy0CFz_-kFuY)8
zU=U?sVED$$z#zcDz`(=Cz#z!LP|qOC#=xM&z`&r-#=s!Oz`zj11~Dj?je&umfq|h1
zO3z_qVBlt8U|7S(z#ziFz_0^i0K-`}1_mw$28R1k`B!WV44fc~pfm$JgwMqe@qh?B
z0|N&G1A`qq0|OgFJp+R~JJ=-*e(Vqn6WAdxEMR9~5N2RtXk=$#U}a!nn92_E$!vB8
z1~CQ(hL!9PA02?|zXsL!0;=vOI|G9>0|Ns)2Lpp70|SFH2Lpo;0|SFC2gIHL4h9CP
zdIkoD1P%rU2?hp+Y7Pbl9tH-6DI5@s7ji&cx|IWB@jj^h87O^|g8}3@hG!g*5O~MI
z!0?rkf#D|y1A_(w1H*eR1_mnz1_lXk1_pHo28Lj61_ld|J=_co?F<YITeuk*>QxvR
z7;JbTQIN<338EGrh|AaUK+?o19tH+k1_p-bJdn6&<z-;7V_;xV<7HsbV_;xN<%Q^*
z!V6Kqj~5d6w|OBx{|pu9<%2|>79Yfe_IwQW;KUWo2Z@4gC|%3Pz#z}Sz|hYJNto;T
zAP#y4m1p9II7EaWl4eZ#Ar=SlLoCeYhlFT5KSbXGeuxA2@G~$NGB7YagQ}AdsApi%
zVqjn}5`e^ItN=tou>b>uHUk60QUQns7X=^&y%Atw&}Cp?;1FbBPzB{0L5PJhf)F2<
zLFqn0hzFKI>0^Qn49Xyj1tC$)B?L(e;`Krd42%qr1O+k}l*K?950t_|InV^e0c95k
zNSs2sU<#CtK<P#h%!3f1gbK>82B3t;0PzeccYvY~qJn_|6y-2>Jt%J)fwCVcg)%_m
z1(ZEN!4C=<P?iKK)?r{^U;;51AU+1AY)}Y+$_-F91xbO*0}u_ud<>9m3}Tx?%N7;}
z1_nh2NLpiK07s!3IIn^ffwBfDNI``JC{Y<RK=M0CPJQ!Q79YmVB5cRlHna0qvjPCd
C-CMZ;
diff --git a/opds_catalog/locale/ru/LC_MESSAGES/django.po b/opds_catalog/locale/ru/LC_MESSAGES/django.po
index 58ef9d5..d78a250 100644
--- a/opds_catalog/locale/ru/LC_MESSAGES/django.po
+++ b/opds_catalog/locale/ru/LC_MESSAGES/django.po
@@ -263,10 +263,8 @@ msgid "Unknown genre"
msgstr "Неизвестный жанр"
#: .\opds_catalog\tests\test_feeds.py:76
-#, fuzzy, python-format
-#| msgid "All books by %(author)s"
msgid "All books by %(full_name)s"
-msgstr "Все книги автора %(author)s"
+msgstr "Все книги автора %(full_name)s"
#~ msgid "Book name:"
#~ msgstr "Название:"
diff --git a/opds_catalog/opdsdb.py b/opds_catalog/opdsdb.py
index 37eeaed..58c097d 100644
--- a/opds_catalog/opdsdb.py
+++ b/opds_catalog/opdsdb.py
@@ -4,7 +4,7 @@ import os
import re
from django.db.models import Q
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext as _ , ugettext_noop as _noop
from django.db import transaction, connection
from opds_catalog.models import Book, Catalog, Author, Genre, Series, bseries, bauthor, bgenre, bookshelf, Counter, LangCodes
@@ -33,7 +33,8 @@ CMP_TITLE_AUTHORS=1
##########################################################################
# разные константы
#
-unknown_genre=_('Unknown genre')
+unknown_genre_en =_noop('Unknown genre')
+unknown_genre=_(unknown_genre_en)
##########################################################################
# объект который мы будем использовать для перекодироки 4х байтного UTF в 3х байтный
diff --git a/opds_catalog/tests/test_feeds.py b/opds_catalog/tests/test_feeds.py
index bfc3fb3..5224dba 100644
--- a/opds_catalog/tests/test_feeds.py
+++ b/opds_catalog/tests/test_feeds.py
@@ -136,7 +136,7 @@ class feedsTestCase(TestCase):
self.assertEquals(response.status_code, 200)
response = c.get(reverse('opds:genres'));
self.assertEquals(response.status_code, 200)
- self.assertIn(opdsdb.unknown_genre, response.content.decode())
+ self.assertIn(opdsdb.unknown_genre_en, response.content.decode())
response = c.get(reverse('opds:genres', kwargs={'section':232}));
self.assertEquals(response.status_code, 200)
self.assertIn("prose_contemporary", response.content.decode())
--
GitLab