From 1a604cf94b7d50b966ea64ec51b84a59f04a7669 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Fri, 5 Feb 2016 00:34:13 +0100 Subject: [PATCH 1/4] refactor khan channel images and use setting instead of json data --- .../distributed/custom_context_processors.py | 17 +---------------- .../static}/images/horizontal-logo-small.png | Bin .../static}/images/learning-image.png | Bin .../static}/images/logo_10_enlarged_2.png | Bin .../templates/distributed/base.html | 2 +- .../templates/distributed/homepage.html | 2 +- kalite/settings/base.py | 13 +++++++++++++ 7 files changed, 16 insertions(+), 18 deletions(-) rename {data/khan => kalite/distributed/static}/images/horizontal-logo-small.png (100%) rename {data/khan => kalite/distributed/static}/images/learning-image.png (100%) rename {data/khan => kalite/distributed/static}/images/logo_10_enlarged_2.png (100%) diff --git a/kalite/distributed/custom_context_processors.py b/kalite/distributed/custom_context_processors.py index 035b165dde..0a989e34e8 100644 --- a/kalite/distributed/custom_context_processors.py +++ b/kalite/distributed/custom_context_processors.py @@ -5,32 +5,17 @@ * Metadata about the central server (for syncing, getting content, language packs, etc) * App settings, including version / build ID """ -import json -import os - from django.conf import settings from django.utils.translation import ugettext as _ from kalite import version from kalite.topic_tools import settings as topic_tools_settings -channel_data = {} def custom(request): - global channel_data channel_data_trans = {} - - # MUST: Translation must happen inside this function because it will NOT work if it is outside - # because that part of the code only runs once when this module is loaded/imported. - if not channel_data: - # Parsing a whole JSON file just to load the settings is not nice - try: - channel_data = json.load(open(os.path.join(topic_tools_settings.CHANNEL_DATA_PATH, "channel_data.json"), 'r')) - except IOError: - channel_data = {} - - for key, value in channel_data.items(): + for key, value in settings.KALITE_CHANNEL_CONTEXT_DATA.items(): channel_data_trans[key] = _(value) return { diff --git a/data/khan/images/horizontal-logo-small.png b/kalite/distributed/static/images/horizontal-logo-small.png similarity index 100% rename from data/khan/images/horizontal-logo-small.png rename to kalite/distributed/static/images/horizontal-logo-small.png diff --git a/data/khan/images/learning-image.png b/kalite/distributed/static/images/learning-image.png similarity index 100% rename from data/khan/images/learning-image.png rename to kalite/distributed/static/images/learning-image.png diff --git a/data/khan/images/logo_10_enlarged_2.png b/kalite/distributed/static/images/logo_10_enlarged_2.png similarity index 100% rename from data/khan/images/logo_10_enlarged_2.png rename to kalite/distributed/static/images/logo_10_enlarged_2.png diff --git a/kalite/distributed/templates/distributed/base.html b/kalite/distributed/templates/distributed/base.html index 0c9914dcd2..38543285a1 100644 --- a/kalite/distributed/templates/distributed/base.html +++ b/kalite/distributed/templates/distributed/base.html @@ -97,7 +97,7 @@
- {{ channel_data.channel_name }} {% trans 'logo' %} + {{ channel_data.channel_name }} {% trans 'logo' %}
diff --git a/kalite/distributed/templates/distributed/homepage.html b/kalite/distributed/templates/distributed/homepage.html index 10e93d6657..0a5925364c 100644 --- a/kalite/distributed/templates/distributed/homepage.html +++ b/kalite/distributed/templates/distributed/homepage.html @@ -29,7 +29,7 @@

{% trans "Learn!" %}

- {% trans 'Learn with Khan Academy videos and exercises!' %} + {% trans 'Learn with Khan Academy videos and exercises!' %}
diff --git a/kalite/settings/base.py b/kalite/settings/base.py index 7d4e59a4ea..9ca9a45e75 100644 --- a/kalite/settings/base.py +++ b/kalite/settings/base.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- import time from kalite import version import logging @@ -247,6 +248,18 @@ STATIC_URL = getattr(local_settings, "STATIC_URL", "/static/") +# Context data included by ka lite's context processor +KALITE_CHANNEL_CONTEXT_DATA = { + "channel_name": u"KA Lite", + "head_line": u"A free world-class education for anyone anywhere.", + "tag_line": u"KA Lite is a light-weight web server for viewing and interacting with core Khan Academy content (videos and exercises) without needing an Internet connection.", + "channel_license": u"CC-BY-NC-SA", + "footer_text": u"Videos © 2015 Khan Academy (Creative Commons) // Exercises © 2015 Khan Academy", + "header_logo": os.path.join(STATIC_URL, 'images', 'horizontal-logo-small.png'), + "frontpage_splash": os.path.join(STATIC_URL, 'images', 'logo_10_enlarged_2.png'), +} + + DEFAULT_DATABASE_PATH = getattr(local_settings, "DATABASE_PATH", DEFAULT_DATABASE_PATH) DATABASES = getattr(local_settings, "DATABASES", { From 6f4ea2048f41d417581f802f2b6aed8ec4a89b67 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Fri, 5 Feb 2016 00:34:25 +0100 Subject: [PATCH 2/4] remove unused image --- .../static/images/learning-image.png | Bin 11076 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 kalite/distributed/static/images/learning-image.png diff --git a/kalite/distributed/static/images/learning-image.png b/kalite/distributed/static/images/learning-image.png deleted file mode 100755 index 1039fc61e0aa75c2b5bef50e80ef315219742111..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11076 zcmV-KE4$Q*P)E+&CqNvKUl>{zrnk5VL@8|C4*zM}%1~e@C`TF_!_`Tm*@8QGv`TFne z>8qrgq@9-h`SbYm>iGHlh@sAq!IibGp_<3g`uX?!`uLocjApgv`NwGK?D8>`z{S?} zsKWFUhtbH}tG(Cx`un=h=#GVY0~b1mlAh`F`%`WkNC*T4 z9Tnj0_wMoc^Z5K)R7_P|V*2jZ@2q>Gu*LZL{wX*TdTn9;rwn0cZ2)!AkdTl6{`v0q z{A6ERhlz<383-IF4*KM|i?8xeQ&#={G&oBe=UNAOcz0`F;(b3VZuCBS?_RP%8NJmKc`1z)%sI#=R*4Ebj`}oJl#<{w>4h#&W z)9&2d+`z!VI5;=~0u$lk;UFL&EG#Vk{{HCb=o1qY^YioY@bCo%1m@=E>+9?4>gxLX z`t|ko?(XjS`T6+x_y7O^cI(OT001d}Nklpt-h> zkL`u#Y}F5~SulhauVWh@wzEzlw0FYy#BX}M9*%bYKHyf7phcGv9G@vMge4H9ZZZs6 zAuZb^b;so7qHb_atw!s%z}W&x(t^x2IYE;dvgw#LQ5M7^!w@cMm^EHwNQ09#zEqJ7 zQZK;a7!nLTL2w*Ws8wKlpz{Jlx`eEeHG!}=*%skjhnBX5lFaFPsl;0{5jb#st0|L~ zX_Bu0Cjm!)QB+DoidOMxu~sY^41TT99L{>yN~Fe>Y8A0o66x>__?qCBib4R#G%KZ=CRgZU#pK}_@LdT!-!$k7PiPfd=4o2? zDx6rUh+2uOl!(K?Ka7ao3%GB&p6<%B;|PK-c!sW9fh>5k2U^B;JjV5WPcQ>R7i3U1 znQOAw6b#+-4U2(IjAzQOXX%E{=&<6*f-Ts-A-JG$eXw-FRSDO`Zy@WsFAJ~}yp1a~ zeODG_+ts-uX~QPZhP|6i;KKoRO9&iOaG9p(!?BsZAq7ReQ_vGl1EFIWc|ph1@o^w2 zxK?0;Dy!j(qYtaF#5%C3`Eb$n9e9BsumKgUvkt6-)(_R%^#bcV_#hhAhev^JSQqY& z^@fJuAOJ%jw!=>N;Gva zUdrO*j~{=$Hrt1mng^4|Yt(V&;ngbsANcJRznWxj@N=M!nzmu0_Yd}MAEGlEjE-K# zt&`+{k(HxiH7MdHQfo5DLaRlveLpjXKkrUd`s9b-vHWyi=|zH?{O<0pZ|~l^TCDdn znFW)NvB?@5-@{oS=i1nPLpIo{0@neF4FWy#d*5ea1x)cz=+u6D73|yFTo-SJ?V$;f z@?Efm)`__JMr2Th<3S5LYzbD;o45gP0JKmcG-w!xfpc+*6z~B>{p9ypemK|aKC(nj z-Tmd4Z-2Y>%P-&2s0Z)&VDj~EcfsTa8WXq`h|PlG2A1!73}6|xk~ z;z>6MJe|{Rp7U4(OgvKzJRcHt&+!c3vHcq3@x0|g(k<|&XMo-?9D#8y#|>P@@ZeQ9 znmi!X$O<-)d5z@B!0`a2!1=oG5pDpN500=M7v2JZ*96GPjgm;PhUb$4TkQiJ^@_Un zb3cUc9TG2hwOyYCj<F482Vc)TD&zUT>%#EEnz5K3SoRv?q3MH7|4EHUuFb`(OGyaQ|C&u z0Eyu!z^MrJPZ4&do8c1I9 zVuj&}nnBdWWdf2rvc_2&AcT$)P1k@e?^!e_l!~+~({zdFAa`7YRIn8AWTj$RG%r9Z zZV06k!Q-^LsLM5gsFlLB55A`&Fp#ldIuGo;Dm? z7Me|0BRJADX;DuBA5a!C?jL^o>8BrlfQ9^i7oHEk{p~=$z6$=EWkQVu+>u3wksXqO zRuE-dc8C&T@una*WkT=;)?h>q$jBT6xgjT8CdoLS$e09pKGWoEj&KYS5B**m&w;QAmt!0V zDI!EAqap}IlVfm585KC-#sW_M!y0%vO3}Rg;{nZEx60j)@^NDF_1*7Q$BN;O2B{h3 z0xbRy8J}ZWII+V^8e3&A!S+A^6W9!9poMiOT(=E)jaFF)f-W0xTY2b2dLIrAdM7f+ zVlZqKZwxKjuyvq~vO|XjEhse~Hfl0BJN{Bm1q2?1A^djU(;Nmk0^l)m?BUB;mj?dJ zk1@M5w4nx-Ao>XNd)}kUycE|lV<2U;b;8&r0Rnl!+7}W z4{hMMmAaYieizfkNyxm~&1CHs4Qgc`Obin&-vwBCs{hh2-oXD8m6) zK8bRaA29Iq-81#8nC90%!p|??Eq67M-v9D(Wb!QzI%8clJy9+R4k1`#Q|36DaV(Lr zM42Q=uBHY5KpC>*lLOMRe4_RUJKz2IHH3=0KYo2{vWNGU!Q>XC;y-@P~XT% z3n6c=SdbQqbeNh|bb{v~EuNVhc?tN@h$p|R7 zHXHqci;!arO`7LR(D@JFI`Jd9G>brt7+nAnL3c=&)%0BX1P~;KL4> zN^^5_YGYqfdhUd%>HO-i`_G=CXI+S*cfaoM*QwRj*{7McIn?M6JitS%;ZRgG8s%e6 zHClw6`RD4j}0P&vk8knNbey`Wlz!7YVW&K_DTcKfZllUjbk+Fa$G+Mm_!msP_ zQm>;fxYpNWme_3P-}_R!3N>5rN?ba$BJHbfBdWf>6EamPHO;#P#fzP<9R9(u|B}tVKrQj7xnV|AOw4MvG@4T4JQ|qvWqLj7#JB0$<{akrTp`?AP zb%-~T81V5&>Vq3gEoxTUElU3aKU!C7%!{)$u~=Cy&o7GPE-6hA`3k+pQ_~ZbVliLC zMy+}N#@gzG#TrjfuPs+9M7g%QPd&)zE9c9^xq}4dSMd9Z7PTr(l$UqQ%awAO&jgPC z{{aVR;&SfBQgKZo)~Jc|wHvwR+}Z@Syq24wcPrTF`Qy3I^EWDsyXCnX%d-{k{OozO zpL?+OfO>qcwu;)kVWA~T(i~OUEtZ$_^o{(4ivIQRBhsMib5vdu%L;^tT`4cAc}Y^F z+$=;GYL2^tZR*s1PAxC0ppvMySumo|z5;8Cq~vE0@kVN%f@W@wlGGY8`z|+oOd-W# zuceZdeu}g>8XjcDP0Dg~#pqcIAWeS3lQx%E)4%!a$;zRnqe+RfOQH4gE}BOCu?$z9 z+R(52uH{Dx&-KIB^#)cLOwE=#TQhfct-FQQRv0ly%Z)bZ2a4c`!fPws4B%Pl)3*&h zf1W6%*@SZ!-g8i`QxzaSMrLTnpU21Ic=~`2|IVIb%Z=7 z%A`2PXm==eXHINU{OW3vT5aXj*Ew}`;C{1dW3gn}lljftpPPc!R#;)1C``LkA(++? zg~t<>GEtW1R!c^Ai)QCBY@vNn*^U(l=hL=`H<-FVEbs|>d6}ACqeXg=eq7?oU4D)T zUA;>OXuVQT`F9jNT92=+mFfH%y_knAXE}eqbne_Z9_~hB8}2D{esjh(+lqLLky12c zMbqe11YWH~h$OG^d4~-(W^Ccv@h+x5w4(iP-tZp&SSl9R&XplqDHoS&TzM&9pEw^u zOpUQhoSN?JhmsS;+G?e^OXn9$(v4ECbbgjbV*rn9UmiG+#$4WD&t8witsaM4+wWB9 zDMcLi9g7q#lXNw)toc>E#dbR_{AOF>#Syyc#^JxG!VY4^@W3UACeswWs?yS0E4K&< zNS=zL%@N{=DoaOPKIYv}%DdFsscK z1NiLsXYIU2?Tp#)e(k(ozB}N(gVMv}Xl&q`EDDYjtlZw*+;p#>Sm5Z{vo@=iTJH^f z9gwE7$dvIozUl6He4oriZS>>yTTyC=r{{C10O%&t1 zcmmw^j8II-3!5UN8<36PxgRM)v1B8*u-XbeY!eGJwveM^1$;S(74a^1VllcR1$=B# z)HK4FcYlEpKYGW~_UyY-Pnihn3zIGQOk8uWi&Xdg^S8EZn7swBXN z3Ky?mk9*Pd;tQT35{>}GS3Z=B<}kn;slC)zf_Vs(5O#Ks2RL|?z?sbC<`Y9d{Xqa9 zy!6uOvH=0{82C`Gi@@%9fV)l2;|TK3rhNay@bF&J!2kMmJ5eX`c;w{Q*Qh^e{4dVb zj|;f(_)Lwv15ssY;4Xmv2XyTlFX{dWUz#10;Mc&ioSPqYWX|BKqh*Ps3o31&Ws?Chjmd@SJL zrY=Wf;zI(LOPalG{=L8(5p4L0+IoySe0}ukr;TL#ax4mF{o{{6V&eTd!!Dma+efL) z5TRl6@Q!MN-4w#s`m)ANLOmi?Z|I}2WuavA%LJFtRhm}UUDD-+Y(>=c&co9YI!2CV zf9E-Vg;lIXkAC^(Q4BAk^%QWw-`jqF6^Os?3w%ErjKN`OoB~8(89}(9n^EhSA@P;K zXhw>_jx4$;>{ww5MNeKP{aRj+6ixkzg&A)!tVrRu72biuJ)&r~6&W6$#Axi@9TKjF z8ycTJYI}InYs9?YZ*T9tfB(lHPqX60P6G|m`9Xt*6j(3>j+x(_TDfqR9WV)?r{6CQ}rgxL4e|)>W{bC#B#l8Mf97Qi^sLoF|aK|Lfpuk#s zfs^lZn^2Lse)_}6!^5!A)yd;6-GM_y!MJfy!N4;lHNrSPa9t)j!n9pTRrHl9AU?D5 zVE{jJ*+ikgXYoTAI41sL?|laFA&14$plPA+u)0i$q#RfrdvgO^e0$~k2Lc>*EM}!` zbw!m_NK)SKy$C)0+duwDcV|W(7Dv4c5UF~DqiL2*aD+%`zD!=;yi;BIr;ZjT^8DRl z#tjfyZzRCeuq9Qghgr(r_8vI-Rmf6Ob|Vdo<4F_Q1&C0*gL;GKdIDD?1^I$7e|ht^ z`{j{}gf3g13L{pyeA(|_fY6VY7re{@gx9kGks`VN{P6Yjt6v}mMBO8I3wt)ej{Ovf zUw!}nJ@|Jo2S+_3Q?Jes!gtZ3tO7*3-ryM)FNz`~bCVmJQ(qcqBMUFFNL3T!0)%ZF zUaGv{nS?cD0U}X!?fBGD&$&(i{m)%UQqmjRo{bJPEdUM7@yn1yfCyYXIq(Pth;+R{ z^TejbkQ~oVK`3We*a1U|P7y+&rZd1wS~bwefl(eq%eC}e0<=(!x38Gumz910)73>JKJ|4X~_f*`>}yda-?85 ztdm#-rYLLv@dD4z5xT)XQh@-!SD_i(#m5Kk+MLW*!8;8`WElSPCJ6XBdo3$1tX3V* zwHS_M4A*elX`!ZbM8N*Zz%xBN+1$RZ6AYA;hmV;V_DBmgrvtcs6u75zhL07Hmdn@V zNlbiW>cz~;=NDG4pAId0=i!d#19OhBz|W&R+;Ifa3XbyCQ;JUDj+Ou)A9f{<8v_3PKJY2vizTmyl$+sCXNlOs9C^EIal3SYB1!e*--7fs7Na?!+!HH9mmD9fxAL&&c!ox43~94G_MA0AgmWFnl-Hu zD+;V8a2_Zw*bFy0d1qq-W4|+b8F!3dym%tNcmnd~%b$PVdh_PVn>TNoy2FBKOieQc zl4QJQn6|K0j<2!~7CQ(VjfmgYvHVCu@@+-9dUkHvWV3;%vylwm@G^I!r792T($Xqj zTg`Kepc=XJlMS3Lq1jz5OG~?GIWGR;4sesZKNd``+I8)F*-}-6m6T&J0pD0VIuC%k1Gq#Jrq6-(_Zf(7~P;gdO z&bl+(w>QE(=ZkALC$M2s;t+CRbY>}z>vm)*zSd{jAZkTn1fgL@!bDgfkvk%>y7qQ_& zq3Jp-j1SzowYhnDo)9?Ftl~rJVzU#tKSCk!qR(!+31Xbb15F7B;N`kt)GKoVZqa822=NwxBb(Qsg>4 z3J?#^0P=4N3!u`0)s88i5vjE}hdZDt+XuXFI!NP&-m-DayG2#l`ig0#_zE zvsVG)(!#?pz{?8@r?grHLjH=j4THX9je`W;C4=ocTG#~Ot=O~2zfD=C z>0SB;MW0)p#TjrVpObd$*}V5Z{WQzPdlw)=G0djn86X628V3pxTwaJQWGl4L1+F<` zfUoKTp?d~wun$@2x^26B-Z@Z&t!;X-V&;pjtuNkq1QG6e@&44t<|HRDqDb;hR|lPJ zMSF0ZVT3!&@vhB-@o>mS#(@o@D5;4*b%fi&4~vHE{3HbkD-=&QJ>23C*r~9EwxSs+ zKKjP{X6u`q-c8w#6wP=SE41)DozJ_`E<(JE**>UX-^9qze)P>uxPDeR3xQ>x&`kmt zmn;J;B1_9`?-HM&*$y%PY1PrVQ%!n(2S`mFdhE_mc1^RdqVNj3HE%DTK0R_xv#{{$ zd+7WZLRB+Zaqnzi=FZ;Ngc`vy&8DL{{R$8OeBAjaEwy)$k>UV8O63O~*YNCN#s3tx zpyM7aj8V0RV*v2)3)T1`|jo@e>Q+@yy>$+lOX)#2cDkt-32(3>La`O z@dGd1-+H?M-Ns{>0bx8WyxMy8uo?kBed_j|JDc-@%>}j#m72#KHym`r>}hsS6jK+mNjggawLf^;k-5{pL{h1m02yIb3$-XMErf zZ$c1w*!xyD$6<$@0dcADcI%^;F;4H)%J$|4StFb=Yno{wa1(vPJF6?SL)8c9XAbY; z$saInre;8No!@ZN+}g6NJ~JRVUgYFbvpoaC9%Kf@&5yqS=;ndK5H>critJ_1fEZGq z{r>y2!&G;6P;U=M(ugqyGQ&}3Km@vZWPXF*#O=aG=X93_F?u!SeZQJ!e1! z9Wx-R^46=D2NNFHnT-uX^w?m884##X4e0mJo*nLBBGl8v(}^KMLwA1AF@zL+g}d4R z?pfb=hMxgZZQ|?jnRW#EA9rIzs0ofUd`Lmhd!-4jr6Lsh9?t^rK}J`0BsAJo{$HPl z@*2UsA~Ys&$iD9v{-hZY5XcLc+I-pT8yif8)Y%b$qaGwhJbMQwP0`X|v+ku<$6*@- z5!K}Z%`YmqoY`4*Yzq}dxVDM)F598H^H!}+{Ul)jfNfL%}ENNlA z67qh5U$)mGh7s_d9^M+Mv-uQozu$vd6oCBc7%{vWy#0RbEp#paMBteC*7x@>MT%>0 zHZGGaBbwTA0H?M?=hi~(Q%ZJ70qNPTu`;u{!K~n$KArI&!L+;g9_9o-d3keh50>&7z_U7=zyJJMuX`n6?qNJL z>vk^}HzOzXA~9_vY?FEeRv1t4;NV%~K#|lNdMls+5yT3s)54RjxSC)dRu~>0K711? zJj0bY=Ve0{Nl#A|Ach5A2F$@3xC!j#OITXY0G`#^eD;~rt7ng=t%UMo@5lbYt@x8S zqt+I@!-|=$?|=SgrqcotbSRn!3fqf;S9@3p)=@>Y%NO7Oy!FL_g$})Z;Y))N1wH;s zKt==pU=L#V8!WIeAaEoNKj`}!&mNEG9s=-DL&`(v?c0}63V-?|m@b`qGjnn4Vj-$& zp1!^U#4Sy;I7rFI3n_UVykCHWzrdlqoCQ4foYb_SULgg(SuEiM@)0kZXCA`!(rs4% zk_XfjfcQdNu>vOEK`?4?THZYt~fu8{%59~<6!kt;Q z`%bm$Ta4*sdU$X8^?cmb+@8wr+9#dOVV>9w_EHO?cw1hNHh4Aj%~oO9=ZA|GhTw!z zfd|;f+gFVH_wQ_S*FkAJ{9gmd5}dz$n7YYNRmOjmr!>Mo%-Ts7bqvIp8@E@Zl?)imDt`ecruZAFu#n z3ue@sLfG8=;(POEGf|{0QVN133A4uVMV^cc5Q&8>M{Ty^=GNAWW~4X^{U64&g=TCq zbRM2mcv{d5102={e+v~I2}Kzm9y^X@M6KJzua_=vHD@A)4vG#7-HsKu-l_0C8p=Hc z0R;#r_TSh7>J5oQcPPwGMRn!{jE_f(m)h-3(Q?|mcq4c?fF2EaOC7NMP*>`Q*XkqI zG%wxXy6BDYC{)V}Tx-;eW?YeYx%FxxQk-77v%%@sXdy*HN-O^S)H;e56iP)Iz>icR zGI*m_3q|&n60XmMhmnQ_UcCEbs(^89SsnovoIQmn9N+xjVYz`E?+aBHGS26ZEeoj(z%5HuU4F!Aw67aw83HeYy zy?-iFtlZup38y*=@Okn4+G2jOR;v{AH!3tSO)nyKt-MsD^TZXD30zUL-CG6TZCP4X zR;dTemEC-CdAd9?JrwW)PQd>@;DPgM>&(MYacTwX_$C_+-|=Y_bJz1X<`?t%rRBBN z3GUo%X&pTLK|c539KVC+ba86)CdcT*0Y5tTk9vF~HQ@B9%k9eP&StiID^yES)LKp{sS=e_ z5k(cL-Fi-e95k~45tlH}EckzONb#dv_Oa^P=XW+%I9nSgq#)%etmW0AIzEXa+r1xG zr0Jza`tdoQ;$|P$$~P!+_Q7(#_?SM2vM-vKUO}x3`W@q4G`X^-jrZKb1$-WbP+`q% zZX2SW0zM49$5&ct*nJdru;@*3`O?JV`ML8YYFZM-iM&En%cUIsSfcBhz@dlv`OU(^ z@qjyGX;~22>NvoIg8l?%E{8F1WoqM;%yj^N{(SH`YFL)?(vV*g+UZ`|JmTIUb9w0K zs7uqz+^nRO^HMpNi~c5|LS=h+0dB2qLOT|4t)@~ru`u?NIWKHoyo7ekt8sY;{o$jZ(jv)B^gxQBVbH#L^x9p!8FP-vVaBq1f?ixru` z?E?jrBMMj%tZZ-0IHXWbfDb!IO;H8_p83TgCAax$#{AE0;ECXf0&@?JK^&Joj>9b6 zkJ_p`1K*Q=^sj!Sebj%>6iC(uupjWclydK{zDog*&m=k-MI8=!a0YlE3-ROm;?Bfv z6_?ulBfuLWuikT}5d2wefBKv;pjvGNBi~9K0_#7;pzB2&xoyPr!Vl9)ZyM(P|rU^+dwDX z!x4CRXC~5Z#AzH4$DPfjO59J-GlUKShn15EJoyRb-LnMR*jY-Vi`~1gV7};341fMv z{R9G!af7t$i5Tl~dN|}I+3ua33rakE=OlV~D9HpSlnS8Zdw5+!S?=9=F70mri3}-i zX(@`*iWBf-_Ha;kxOa9Dh*DZ7_M#ahDNasJO-(MV^&@1^qeJ7b%80 zitpi6it0%QPDM8k?(N-MI*Q|~Pa9}F53j3IGJv)7RR-_mRB|U4IFiB-8UEapk|($| zqT5^>5FR-j62A0-n?vQrg}}sMiji3SU2= zz@_j*ZoiDC22%UuW+~}9LrYDwPV-Km%1I0*O*B1D<>Uf~ zunC_Mht56vI6?{v-Mf|Ssb*D=(x-BAfzO3=0$;w2<^-;d;o*%2Hc8yO|C~+KW47G( zkyAk@4Y+zQbgLIn-avb=JyN&xs4=vMqX>B9-oxHTo1Dr^IF-F*dLq<79-S!QsDv+7 zd*J1VE>r*gDTX6Os%KO-Q_}TR zPHImR`qO;;xSv`tq(gXk;@;`XX0}kZ?GX9lQ$Z&TI8s|^j=p#A9zBN!yL};ThVZ`- zxPrqq8t%6veJYi?os&Cw6*_KRqLg|XW0r>}6^zJOrIcv3Pi3>w=*e3-IF%DTJRAF7 zD{Qhoyl?%tl}lY5(}`hw#5XN11x3vXE+X&OTS?njP@fpy`0V#*VKR6Szx$*(jnu}Y zr&2$mz?T$B-H$$GPTG&>1nyF;p*j{a(;E`N?y%NR2eCcm!xvOwYxf8mVz1x%9j01`aR48DHE&vN|}<@ zD0PiPb%~w@?NViWS1s@6mN@Bz0DoNJ*6>~M%f(`Taf0J+OsoR%@>1#X4T4`EZY-rG zsp;=z;LfI6YVA|=H_GL6rCGX;q{-Q(wcQ&_(`yr}rTi{kKPkXfIZum=`K8^p{Bo&y zWpz#6|7!Wc((3NCxL6;?!?Am(Oa||4Hm0VP{RiZgvQ#WCi>RI}Eh?&1o0u+_i~Q1R zMLi+Fm6ie(^19N3l6_99Q_^}J(6wL{Nfa8w!&|DF9d-J2Hjyf+s6|OiUBP)yeQp+k z7P3P{;;*!zCv`%Ax9S7_Ex;7blzV5GWOg>|^{y-EIn_EjSxV=_A*doXbRM3#cLwmR zZSkqp^RU>SHrT5FUpZ&2+aL^t;l4vNb?6!?3t^-aVu20}Sx`W&dLmIk>LH(c(lso7 z_KL{`6D)6y`3DC3B;=1zma#CoU&}(~G0p7R!EjS=u>xmW;0+Z4LX*J-4(TCMWpYUq z8Wt{*H^3)@-UjZ5YrVw|T(G_E_wEUTBraY~M?7KJ6fwVJc!YXe)~y%7r)PXR%pTnh zSICPcwoYw+{!!IUTxVq+mGJf%ZlF%HFerAo@dJ22JyeAiI~cC@b^xyE_7AlP1fj)T z2wyn|1|sA(XJ+Ncl%fsSO9MB94A z;wYsvXd1J(18_xiyw?hR4%L3&86_fGZ%5!vV%Dz~IL!%e7(S=B7$w$)p?-wx0nXzP zvMoqFL?K#AY~AKPt<4(v_2({gec=0vQh$J-znAj$|I+uv<@^hiWMX@Tm9fkK0000< KMNUMnLSTZQciY4O From 3d62e247d058468f26c3187b1a1f0bc131090bc1 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Fri, 5 Feb 2016 00:46:28 +0100 Subject: [PATCH 3/4] refactor the way channel meta data is translated --- kalite/distributed/custom_context_processors.py | 7 +------ kalite/settings/base.py | 11 ++++++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/kalite/distributed/custom_context_processors.py b/kalite/distributed/custom_context_processors.py index 0a989e34e8..e624e0e738 100644 --- a/kalite/distributed/custom_context_processors.py +++ b/kalite/distributed/custom_context_processors.py @@ -6,7 +6,6 @@ * App settings, including version / build ID """ from django.conf import settings -from django.utils.translation import ugettext as _ from kalite import version from kalite.topic_tools import settings as topic_tools_settings @@ -14,16 +13,12 @@ def custom(request): - channel_data_trans = {} - for key, value in settings.KALITE_CHANNEL_CONTEXT_DATA.items(): - channel_data_trans[key] = _(value) - return { "central_server_host": settings.CENTRAL_SERVER_HOST, "central_server_domain": settings.CENTRAL_SERVER_DOMAIN, "securesync_protocol": settings.SECURESYNC_PROTOCOL, "base_template": "distributed/base.html", - "channel_data": channel_data_trans, + "channel_data": settings.KALITE_CHANNEL_CONTEXT_DATA, "channel": topic_tools_settings.CHANNEL, "is_central": False, "settings": settings, diff --git a/kalite/settings/base.py b/kalite/settings/base.py index 9ca9a45e75..b9ad1f8fb5 100644 --- a/kalite/settings/base.py +++ b/kalite/settings/base.py @@ -9,6 +9,7 @@ from kalite import ROOT_DATA_PATH from kalite.shared.warnings import RemovedInKALite_v016_Warning +from django.utils.translation import ugettext_lazy # Load local settings first... loading it again later to have the possibility # to overwrite default app settings.. very strange method, will be refactored @@ -250,11 +251,11 @@ # Context data included by ka lite's context processor KALITE_CHANNEL_CONTEXT_DATA = { - "channel_name": u"KA Lite", - "head_line": u"A free world-class education for anyone anywhere.", - "tag_line": u"KA Lite is a light-weight web server for viewing and interacting with core Khan Academy content (videos and exercises) without needing an Internet connection.", - "channel_license": u"CC-BY-NC-SA", - "footer_text": u"Videos © 2015 Khan Academy (Creative Commons) // Exercises © 2015 Khan Academy", + "channel_name": ugettext_lazy(u"KA Lite"), + "head_line": ugettext_lazy(u"A free world-class education for anyone anywhere."), + "tag_line": ugettext_lazy(u"KA Lite is a light-weight web server for viewing and interacting with core Khan Academy content (videos and exercises) without needing an Internet connection."), + "channel_license": ugettext_lazy(u"CC-BY-NC-SA"), + "footer_text": ugettext_lazy(u"Videos © 2015 Khan Academy (Creative Commons) // Exercises © 2015 Khan Academy"), "header_logo": os.path.join(STATIC_URL, 'images', 'horizontal-logo-small.png'), "frontpage_splash": os.path.join(STATIC_URL, 'images', 'logo_10_enlarged_2.png'), } From b42d920cf1b73fb2cd4667770c57c719538e62b2 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Fri, 5 Feb 2016 18:11:51 +0100 Subject: [PATCH 4/4] Annotate content db after unpacking assessment zip - fixes #4815 --- .../commands/unpack_assessment_zip.py | 19 +++++++++---------- .../commands/annotate_content_items.py | 5 ----- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/kalite/contentload/management/commands/unpack_assessment_zip.py b/kalite/contentload/management/commands/unpack_assessment_zip.py index 8ce59d9f90..4c9e1cc1d5 100644 --- a/kalite/contentload/management/commands/unpack_assessment_zip.py +++ b/kalite/contentload/management/commands/unpack_assessment_zip.py @@ -11,6 +11,7 @@ from django.conf import settings as django_settings from django.core.management.base import BaseCommand, CommandError +from django.core.management import call_command logging = django_settings.LOG @@ -39,17 +40,17 @@ def handle(self, *args, **kwargs): return if is_valid_url(ziplocation): # url; download the zip - print "Downloading assessment item data from a remote server. Please be patient; this file is big, so this may take some time..." + logging.info("Downloading assessment item data from a remote server. Please be patient; this file is big, so this may take some time...") # this way we can download stuff larger than the device's RAM r = requests.get(ziplocation, prefetch=False) content_length = r.headers.get("Content-Length") - print "Downloaded size: ", str(int(content_length) // 1024 // 1024) + " MB" if content_length else "Unknown" + logging.info("Downloaded size: ", str(int(content_length) // 1024 // 1024) + " MB" if content_length else "Unknown") sys.stdout.write("Downloading file...") sys.stdout.flush() f = tempfile.TemporaryFile("r+") r.raise_for_status() for cnt, chunk in enumerate(r.iter_content(chunk_size=1024)): - if chunk: # filter out keep-alive new chunks + if chunk: # filter out keep-alive new chunks f.write(chunk) if cnt % 1000 == 0: sys.stdout.write(".") @@ -60,10 +61,14 @@ def handle(self, *args, **kwargs): else: # file; just open it normally f = open(ziplocation, "rb") - print "Unpacking..." + logging.info("Unpacking...") zf = zipfile.ZipFile(f, "r") unpack_zipfile_to_content_folder(zf) + logging.info("Scanning items and updating content db...") + call_command("annotate_content_items") + logging.info("Done, assessment items installed and everything updated. Refresh your browser!") + def should_upgrade_assessment_items(): # if assessmentitems.version doesn't exist, then we assume @@ -101,12 +106,6 @@ def unpack_zipfile_to_content_folder(zf): os.path.join(folder, 'assessmentitems.version'), settings.KHAN_ASSESSMENT_ITEM_VERSION_PATH ) - # JSON file is apparrently not required (not in the test at least) - if os.path.isfile(os.path.join(folder, 'assessmentitems.json')): - shutil.move( - os.path.join(folder, 'assessmentitems.json'), - settings.KHAN_ASSESSMENT_ITEM_JSON_PATH - ) def is_valid_url(url): diff --git a/kalite/topic_tools/management/commands/annotate_content_items.py b/kalite/topic_tools/management/commands/annotate_content_items.py index a99545da37..18b2413739 100644 --- a/kalite/topic_tools/management/commands/annotate_content_items.py +++ b/kalite/topic_tools/management/commands/annotate_content_items.py @@ -1,6 +1,3 @@ -import os - -from django.core.management import call_command from optparse import make_option from django.conf import settings as django_settings @@ -12,8 +9,6 @@ from django.core.management.base import BaseCommand -from django.utils.translation import gettext as _ - class Command(BaseCommand):