From 8c583f78ceee2034e62fa1d45297abaa6b250ea5 Mon Sep 17 00:00:00 2001 From: yomguy Date: Tue, 5 Apr 2011 15:39:01 +0200 Subject: [PATCH] add translations to templates for JS messages --- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 11248 -> 11361 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 10 +++++++- telemeta/web/base.py | 31 ++++++++++++++++++++--- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 1a893c003c52d8e3da2e965cd53f2c450e3cf460..74d8d2f9fb46f74d9dee6bc4e3d924e3241a748c 100644 GIT binary patch delta 4617 zcmYk<3zSt=0f+I8!zj#*6r1kE7%FlQ5V1)bxB3X2lEcLT_A-b#NtKjH}Tbs__D>iRZT=V-5STHXgz}Jc9Xn z9Q)&m_WSTV-G#CZb%p@g-bXw679GcZEzZP!wR&)HCPWfp)>j&+Tj88zN6R_ zkE88Pz$y)ozlmKs`*HS!)V5REUoFDs+Z}kbA;tbjeE54(6fPC1`{9 zBdZ)%q66E2w)-qPf!)Zzu%8dxeFIzJM@?9NZ_H=ioLOsZft}F-4Mt}&5^Z=)te2qI zPe*5dTXb18+ zN~|A8e+S-+_5VaaL+^9i4m=lKnTF^ADzLgXvcp=JA4%7mLvmE<=}kWpo4Dz)rM*J?JAih+h8|x_RG02lzgE-5GR(E~}e47u{10Z~(SU zDA@3g=oh!34NOOu^bT|;%h2mKMz`W+)VHIr*E{Har_lRqwM_@m7+uj8XgdYSn;izA zE1ML>6O*wECl;V1egYlP7PR4==#2;C_y0m?egeOVAEPVKsa<+qS9FO7qXQa)USEc` zKQpZ-p^AbdoR4m{g=oi1(+k2Xbd#+`2k<1iS@$CwJNy&v=p4G_joPOjUWzVxH*~l6 zM)%MNwEYQ~{rf+ag1fs4o#}m8fUD4F`~o_IW5|9B@1g^$%|$lU2>rfwtY3jnq#xSu z5cD-2hYqL`J7I#^zyIqgctZ_(;q$Tndh{*y8NZJ?cp4qp7wF9EcSr})9(m)!<>*ph zi|(20(20#jH+3o6-h52FUh6?1V1I)fL{f&CeW z73csLVD>FS+u0D$??MN9v?K4o&;BGQT-vi(8=J8{E>%l(i94Yq?isxr9q4d$AVslW zigs9mwz~+uZz;OlA4S{Sgzly7osx9KhdE(GZ=##)zpwxUn&<*W)6#CYTM;}=-kAgE;fHt@S?O-*!5?jzma}aId1iAvJ z(GJgH9c)~fw$l7UmO z@*5L|pqr@_^YKn}bKZ+}ab0vXIGJ64q zZfOI#XoC&WhT5YI6{3%zZ*&CKqJBAXg}!<$pmHx+L|!C6rvL2W=K2O1Mh27pWEt5+ z`V-pB9`231$Tj3wWE$B`ena|_m&u*Pm2!t4CLU~$u#?Oow-S$MNODWI7{cu6Ec_8U zNd82AK?=xy#OFGNcwChdwnoR}9i&&R4?_Pg{FXdM%80AxF+U|7^7)rjaRZf-44FuJ z5_h{B?lt0b^%1>9JdUJfe~kK29z#};d&p4oELlf9ZXo{Hczm1OPuyQii2a9o*#iGX zi)&-q=em+iCGLgQWE44neD{0-d&lza(d(o6xR1Eow~>*=V+469TjIm#|ASbWj&7vA zvHpF0B9`Slq?+WB$I1EQ;aDg}U)gJ8{U#hpejn>ya0ubG3wM(rlB9xl{vTI`fmDD6uQYefkmt#NjvsiD1 z&yiP2ec}(#X3~MoARg;Un`|llcmQ7bO8pVaP052~0=bSHAR9?`NH;XJ z*%JSsj~!!KE+dbUUz3Go7imU3>XAQ^E65JAop{_#zGopGf54wwcDBDHSCc9-mUv7e zbIJ2$G3i8BktfL>GMYS9Go@i!PR*f9TIDn-E-op~RL;oEET1^He9G*~n)jNG&a3Is p?&X|TWizTO_ioJWU7IPNnDM)kOmRu3ykt^kRYgh77adOL{vT%#rH23j delta 4533 zcmYk=3v`!d0mtzdc9V?_1vXjXE-;20%-lqWz#zOJ3aD6umTsVkAb~)kDab2wi3SA4 zP=u){NCK+~6GSdGF#$;uHG`9hMn@%1dQvHm(y6}R|Nq%JyvN@@&+}fM+xxtK&hf9e z{Bvx4ymRWRh~o(9P8!prD7PKuY|lo~^z)*q9A{twHew0x#(ew$JLA`wf!S12Fc&*u zK6b*M==Do54F@LA$I;Mm!)Wxu@pum2g*iA4ec&N%kMqO%MaWpARhWv6n2Aqg7B*oG z?hM!ejSk=pGS(=iivx@qDTS__C`3E%hc;M)eenvk!F#bI&PHdn80~O1`rLZV!zQ%7 zSI|W~7V00ND|ZHMzlfW%=s)U3!3HYP4hEn%T!YShBv#{1=#ti>_cdT*#^_2lq0j9` z+iOKv^fh$mhtZk8gHGsUjBVfx3Xb%@=*&9iCTGwceV`I;_)7G?;b?4TEQRN-G~?94)nP{=Cc0I=wnWN6F)--l+8LigKlWU#i4!?dVe)K=NI-vdN%#Wc4iBs#Fq(E;{#=1F!9JHZAbV>W5D=`G^Xf(PK zW3U(Aj&?8~{pDPWHoOUat~u0SM(;a-^cfvNH~T5f_WMt#<_No@9T$Xp6}ohTkS{a3 z0bSw==nBmV)}tM+MtA>abg#6A`q5DT1nno4(b9L6gK-gsG75Hl9eP78+R!9)Dd(ay zScG=G9PRK4bjHo-3T{VNXg|7Qhr{)^&{udYoPRg?L3iH24SyJJ{1pA6IE^-#%CCj* zG#9VpAEgp3r#_i~iTuZ?fj=eKf-dbbbfrE=2a-{koInmb!MtF3I6t^BPR?K$CtT{0 z!8){ondk~UfHpi2o$;gSPirGOz;)<-&6wDf=w{x7?x_Pf7~e+Q?Oc>RpC41OfnMm6 z_Csef483t&@NTT2J`LT)jp%cm(C2od12}}P=v!zz?;>Al^e=Q}bBdGo0xY8*S5t7r zr!oJ~%I2UxUv4DeRBWqAPG5z3&9N#Ana}b?TA4zZh-5cc}M8_gEFuUmOhz z7lxyo>w2`o+t6J)3)#5Q3bcbJbf&FnM+ecR{xiDkKScM=f6xhK_e^$}k8bLo=mamv z68evZQ}EqRMH_qs*=JD$I-qT6L#^TZ>!E%eoyjS*;nV2nnOTw?P!H@)y#jsyX7v8? z=zUYH(|@W>| zbzRVbUWndbiN2yi=qnu&Q*Z!vXu}iHkxoH7oP*AIG1}l-bfC|p&%J=`yJ$B$)A!M@ z?A)R9^(>!`6BQazW?t~7(+_Jh2r33{1v$|)L#tl z!CK;G^%zM;B}!5BI8G!R$t$FuxG6pA$bdvCie5+eSRa4?8!2RwXNiZK>;>`%E8$p$ z?tx2)yWZpH!wgbuUNjGwsJVEA=1*Glx35EDN{(O%-MEa5;B7& zOukRHkR_z;*h}F-(uoWrx0B0=#{;A%xtXjZZO0uHdW6a_-~ZXib}D6OotQ>>f2gm) zyUx01@pt4VGMqe2rjUN*T(X>a+)Az_zacM^a^msr#9#U^NEG-V2e^V<9O|p_Npd-v z8qPg~)g*=dklaA>$yicBo+E9?S_&J;U~({=Y{7YCQK-jVC~P9L$c}Jw<<^2_Eft;r b)V?J%H!r27s@v$ymZd%RrL;^fJ)QP{Uzdzo diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index 6f6740c1..7a74e212 100644 --- a/telemeta/locale/fr/LC_MESSAGES/django.po +++ b/telemeta/locale/fr/LC_MESSAGES/django.po @@ -797,6 +797,9 @@ msgstr "Analyse" msgid "Markers" msgstr "Marqueurs" +msgid "Marker" +msgstr "Marqueur" + #: templates/telemeta_default/mediaitem_detail.html:131 msgid "Add to playlist" msgstr "Ajouter à la liste" @@ -897,6 +900,11 @@ msgstr "Toutes" msgid "Novel" msgstr "Inédites" -#: templates/telemeta_default/collection_list.html:1& +#: templates/telemeta_default/collection_list.html:11 msgid "Published" msgstr "Éditées" + +msgid "added to playlist" +msgstr "ajouté à la liste de lecture" + + diff --git a/telemeta/web/base.py b/telemeta/web/base.py index 742b2fda..164f1237 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -125,7 +125,13 @@ class WebView(object): playlists = self.get_playlists(request) revisions = self.get_revisions(request) searches = Search.objects.filter(username=request.user) - return render(request, template, {'playlists': playlists, 'searches': searches, 'revisions': revisions}) + translation_list = ['Title', 'Description', 'OK', 'Cancel'] + translations = {} + for term in translation_list: + translations[term] = ugettext(term) + + return render(request, template, {'playlists': playlists, 'searches': searches, + 'revisions': revisions, 'translations': translations}) def get_revisions(self, request): last_revisions = Revision.objects.all().order_by('-time')[0:15] @@ -147,6 +153,7 @@ class WebView(object): except: element = None revisions.append({'revision': revision, 'element': element}) + return revisions def collection_detail(self, request, public_id, template='telemeta/collection_detail.html'): @@ -154,7 +161,12 @@ class WebView(object): if collection.public_access == 'none' and not request.user.is_staff: return HttpResponseRedirect('not_allowed/') playlists = self.get_playlists(request) - return render(request, template, {'collection': collection, 'playlists' : playlists, }) + translation_list = ['OK', 'Cancel', 'Collection', 'added to playlist'] + translations = {} + for term in translation_list: + translations[term] = ugettext(term) + + return render(request, template, {'collection': collection, 'playlists' : playlists, 'translations': translations}) @method_decorator(permission_required('telemeta.change_mediacollection')) def collection_edit(self, request, public_id, template='telemeta/collection_edit.html'): @@ -170,6 +182,7 @@ class WebView(object): return HttpResponseRedirect('/collections/'+code) else: form = MediaCollectionForm(instance=collection) + return render(request, template, {'collection': collection, "form": form,}) @method_decorator(permission_required('telemeta.add_mediacollection')) @@ -186,6 +199,7 @@ class WebView(object): return HttpResponseRedirect('/collections/'+code) else: form = MediaCollectionForm(instance=collection) + return render(request, template, {'collection': collection, "form": form,}) @method_decorator(permission_required('telemeta.add_mediacollection')) @@ -203,6 +217,7 @@ class WebView(object): return HttpResponseRedirect('/collections/'+code) else: form = MediaCollectionForm(instance=collection) + return render(request, template, {'collection': collection, "form": form,}) def item_previous_next(self, item): @@ -234,6 +249,7 @@ class WebView(object): else: previous = item.public_id next = item.public_id + return previous, next def item_detail(self, request, public_id=None, marker_id=None, template='telemeta/mediaitem_detail.html'): @@ -267,12 +283,17 @@ class WebView(object): playlists = self.get_playlists(request) public_access = self.get_public_access(item.public_access, item.recorded_from_date, item.recorded_to_date) + translation_list = ['OK', 'Cancel', 'Item' 'Marker', 'added to playlist'] + translations = {} + for term in translation_list: + translations[term] = ugettext(term) + return render(request, template, {'item': item, 'export_formats': formats, 'visualizers': graphers, 'visualizer_id': grapher_id,'analysers': analyzers, 'audio_export_enabled': getattr(settings, 'TELEMETA_DOWNLOAD_ENABLED', True), 'previous' : previous, 'next' : next, 'marker': marker_id, 'playlists' : playlists, - 'public_access': public_access, + 'public_access': public_access, 'translations': translations, }) def get_public_access(self, access, date_from, date_to): @@ -293,6 +314,7 @@ class WebView(object): year_now = datetime.datetime.now().strftime("%Y") if int(year_now) - int(year[0]) >= settings.TELEMETA_PUBLIC_ACCESS_PERIOD: public_access = True + return public_access @method_decorator(permission_required('telemeta.change_mediaitem')) @@ -352,6 +374,7 @@ class WebView(object): return HttpResponseRedirect('/items/'+code) else: form = MediaItemForm(instance=item) + return render(request, template, {'item': item, "form": form}) @@ -371,6 +394,7 @@ class WebView(object): return HttpResponseRedirect('/items/'+code) else: form = MediaItemForm(instance=item) + return render(request, template, {'item': item, "form": form}) def item_analyze(self, item): @@ -449,6 +473,7 @@ class WebView(object): mime_type = 'text/xml' response = HttpResponse(self.cache_data.read_stream_bin(analyze_file), mimetype=mime_type) # response['Content-Disposition'] = 'attachment; filename='+public_id+'.xml' + return response def item_visualize(self, request, public_id, visualizer_id, width, height): -- 2.39.5