From 73bbffccaa66769204de818e349a69fea95d22a8 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Sun, 28 Jul 2019 21:29:54 +0200 Subject: [PATCH 01/11] Fix for login issue on MacOS --- cps/opds.py | 2 +- cps/web.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cps/opds.py b/cps/opds.py index 657b3861..d2072313 100644 --- a/cps/opds.py +++ b/cps/opds.py @@ -288,7 +288,7 @@ def check_auth(username, password): username=username.encode('windows-1252') user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == username.decode('utf-8').lower()).first() - return bool(user and check_password_hash(user.password, password)) + return bool(user and check_password_hash(str(user.password), password)) def authenticate(): diff --git a/cps/web.py b/cps/web.py index b5bff2b3..687c144a 100644 --- a/cps/web.py +++ b/cps/web.py @@ -1115,7 +1115,7 @@ def login(): log.info('LDAP Login failed for user "%s" IP-adress: %s', form['username'], ipAdress) flash(_(u"Wrong Username or Password"), category="error") else: - if user and check_password_hash(user.password, form['password']) and user.nickname != "Guest": + if user and check_password_hash(str(user.password), form['password']) and user.nickname != "Guest": login_user(user, remember=True) flash(_(u"You are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success") return redirect_back(url_for("web.index")) From 5f25b810046200140564c9b38dc0f58fc0679146 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Mon, 29 Jul 2019 21:43:00 +0200 Subject: [PATCH 02/11] Final fix for #983 --- cps/web.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/web.py b/cps/web.py index 687c144a..15f0f976 100644 --- a/cps/web.py +++ b/cps/web.py @@ -133,7 +133,7 @@ def load_user_from_header(header_val): except TypeError: pass user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == basic_username.lower()).first() - if user and check_password_hash(user.password, basic_password): + if user and check_password_hash(str(user.password), basic_password): return user return From 7c503b4a318a5a39317e37f6c06cfb362f7af95f Mon Sep 17 00:00:00 2001 From: Daniel Pavel Date: Wed, 31 Jul 2019 09:40:36 +0300 Subject: [PATCH 03/11] provide a default logging configuration (fixes #987) --- cps/logger.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/cps/logger.py b/cps/logger.py index 892dd252..54be25e7 100644 --- a/cps/logger.py +++ b/cps/logger.py @@ -95,13 +95,6 @@ def setup(log_file, log_level=None): Configure the logging output. May be called multiple times. ''' - # if debugging, start logging to stderr immediately - if os.environ.get('FLASK_DEBUG', None): - log_file = LOG_TO_STDERR - log_level = logging.DEBUG - - log_file = _absolute_log_file(log_file, DEFAULT_LOG_FILE) - log_level = log_level or DEFAULT_LOG_LEVEL logging.getLogger(__package__).setLevel(log_level) @@ -110,6 +103,8 @@ def setup(log_file, log_level=None): # avoid spamming the log with debug messages from libraries r.setLevel(log_level) + log_file = _absolute_log_file(log_file, DEFAULT_LOG_FILE) + previous_handler = r.handlers[0] if r.handlers else None if previous_handler: # if the log_file has not changed, don't create a new handler @@ -167,3 +162,7 @@ class StderrLogger(object): self.buffer += message except Exception: self.log.debug("Logging Error") + + +# default configuration, before application settngs are applied +setup(LOG_TO_STDERR, logging.DEBUG if os.environ.get('FLASK_DEBUG') else DEFAULT_LOG_LEVEL) From 97f3aa8325c02080bffb59d1862e22f64210050b Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Wed, 31 Jul 2019 17:38:28 +0200 Subject: [PATCH 04/11] Update dutch language --- cps/translations/nl/LC_MESSAGES/messages.mo | Bin 45755 -> 48376 bytes cps/translations/nl/LC_MESSAGES/messages.po | 202 ++++++++++---------- 2 files changed, 101 insertions(+), 101 deletions(-) diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo index 82d8448bd707f3ace9b4dc3e2bda6fdac191aab4..b5e63b4f9375541b5dd86e0ba546480582e3710b 100644 GIT binary patch delta 17457 zcmaLd34D}An#b`s34stG1OkLpUhYG}Eg)!sa0HMW1Oyd2$(ztQxwP-k<{B7mEA)_gl=u?Cj2GcfM8i)?4+|Q}tG(!;_!I z|MF{m!;!S%PIX#4`QYCI30v!?IGTzlxpk18j$>S9|@h#pcu}Voi+T^|%_x z;VIO6y?a_#Wt@hIcnemdyEUIe5)DhtgVo*xYaJ4kbsr|(Tx#s(+Ph8B2RxlY$0nhFam3n1=mO9mkvJH=BCCu>`B|ybP7v zd8kY-LFEXQicS?}&P@J1U^wsPP7%=8KG_(1bz|704=706Wo#&!J9pi!5)T zE~w1(LJcqw_1uR#v_aH_3s3#@Oku_M8QCoIDDig0^HGTibDRiabV^jd?{km}66 zDi8D~u8S3@x4=Yfi~4*zq9*8L>VwVm8!&74 z2L2E$;wjWh&!JB3c~k&3vb|I{L1nB9s$YLp#ztZ#yvgXG7Epr9SQs_W+-&l%!?uWq zR=5${;}O(n^rLCF2YCSuLIrj+Y5)gy2m`1UEkRAR!?*_6^D2crJz>S8nq?;P!s24GR{EtUx1omsqq0+zh_YycoTJ~Paq$Xm2w?p z;V9(pveuybMUGRbOyM2WN$e!E-nOD-P#N!J()# z6~d~x6cy-Q*cNx77J57;`~N-#P4qcxkIrH;evit;1ysu7M|eNeeNlmwp#r}JwPp99 zwqQSM!Xu{sHfqAtSOvdBW&8prGQX8HlEExEsWhp!Cu)nzBNP z>7piDhc$5%YP@}@g*<`UqGwR=y^i#cSSKiG;FDg1bs81WH`og=paSW6y*J=M<8ai( z<4_Y!LS@c}3S<^)+!VO-> z>ZpOzu@*MMde|BDt2PuhU?J+g5GvrmpaQ+kcn4~nwdVQy2nD_PfO)VRb%-9tSjtfY z95v71H1!jxKu;Ranf42)6(&yf-b+OVl8y?j32NL7(;n$;8m>X5urDg0A*hs%Mg@?M z`jINZ4p@r17w*HhxEGbdcTrn*3T?cA`U6PgNqiBQgZi58K{64s4p2};hftCK4HfZG z)aic9cnTHZZ>WG0_%pQX$*7d38S9}k(-`%Bd(=YupxzscTF4~qukZh63L0RGaffja zYJ&Z!j67vLf(rOG^ZZRz;P08|Uzqwi^ZYlod7f~Smzn0M0DEF*egA_gXo5M|82^eI za4RaMd$1!O!mfA*8(`C$y?>&~#Mab{uo2#g%HTfKiVtB=d=9k*7f=i6HktfuqFxlV z(t)V2VFYS#Z!(sc=X0?h?Tb(=xDS=uJ*W%mIaJDzqXPIG)$bcrzdup)rA_h1zhVmc z*XPup2A%qTsEEg*GIA5@1qYRhQdIj~RKJC&_m>;*M~!m;70^pq7vDj>_dRNy^Qa6Y z`6Au~)qLLPQ5UuH=BNR>qE;{fHPKj1M?dN}Vm>N!+fY~PZmf^bV@o`Vt*}y#_ixEM zpgzN~s6eJfC=8-dVmyG^)c-^UlAY_Nd^{?J(~JvI1Kf?u!~>|U+l30~Nz_*S9kuee zQ2jnIeufGp@-+nw^b6`MNX+wIsA5b*9kvFj3A&@UWPquUMD6v>I0UC+0!Hy_d<=E? zzC{Jn&hY~5iUbg`uBD(95B3_Y38tQhia3mVaW*F60@Mm`GwrKT0o;v=xCIsH4s42# znf7-~`$<%0&&Fi`FHlebDf!+2jZhOeLk-l{)O(;#e{WR(8&H8w#Y8N{iZ~q=&|K7+ zSd2>bM%0!(ggQ%y)Xx0YF$&G`ebmb03%t`=1$Ed`jjb_*dLPt40o26vPy;S9?f0Tq zxC=GjVbqm;#P}ZStN0EhnxM*5Z;zXyR@NKUJ{)!E@=-6$MosLZjoVNwJc0_~ee?V~ z)PxoM-pcD^67`l?5j$Wd?B-|x)sSf#2B5y*VW`wkK|K#(Wh_U%7%}aOO??F_@U_Nm zm`(jr9Du*0GLlv3IT|%?P9gd4Lcvdi2Ht@B8n&4Z`%nQLL``rMmGXB{{XfFWcp8)O zd(^-eQ1?e-kvCx-RC`Noff=SgCPG1}nTQ%F7b{>1Y70WB374WKT!|WJ9cn8!nf6Ce z?;S+F_Y`W}w@~kYXzHJt`dL)}$PcFBSJVprH1*_SZ=zIVI#%KN71#mWq6VIb8fXe? z#SXT_>6nQdQ2pLRW%6U}h(98kk60~Byi+|9+w$Nx?2J*=ia$pUa2BV?YeFw;KXv`@zB%x_JjP>l}rQK$9})C=2CsorBefExI)@p;sW zU&V&_foVUFdM_d91)PiuEDhB^9re7mp6mPXU>bU$Chm=zXfSF8qp&LGqEc6Cp5Kot z)OQ#kM-BV}s{d=K&-Pu@{sXH2d1G=Z`B$pzQD}xkQ3I5s{va^}Tj3g1h7O~);1yJ$ z$59h~fI0(Tp;r10D)1jr?^T@U9m-m$_u8Sx?>3G6>&Im*4VtJFHPAZLDc)e*Z+sPX zMm|Fglp6B>NvA$4uyLrfG8q+!W9oiXMuVt+Gf;l34 z-%ta*V0;~QGyc;&|H}BS@n_Wgf0%m3u=nSJs;Kc=88adj6loV!>bskICMuvT)WpNh z^Kp0$^_x(cxCdL~^Qf&ji!Jdy*2Jb|-uqXfGJ7p*o-AWzuz4`jcs=UHiC7CuP={s# zDl@B4E8B!x$#&De8{?@TLhbF-sEOW3_5ak=&tNL`ACRq&Sc&CcgiTPHXoIyd17ne* zRyY{9#&IK}0!*Lb?R{J9Nmy>3_!N1*~PLS-t1>Nn5SSD^yhgzC2stLyteNI?_6 zgqq+D)Ly=a>UbJ;TE9W{JC90zh1uT4lZ;w#?ekG^?BB(%bL#28(YReu)W$Go=d&f}YzHQpSLIv_Y>ir6H z$bUM8lsVoDEm0jZPy=OR100A7AP1G&GSmPIP!laTx~Ri?k9ocW^#_zFD)5(45KJoAZj9?d0vXzl3Az)MT~c$0^Wlf=P;_@ z5#v#HjO{rpqW4gH|0!z1Z%zFtRKJA3c>lX#HSA8kA6|>MpuU2GI0(<;aO}(It+sPT?q z8vYk*!qccN_}2Iv*4Ou+aI4qx3e@M)8FlqeMjf6a)Qby@%TN>Fi5hq#YQhIl@9j73 ze?y&xmrVU5)LA%<+4wW+e}A@m|J57lFQ}C)LhX@@I-IYg_V`28*U@O9w*~D{^=wq? zC!i)ML_6St!#TyNSRL><0IQ13l%>Q5~u|9bE|4NdVVY75Sxe%%`0=B*?fmD-W0 z72k-u7fMh!+7fJtn^1@K5Gs@ZL}lbttc2g8=KBp5NZbQvaUuXVkbgZ}-kj3)JCjivw^94%YYo0EJ;R ze1l3=<_dFxpjI>-6L36gqDiQg=b$d4FzWO#M;*qEsJ-5Y+QKKWBYuZ%vDqEoU*#B% zjr9G`jup5-upJ!^pjPq;>a<@#1(vYV3#>9~qBPV*tx#8Q2h@9c*c&6*0iQ-4)^nJO zRaSXh&=7kuztx#SWelKJJQFqXeAB)NmGYISOl-q3xC1-mAE*F3uJ*R98|ua!i~1@8 zrhOTz-wxD#doWU+!a)k!^OsDA;}}o<9aO~co9AayEB+M~V4Uln_KK*1+hH~AjGCa2 zX&-_*D~yl%oC`u?f9MKzXpY`Xwb_3K)sN-#v35TSQj-wQ)6pXfbGrm zt5JuupK%D*qCN_%Vm|8qFe4UHYJ2lXt} zfVZFmUyQYJHEQDRsEKzO_oK!;jOu>`m4Rbw*Z2Q61x54`D#9;Jhi_36{em`DxZ69d zEl{VuJ8GaY#)+tLe5gPQP+L%J+HXOPKOgnpGK{F>Y6|)a?m|Vl1Jm(Q)PP4(D|iF7 zvUg4W6YN6$YgB*x9?u@Aej`yCoPgJ05$Y^$M=jvRd&s{c`qVr)i>jyG>+NM-)Wj`N z?d?sy2P*Kss68Ku3VaM|;+s+Z^HB>ZMFlt=wel6H{%h_f|4Q+FG-#rSQ7`T{^`}t- zzKELWAE*J|NA>&EJU?sNe=_wyP~#=8_e?)=dOpm(79-HRG%i*X0)=Xwt+#jm2S_A{vW{y+s>d4sorG-ISb1r5{$6>%$LN8{C~ zfU;047=_BjIMjf-sEm}L`jw$R-&;-lDpUaLP~&ek&vzjUi&#&Z2XCMveit>-SEvEM zK?V3H>cUCf=nYg4b>lU~ZrBp_8Qz2$7)I^+{a7Cl;uUxtd*k=mSKoh^P2Lq-j+*Fh zQ~;Y$TeH=)??DB$-}rabirz$J;5}4EK0%Fh#`rzzEBF<)l~wQa7SaqWMri0xK@(=; zRoD+Tz${|~HNisE1j|upV6CZdM7_Tq70@o!79BwKdk(dbSB!6Ad+Hxy?C<}j-tS$h z9Z-K_>4O@m6m6V^8sHw()w>Oq(gSGYG1S(4hh4GaW^bHcSdV%U>I^JIEo>F`#k)3> z|9%usmaA47Sx{XL`@^H|_f{nfeo^ z{ygf?zKR+6G3ve4on%Pge>w$qXoE^kCh8`;4%N|ToQj$#hzevD+PDDKe~W29h|1iv zs0_Vm+TX$^)IT)saSxM!?OAmSO1+I$unV@q-dGj=s6eJ;bDWDUa5MJ67g1Xhx67Nj z9_n*!jLKX$)Ygo|WSoLJ8%4X=|3(z%nhy7(GO-giz%#~wn&)Rx0bfA%tG?TtpgDG> zo{2g;Vboo}7zfz6%qxSkCtd7r^ z_J0`PMg?>d_1>4LaehW+<^t+7uK9>JUZevB9g6O#jyIqNn1Y(95Ea-wQ~(Q6hwFA! zf7i6%gQ?Uvn|jnde-f4QXHnyxFn)q$GGd*fpaFkEP4v5|$L;g>s1j=8ny3lu8=IgG zYin$ST~XuQj2b5o6_6j5>e)CP??&}Ih4q-T7rctKr+I)P0Ux z=^v;JRNn8IiW)c_wW7wDf-O*c+!Zy^DAaqCP^Ufz6<7&I6wx#avAs1NZpWImuQTR0id$H>11`jLia znDDrFVYI@w)U#19gs>^jG0!&{pT_>Qe~4N@^Ml^My6uYEic-`9BB+$#hT5v-s4ZEo z2b$n+)JnFXR0)=gX&m>iZqORVFt$IUr=XdJ}Qtk=J`hKL46xui65Z$IQdC0@D6x2^(<6I=AhdKhr!P zhdPv#v7-L5w1|Qt3!(OSK5C$?r~!6ieS8EJ=uy-P-#irU+3lD3s&-B=SY%K4J2RY6 zwB6N1;*xvXEm{YBB~F`gG}!Zn_-My#=Onnzy0@zyF7xFSJN9%Z6!r%L?W5cJIB{9! z#d&rhSY{Uo3;coh_R#))N7`X0L?=5hI3v)`E-iL^VaLu52FiT7W%jIKdC2zVmG}ex za9PM#77V$SvPx5iM1HKww!%(4C9aJdtWX5C&flJAt| zPPNOK!S)C8gLZx>SYl`U%LbL_w6_NO7$MItqxnB}3kC~{olCnBG{e|4{AE-B!yuPE z_1<--4!***2X}E74G!06(OMC=3ESnR#X(=5ljnXvIMgXW7%K6VDT!XGP1qVpH`}XS zUa^ZwLUi&Fe?m$qSYB%9%u??BPB?mG*t&!f%H_*V;j+;b!jL#-Jj=#IDso}d^oXF zKVPvwC*)*|cXD*jtT9uAGwjj6KpuOa#qkY$Exz1bQlcL2z?|Z$+MJ77cQ@y(OZ6ru z!^KW+87J87lG{63LzM?YjxR4-n!B}Pg<^l8C|aZNy0}KM)M}wlpv<4k%fWzkJtujD z+T8I)&C*#=AkP=dvoG%zEidXASC=o!9-xmaY>iWSXs|#Lg`-=FYs9%p!IsfSO2)=j zoE|JLFLB%o!Bt6JI@z7N_w3Tm-4N`ZKFk-&b&Bm_K3~|rrX*HrU*hvce+=fvyLq8; z$%8rmI%$5#eJV7qOO`X$;V+DgnZ@QhB{~10MnW%t91Vo4##PM(9iH;}nJ6!r4dT z>}dB}9*(P;qZ>sdPxl4fNA}irljg3=?jI^IvV)w-0MU>>^5@t^0kxFa6pMYnG8Ukt zlH+HeyvxS1bqNG$ERN0JKDue{p}6epd;vS)cglFgo)o3aj`9hp! z?+PMKn#xNNVYm|`!H)fcy0QFWyTBo2-9|Z1Y$8xQap&+-UQ(~7m#d)MObKZa?E<)W9;poD7UE|`j9QVojZEKA8vzj8O zJmfDR8g?Q2_57#esyP{ae8oO}-j?G&cI*D6i3BSEY#Csgh)(haWLGsj*_X ze_Lk#EHCxCLcI&NzuTbDP4|xa`=R3aK-XCH(_Nhx5CP_ zxNNuX%0t60xumCZNe6ts5<8gB9i8Fr;pI2<|8Yg0}ka?F+O?p`%LKJ2(HS5JyAUp*=zL*K%`KAubO01mkKk#N3e_zS5r@Ox_t z6WZHD+`((Vt{J<|?7@6pPBE7srzG0-uEe-1LxZ~W_yYNS`>tD>+BZKOi^{v@XFKl8 z>zX7N^7Z-ydBsjf^w)I_5_)Gj!62KdasKVR*1UF8wud zYiwASIE*tJjBeQQMTMr99ej&lLBEsX&oj4@x0fepHL7O53~O}kih64Ej$}U80)FFs zMP=@^EfZ?}+wTka$!x#7Yiq-L*4Us^K;JO;i@s3rG;s~NUv25)PT5+alhPCWcv((A z{;X0EBnUq0+1y#dKx~b%Yvg~9Ue?wvoi9s+>B#bR1$P)hXt9zR)_d#**4KB_w^nOz z7GqyJ$G^W4ZMdy}LY1+6MH$|05}mfaT3p;f_t=h>?w%d#aRZ~rcASe#(xp}E3y0mK zJC9Z_E4p~>);#=MTswE=u1=}fdw;MA5Q9ERpZmtH=I$@M8n?@4W!c_c;@!EvOMWMv ze?9VkDx2?a(fDHLSTeYc^X$vsa0l%UxCeLJm+s8xyXU$7J^8h~UG{#UEPh3`5z*)N jw24c-crjW-^oa+`+ztD#i2k&9LtKjYt7>sPFSh?T{@=pA delta 15082 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 diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po index c224845b..0bb975ed 100644 --- a/cps/translations/nl/LC_MESSAGES/messages.po +++ b/cps/translations/nl/LC_MESSAGES/messages.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web (GPLV3)\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2019-07-26 16:41+0200\n" +"POT-Creation-Date: 2019-07-31 17:36+0200\n" "PO-Revision-Date: 2019-06-17 22:37+0200\n" -"Last-Translator: Heimen Stoffels \n" +"Last-Translator: Marcel Maas \n" "Language: nl\n" "Language-Team: ed.driesen@telenet.be\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -37,11 +37,11 @@ msgstr "Onbekend" #: cps/admin.py:130 msgid "Admin page" -msgstr "Administratiepagina" +msgstr "Systeembeheer" #: cps/admin.py:149 cps/templates/admin.html:102 msgid "UI Configuration" -msgstr "Uiterlijke instellingen" +msgstr "Uiterlijk aanpassen" #: cps/admin.py:181 cps/admin.py:399 msgid "Calibre-Web configuration updated" @@ -71,7 +71,7 @@ msgstr "Er is een bestaand account met dit e-mailadres of deze gebruikersnaam aa #: cps/admin.py:474 #, python-format msgid "User '%(user)s' created" -msgstr "Gebruiker '%(user)s' is gecreëerd" +msgstr "Gebruiker '%(user)s' aangemaakt" #: cps/admin.py:494 msgid "Edit e-mail server settings" @@ -80,16 +80,16 @@ msgstr "E-mailserverinstellingen bewerken" #: cps/admin.py:520 #, python-format msgid "Test e-mail successfully send to %(kindlemail)s" -msgstr "De test-e-mail is verstuurd naar %(kindlemail)s" +msgstr "Test-e-mail verstuurd naar %(kindlemail)s" #: cps/admin.py:523 #, python-format msgid "There was an error sending the Test e-mail: %(res)s" -msgstr "Er is een fout opgetreden bij het versturen van de test-e-mail: %(res)s" +msgstr "Fout opgetreden bij het versturen van de test-e-mail: %(res)s" #: cps/admin.py:525 cps/web.py:1033 msgid "Please configure your kindle e-mail address first..." -msgstr "Stel eerst je kindle-mailadres in..." +msgstr "Stel je kindle-e-mailadres in..." #: cps/admin.py:527 msgid "E-mail server settings updated" @@ -102,11 +102,11 @@ msgstr "Gebruiker '%(nick)s' is verwijderd" #: cps/admin.py:559 msgid "No admin user remaining, can't delete user" -msgstr "" +msgstr "Kan laatste systeembeheerder niet verwijderen" #: cps/admin.py:598 cps/web.py:1279 msgid "Found an existing account for this e-mail address." -msgstr "Er is een bestaand account met dit e-mailadres aangetroffen." +msgstr "Bestaand account met dit e-mailadres aangetroffen." #: cps/admin.py:601 cps/admin.py:613 #, python-format @@ -116,7 +116,7 @@ msgstr "Gebruiker '%(nick)s' bewerken" #: cps/admin.py:607 #, python-format msgid "User '%(nick)s' updated" -msgstr "Gebruiker '%(nick)s' is bijgewerkt" +msgstr "Gebruiker '%(nick)s' bijgewerkt" #: cps/admin.py:610 msgid "An unknown error occured." @@ -129,7 +129,7 @@ msgstr "Wachtwoord voor gebruiker %(user)s is hersteld" #: cps/admin.py:632 cps/web.py:1075 msgid "An unknown error occurred. Please try again later." -msgstr "Er is een onbekende fout opgetreden. Probeer het later nog eens." +msgstr "Onbekende fout opgetreden. Probeer het later nog eens." #: cps/admin.py:643 msgid "Logfile viewer" @@ -225,7 +225,7 @@ msgstr "onbekend" #: cps/editbooks.py:447 msgid "Cover is not a jpg file, can't save" -msgstr "" +msgstr "Cover is geen jpg bestand, opslaan niet mogelijk" #: cps/editbooks.py:490 #, python-format @@ -253,7 +253,7 @@ msgstr "Kan %(file)s niet verwijderen (niet gemachtigd)." #: cps/editbooks.py:668 #, python-format msgid "File %(file)s uploaded" -msgstr "" +msgstr "Bestand %(file)s geüpload" #: cps/editbooks.py:697 msgid "Source or destination format for conversion missing" @@ -402,23 +402,23 @@ msgstr "Onbekende taak: " #: cps/oauth_bb.py:75 #, python-format msgid "Register with %(provider)s" -msgstr "" +msgstr "Aanmelden bij %(provider)s" #: cps/oauth_bb.py:155 msgid "Failed to log in with GitHub." -msgstr "" +msgstr "Aanmelden bij GitHub mislukt." #: cps/oauth_bb.py:160 msgid "Failed to fetch user info from GitHub." -msgstr "" +msgstr "Opvragen gebruikersinfo bij GitHub mislukt" #: cps/oauth_bb.py:171 msgid "Failed to log in with Google." -msgstr "" +msgstr "Aanmelden bij Google mislukt." #: cps/oauth_bb.py:176 msgid "Failed to fetch user info from Google." -msgstr "" +msgstr "Opvragen gebruikersinfo bij Google mislukt." #: cps/oauth_bb.py:274 #, python-format @@ -454,7 +454,7 @@ msgstr "Sorry, je mag geen boeken toevoegen aan de boekenplank '%(shelfname)s'" #: cps/shelf.py:61 msgid "You are not allowed to edit public shelves" -msgstr "Je mag openbare boekenplanken niet aanpassen" +msgstr "Je mag openbare boekenplanken niet bewerken" #: cps/shelf.py:70 #, python-format @@ -508,7 +508,7 @@ msgstr "Er bestaat al een boekenplank met de naam '%(title)s'." #: cps/shelf.py:211 #, python-format msgid "Shelf %(title)s created" -msgstr "Boekenplank '%(title)s' is gecreëerd" +msgstr "Boekenplank '%(title)s' is aangemaakt" #: cps/shelf.py:213 cps/shelf.py:241 msgid "There was an error" @@ -539,7 +539,7 @@ msgstr "Kan boekenplank niet openen: de boekenplank bestaat niet of is ontoegank #: cps/shelf.py:330 #, python-format msgid "Change order of Shelf: '%(name)s'" -msgstr "Volgorde aanpassen van boekenplank '%(name)s'" +msgstr "Volgorde bewerken van boekenplank '%(name)s'" #: cps/ub.py:57 msgid "Recently Added" @@ -547,7 +547,7 @@ msgstr "Recent toegevoegd" #: cps/ub.py:59 msgid "Show recent books" -msgstr "Recente boeken tonen" +msgstr "Recent toegevoegde boeken tonen" #: cps/templates/index.xml:17 cps/ub.py:60 msgid "Hot Books" @@ -572,7 +572,7 @@ msgstr "Gelezen boeken" #: cps/ub.py:69 msgid "Show read and unread" -msgstr "Gelezen/Ongelezen tonen" +msgstr "Gelezen/Ongelezen boeken tonen" #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71 #: cps/web.py:975 @@ -581,11 +581,11 @@ msgstr "Ongelezen boeken" #: cps/ub.py:73 msgid "Show unread" -msgstr "" +msgstr "Ongelezen boeken tonen" #: cps/ub.py:74 msgid "Discover" -msgstr "Verkennen" +msgstr "Willekeurige boeken" #: cps/ub.py:76 msgid "Show random books" @@ -602,11 +602,11 @@ msgstr "Categoriekeuze tonen" #: cps/templates/book_edit.html:71 cps/templates/search_form.html:53 #: cps/ub.py:80 msgid "Series" -msgstr "Serie" +msgstr "Boekenreeksen" #: cps/ub.py:82 msgid "Show series selection" -msgstr "Seriekeuze tonen" +msgstr "Boekenreeksen keuze tonen" #: cps/templates/index.xml:61 cps/ub.py:83 msgid "Authors" @@ -634,19 +634,19 @@ msgstr "Taalkeuze tonen" #: cps/ub.py:94 msgid "Ratings" -msgstr "" +msgstr "Beoordelingen" #: cps/ub.py:96 msgid "Show ratings selection" -msgstr "" +msgstr "Beoordelingen tonen" #: cps/ub.py:97 msgid "File formats" -msgstr "" +msgstr "Bestandsformaten" #: cps/ub.py:99 msgid "Show file formats selection" -msgstr "" +msgstr "Bestandsformaten tonen" #: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371 msgid "Unexpected data while reading update information" @@ -654,7 +654,7 @@ msgstr "Onverwachte gegevens tijdens het uitlezen van de update-informatie" #: cps/updater.py:258 cps/updater.py:364 msgid "No update available. You already have the latest version installed" -msgstr "Geen update beschikbaar; je beschikt al over de nieuwste versie" +msgstr "Geen update beschikbaar. Je beschikt al over de nieuwste versie" #: cps/updater.py:284 msgid "A new update is available. Click on the button below to update to the latest version." @@ -671,11 +671,11 @@ msgstr "Geen wijzigingslog beschikbaar" #: cps/updater.py:404 cps/updater.py:413 #, python-format msgid "A new update is available. Click on the button below to update to version: %(version)s" -msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten naar de nieuwste versie: %(version)s" +msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten naar versie: %(version)s" #: cps/updater.py:423 msgid "Click on the button below to update to the latest stable version." -msgstr "" +msgstr "Druk op onderstaande knop om de laatste stabiele versie te installeren." #: cps/uploader.py:213 cps/uploader.py:214 cps/uploader.py:218 #: cps/uploader.py:222 cps/uploader.py:226 @@ -696,11 +696,11 @@ msgstr "Willekeurige boeken" #: cps/web.py:522 msgid "Books" -msgstr "" +msgstr "Boeken" #: cps/web.py:549 msgid "Hot Books (most downloaded)" -msgstr "Populaire boeken (vaakst gedownload)" +msgstr "Populaire boeken (meest gedownload)" #: cps/web.py:560 cps/web.py:1300 cps/web.py:1388 msgid "Error opening eBook. File does not exist or file is not accessible:" @@ -709,7 +709,7 @@ msgstr "Kan e-boek niet openen. Het bestand bestaat niet of is niet toegankelijk #: cps/web.py:573 #, python-format msgid "Author: %(name)s" -msgstr "" +msgstr "Auteur: %(name)s" #: cps/web.py:585 #, python-format @@ -719,17 +719,17 @@ msgstr "Uitgever: %(name)s" #: cps/web.py:596 #, python-format msgid "Series: %(serie)s" -msgstr "Serie: %(serie)s" +msgstr "Reeks: %(serie)s" #: cps/web.py:607 #, python-format msgid "Rating: %(rating)s stars" -msgstr "" +msgstr "Beoordeling: %(rating)s sterren" #: cps/web.py:618 #, python-format msgid "File format: %(format)s" -msgstr "" +msgstr "Bestandsformaat: %(format)s" #: cps/web.py:630 #, python-format @@ -747,15 +747,15 @@ msgstr "Uitgeverslijst" #: cps/templates/index.xml:82 cps/web.py:695 msgid "Series list" -msgstr "Serielijst" +msgstr "Boekenreeksen" #: cps/web.py:709 msgid "Ratings list" -msgstr "" +msgstr "Beoordelingen" #: cps/web.py:722 msgid "File formats list" -msgstr "" +msgstr "Alle bestandsformaten" #: cps/web.py:750 msgid "Available languages" @@ -803,7 +803,7 @@ msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(kindle #: cps/web.py:1031 #, python-format msgid "There was an error sending this book: %(res)s" -msgstr "Er is een fout opgetreden bij het versturen van dit boek: %(res)s" +msgstr "Fout opgetreden bij het versturen van dit boek: %(res)s" #: cps/web.py:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085 #: cps/web.py:1089 @@ -829,11 +829,11 @@ msgstr "" #: cps/web.py:1108 cps/web.py:1214 #, python-format msgid "you are now logged in as: '%(nickname)s'" -msgstr "je bent nu ingelogd als: '%(nickname)s'" +msgstr "je bent ingelogd als: '%(nickname)s'" #: cps/web.py:1112 msgid "Could not login. LDAP server down, please contact your administrator" -msgstr "" +msgstr "Kan niet inloggen, LDAP server niet bereikbaar, contacteer de beheerder" #: cps/web.py:1116 cps/web.py:1124 msgid "Wrong Username or Password" @@ -842,7 +842,7 @@ msgstr "Verkeerde gebruikersnaam of wachtwoord" #: cps/web.py:1120 #, python-format msgid "You are now logged in as: '%(nickname)s'" -msgstr "" +msgstr "Je bent ingelogd als: '%(nickname)s'" #: cps/web.py:1128 cps/web.py:1150 msgid "login" @@ -886,7 +886,7 @@ msgstr "E-boek-conversie mislukt: %(error)s" #: cps/worker.py:339 #, python-format msgid "Kindlegen failed with Error %(error)s. Message: %(message)s" -msgstr "Kindlegen mislukt; fout: %(error)s. Bericht: %(message)s" +msgstr "KindleGen mislukt; fout: %(error)s. Bericht: %(message)s" #: cps/templates/admin.html:6 msgid "User list" @@ -898,19 +898,19 @@ msgstr "Gebruikersnaam" #: cps/templates/admin.html:10 msgid "E-mail" -msgstr "E-mailadres" +msgstr "e-mailadres" #: cps/templates/admin.html:11 msgid "Kindle" -msgstr "Kindlle" +msgstr "Kindle-e-mailadres" #: cps/templates/admin.html:12 msgid "DLS" -msgstr "DLS" +msgstr "Downloads" #: cps/templates/admin.html:13 cps/templates/layout.html:76 msgid "Admin" -msgstr "Administratie" +msgstr "Beheer" #: cps/templates/admin.html:14 cps/templates/detail.html:18 #: cps/templates/detail.html:27 cps/templates/shelf.html:6 @@ -920,7 +920,7 @@ msgstr "Downloaden" #: cps/templates/admin.html:15 msgid "View Ebooks" -msgstr "" +msgstr "Boeken lezen" #: cps/templates/admin.html:16 cps/templates/layout.html:65 msgid "Upload" @@ -980,7 +980,7 @@ msgstr "Aantal boeken per pagina" #: cps/templates/admin.html:85 msgid "Uploading" -msgstr "Bezig met uploaden" +msgstr "Uploaden toestaan" #: cps/templates/admin.html:89 msgid "Anonymous browsing" @@ -996,11 +996,11 @@ msgstr "Inloggen op afstand" #: cps/templates/admin.html:108 msgid "Administration" -msgstr "Administratie" +msgstr "Systeembeheer" #: cps/templates/admin.html:109 msgid "View Logfiles" -msgstr "" +msgstr "Logboeken bekijken" #: cps/templates/admin.html:110 msgid "Reconnect to Calibre DB" @@ -1055,7 +1055,7 @@ msgstr "Oké" #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12 #: cps/templates/user_edit.html:132 msgid "Back" -msgstr "Terug" +msgstr "Annuleren" #: cps/templates/admin.html:166 msgid "Do you really want to stop Calibre-Web?" @@ -1203,7 +1203,7 @@ msgstr "Weet je het zeker?" #: cps/templates/book_edit.html:190 msgid "Book will be deleted from Calibre database" -msgstr "Het boek wordt verwijderd uit de Calibre-databank" +msgstr "Het boek wordt verwijderd uit de Calibre-database" #: cps/templates/book_edit.html:191 msgid "and from hard disk" @@ -1252,7 +1252,7 @@ msgstr "Bibliotheekinstellingen" #: cps/templates/config_edit.html:19 msgid "Location of Calibre database" -msgstr "Locatie van de Calibre-databank" +msgstr "Locatie van de Calibre-database" #: cps/templates/config_edit.html:25 msgid "Use Google Drive?" @@ -1324,7 +1324,7 @@ msgstr "Bèta (automatisch)" #: cps/templates/config_edit.html:115 msgid "Logfile Configuration" -msgstr "Logbestand-instellingen" +msgstr "Logbestanden" #: cps/templates/config_edit.html:122 msgid "Log Level" @@ -1344,7 +1344,7 @@ msgstr "" #: cps/templates/config_edit.html:150 msgid "Feature Configuration" -msgstr "Mogelijkheden" +msgstr "Geavanceerde opties" #: cps/templates/config_edit.html:158 msgid "Enable uploading" @@ -1364,7 +1364,7 @@ msgstr "Inloggen op afstand inschakelen ('magic link')" #: cps/templates/config_edit.html:175 msgid "Use" -msgstr "Gebruiken" +msgstr "Gebruik" #: cps/templates/config_edit.html:176 msgid "Obtain an API Key" @@ -1384,27 +1384,27 @@ msgstr "" #: cps/templates/config_edit.html:193 msgid "Use standard Authentication" -msgstr "" +msgstr "Gebruik standaard authenticatie" #: cps/templates/config_edit.html:195 msgid "Use LDAP Authentication" -msgstr "" +msgstr "Gebruik LDAP authenticatie" #: cps/templates/config_edit.html:198 msgid "Use OAuth" -msgstr "" +msgstr "Gebruik OAuth" #: cps/templates/config_edit.html:205 msgid "LDAP Server Host Name or IP Address" -msgstr "" +msgstr "LDAP Server hostnaam of IP-adres" #: cps/templates/config_edit.html:209 msgid "LDAP Server Port" -msgstr "" +msgstr "LDAP Server Poort" #: cps/templates/config_edit.html:213 msgid "LDAP schema (ldap or ldaps)" -msgstr "" +msgstr "LDAP schema (ldap of ldaps)" #: cps/templates/config_edit.html:217 msgid "LDAP Admin username" @@ -1459,7 +1459,7 @@ msgstr "" #: cps/templates/config_edit.html:282 msgid "External binaries" -msgstr "Externe bibliotheken" +msgstr "Externe programma's" #: cps/templates/config_edit.html:290 msgid "No converter" @@ -1467,7 +1467,7 @@ msgstr "Geen conversieprogramma" #: cps/templates/config_edit.html:292 msgid "Use Kindlegen" -msgstr "Kindlegen gebruiken" +msgstr "KindleGen" #: cps/templates/config_edit.html:294 msgid "Use calibre's ebook converter" @@ -1479,7 +1479,7 @@ msgstr "Conversie-instellingen" #: cps/templates/config_edit.html:302 msgid "Path to convertertool" -msgstr "Pad naar conversieprogramma" +msgstr "Locatie van conversieprogramma" #: cps/templates/config_edit.html:308 msgid "Location of Unrar binary" @@ -1540,7 +1540,7 @@ msgstr "Standaardinstellingen voor nieuwe gebruikers" #: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83 msgid "Admin user" -msgstr "Admin-gebruiker" +msgstr "Systeembeheerder" #: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92 msgid "Allow Downloads" @@ -1548,7 +1548,7 @@ msgstr "Downloads toestaan" #: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96 msgid "Allow book viewer" -msgstr "" +msgstr "Boeken lezen toestaan" #: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100 msgid "Allow Uploads" @@ -1588,7 +1588,7 @@ msgstr "Lezen in webbrowser" #: cps/templates/detail.html:72 msgid "Listen in browser" -msgstr "" +msgstr "Luisteren in webbrowser" #: cps/templates/detail.html:117 msgid "Book" @@ -1612,11 +1612,11 @@ msgstr "Markeren als gelezen" #: cps/templates/detail.html:201 msgid "Read" -msgstr "Lezen" +msgstr "Gelezen" #: cps/templates/detail.html:211 cps/templates/listenmp3.html:54 msgid "Description:" -msgstr "Omschrijving:" +msgstr "Beschrijving:" #: cps/templates/detail.html:224 cps/templates/search.html:14 msgid "Add to shelf" @@ -1632,7 +1632,7 @@ msgstr "SMTP-poort (meestal 25 voor normale SMTP, 465 voor SSL en 587 voor START #: cps/templates/email_edit.html:19 msgid "Encryption" -msgstr "Versleuteling" +msgstr "Beveiliging" #: cps/templates/email_edit.html:21 msgid "None" @@ -1693,7 +1693,7 @@ msgstr "Zoeken" #: cps/templates/http_error.html:37 msgid "Create issue" -msgstr "" +msgstr "Probleem melden" #: cps/templates/http_error.html:44 msgid "Back to home" @@ -1705,7 +1705,7 @@ msgstr "Verkennen (willekeurige boeken)" #: cps/templates/index.html:64 msgid "Group by series" -msgstr "" +msgstr "Sorteren op reeks" #: cps/templates/index.xml:6 msgid "Start" @@ -1745,7 +1745,7 @@ msgstr "Boeken gesorteerd op categorie" #: cps/templates/index.xml:86 msgid "Books ordered by series" -msgstr "Boeken gesorteerd op serie" +msgstr "Boeken gesorteerd op reeks" #: cps/templates/index.xml:89 cps/templates/layout.html:132 msgid "Public Shelves" @@ -1761,7 +1761,7 @@ msgstr "Jouw boekenplanken" #: cps/templates/index.xml:101 msgid "User's own shelfs, only visible to the current user himself" -msgstr "Eigen boekenplanken, enkel zichtbaar voor de huidige gebruiker" +msgstr "Eigen boekenplanken, enkel zichtbaar voor huidige gebruiker" #: cps/templates/layout.html:28 msgid "Home" @@ -1806,11 +1806,11 @@ msgstr "Verkennen" #: cps/templates/layout.html:141 msgid "Create a Shelf" -msgstr "Creëer een boekenplank" +msgstr "Boekenplank aanmaken" #: cps/templates/layout.html:142 cps/templates/stats.html:3 msgid "About" -msgstr "Over" +msgstr "Informatie" #: cps/templates/layout.html:156 msgid "Previous" @@ -1822,7 +1822,7 @@ msgstr "Boekgegevens" #: cps/templates/layout.html:217 msgid "Upload done, processing, please wait..." -msgstr "Uploaden voltooid; bezig met verwerken..." +msgstr "Uploaden voltooid, bezig met verwerken..." #: cps/templates/layout.html:220 msgid "Error" @@ -1830,11 +1830,11 @@ msgstr "Fout" #: cps/templates/listenmp3.html:66 msgid "Play / pause" -msgstr "" +msgstr "Afspelen / pauze" #: cps/templates/listenmp3.html:98 msgid "volume" -msgstr "" +msgstr "volume" #: cps/templates/login.html:8 cps/templates/login.html:9 #: cps/templates/register.html:7 cps/templates/user_edit.html:8 @@ -1848,7 +1848,7 @@ msgstr "Wachtwoord" #: cps/templates/login.html:17 msgid "Remember me" -msgstr "Onthouden" +msgstr "Mij onthouden" #: cps/templates/login.html:22 msgid "Log in with magic link" @@ -1856,11 +1856,11 @@ msgstr "Inloggen met magische koppeling" #: cps/templates/logviewer.html:5 msgid "Show Calibre-Web log" -msgstr "" +msgstr "Calibre-Web log inzien" #: cps/templates/logviewer.html:8 msgid "Show access log" -msgstr "" +msgstr "Toegangslogboek" #: cps/templates/osd.xml:5 msgid "Calibre-Web ebook catalog" @@ -1984,7 +1984,7 @@ msgstr "Kies een gebruikersnaam" #: cps/templates/register.html:11 cps/templates/user_edit.html:13 msgid "E-mail address" -msgstr "E-mailadres" +msgstr "e-mailadres" #: cps/templates/register.html:12 msgid "Your email address" @@ -2028,7 +2028,7 @@ msgstr "Labels uitsluiten" #: cps/templates/search_form.html:63 msgid "Exclude Series" -msgstr "Series uitsluiten" +msgstr "Boekenreeksen uitsluiten" #: cps/templates/search_form.html:84 msgid "Exclude Languages" @@ -2048,7 +2048,7 @@ msgstr "Deze boekenplank verwijderen" #: cps/templates/shelf.html:11 msgid "Edit Shelf" -msgstr "Boekenplank aanpassen" +msgstr "Boekenplank bewerken" #: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11 msgid "Change order" @@ -2072,7 +2072,7 @@ msgstr "Verander de volgorde middels slepen-en-neerzetten" #: cps/templates/stats.html:7 msgid "Calibre library statistics" -msgstr "Calibre-bibliotheekstatistieken" +msgstr "Calibre bibliotheekstatistieken" #: cps/templates/stats.html:12 msgid "Books in this Library" @@ -2088,7 +2088,7 @@ msgstr "Categorieën in deze bibliotheek" #: cps/templates/stats.html:24 msgid "Series in this Library" -msgstr "Series in deze bibliotheek" +msgstr "Boekenreeksen in deze bibliotheek" #: cps/templates/stats.html:28 msgid "Linked libraries" @@ -2100,7 +2100,7 @@ msgstr "Programmabibliotheek" #: cps/templates/stats.html:33 msgid "Installed Version" -msgstr "Geïnstalleerde versie" +msgstr "Versie" #: cps/templates/tasks.html:7 msgid "Tasks list" @@ -2148,23 +2148,23 @@ msgstr "Kindle-e-mailadres" #: cps/templates/user_edit.html:40 msgid "Show books with language" -msgstr "Boeken tonen met taal" +msgstr "Taal van boeken" #: cps/templates/user_edit.html:42 msgid "Show all" -msgstr "Alle tonen" +msgstr "Alle talen" #: cps/templates/user_edit.html:52 msgid "OAuth Settings" -msgstr "" +msgstr "OAuth Instellingen" #: cps/templates/user_edit.html:54 msgid "Link" -msgstr "" +msgstr "Koppelen" #: cps/templates/user_edit.html:56 msgid "Unlink" -msgstr "" +msgstr "Ontkoppelen" #: cps/templates/user_edit.html:124 msgid "Delete this user" From 626198165600a473eb96f01aeb471ce84731915b Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Sat, 3 Aug 2019 12:56:32 +0200 Subject: [PATCH 05/11] Fix for #991 Removed additional psace before Advanced search (Pull request #996) Set startup message for not relevant imports to debug, to reduce confusion --- cps/opds.py | 1 + cps/services/__init__.py | 6 ++++-- cps/templates/layout.html | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cps/opds.py b/cps/opds.py index d2072313..44e1341d 100644 --- a/cps/opds.py +++ b/cps/opds.py @@ -56,6 +56,7 @@ def requires_basic_auth_if_no_ano(f): @opds.route("/opds/") +@opds.route("/opds") @requires_basic_auth_if_no_ano def feed_index(): return render_xml_template('index.xml') diff --git a/cps/services/__init__.py b/cps/services/__init__.py index 90607160..aa674e6d 100644 --- a/cps/services/__init__.py +++ b/cps/services/__init__.py @@ -26,11 +26,13 @@ log = logger.create() try: from . import goodreads except ImportError as err: - log.warning("goodreads: %s", err) + log.debug("goodreads: %s", err) goodreads = None try: from . import simpleldap as ldap except ImportError as err: - log.warning("simpleldap: %s", err) + log.debug("simpleldap: %s", err) ldap = None + + diff --git a/cps/templates/layout.html b/cps/templates/layout.html index f22ca70d..dcbbc08f 100644 --- a/cps/templates/layout.html +++ b/cps/templates/layout.html @@ -52,7 +52,7 @@
{% if g.user.is_authenticated or g.allow_anonymous %} {% endif %}