From ab94c633360cd5247030da1cb6a040635511809d Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 28 Apr 2011 10:59:34 +0200 Subject: [PATCH] fix JS locales except title ans description in home --- conf/examples/django/urls.py | 11 +++++- telemeta/htdocs/js/locale.js | 18 +++++----- telemeta/htdocs/timeside/src/divmarker.js | 2 +- telemeta/htdocs/timeside/src/player.js | 2 +- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 10940 -> 10940 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 32 +++++++++--------- telemeta/locale/fr/LC_MESSAGES/djangojs.mo | Bin 541 -> 900 bytes telemeta/locale/fr/LC_MESSAGES/djangojs.po | 25 ++++++++++++-- telemeta/templates/telemeta_default/base.html | 2 +- .../telemeta_default/collection_detail.html | 2 +- telemeta/templates/telemeta_default/home.html | 4 +-- .../telemeta_default/mediaitem_detail.html | 2 +- 12 files changed, 63 insertions(+), 37 deletions(-) diff --git a/conf/examples/django/urls.py b/conf/examples/django/urls.py index 55f5df59..50f7e990 100644 --- a/conf/examples/django/urls.py +++ b/conf/examples/django/urls.py @@ -5,6 +5,10 @@ from django.conf.urls.defaults import * from django.contrib import admin admin.autodiscover() +js_info_dict = { + 'packages': ('telemeta',), +} + urlpatterns = patterns('', # Example: # (r'^sandbox/', include('sandbox.foo.urls')), @@ -15,7 +19,12 @@ urlpatterns = patterns('', # Uncomment the next line to enable the admin: (r'^djangoadmin/', include(admin.site.urls)), + + # Telemeta (r'^', include('telemeta.urls')), + # Languages - (r'^i18n/', include('django.conf.urls.i18n')), + (r'^i18n/', include('django.conf.urls.i18n')), + (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), + ) diff --git a/telemeta/htdocs/js/locale.js b/telemeta/htdocs/js/locale.js index fdba86d0..8c1486a1 100644 --- a/telemeta/htdocs/js/locale.js +++ b/telemeta/htdocs/js/locale.js @@ -1,15 +1,13 @@ -/* - * javascript file to handle translations between django and javascript - */ -function gettrans(str){ - var loc = localeStrings; //instantiate once for faster lookup - return str in loc ? loc[str] : str; -} var localeStrings = { 'title': gettext('title'), 'description': gettext('description'), 'delete the marker permanently?': gettext('delete the marker permanently?'), - 'marker added to selected playlist': gettext('marker added to selected playlist'), - 'item added to selected playlist': gettext('item added to selected playlist'), - 'collection added to selected playlist': gettext('collection added to selected playlist') + 'marker added to the selected playlist': gettext('marker added to the selected playlist'), + 'item added to the selected playlist': gettext('item added to the selected playlist'), + 'collection added to the selected playlist': gettext('collection added to the selected playlist') }; + +function gettrans(str){ + var loc = localeStrings; //instantiate once for faster lookup + return str in loc ? loc[str] : str; +} diff --git a/telemeta/htdocs/timeside/src/divmarker.js b/telemeta/htdocs/timeside/src/divmarker.js index 1751d17d..58a82bf4 100644 --- a/telemeta/htdocs/timeside/src/divmarker.js +++ b/telemeta/htdocs/timeside/src/divmarker.js @@ -249,7 +249,7 @@ var MarkerMapDiv = TimesideArray.extend({ }) e_addplaylistButton.unbind('click').bind('click',function(evtObj_){ - playlistUtils.showPopupAddToPlaylist(evtObj_,'marker',""+marker.id,'marker added to selected playlist'); + playlistUtils.showPopupAddToPlaylist(evtObj_,'marker',""+marker.id,gettrans('marker added to the selected playlist')); return false; }); diff --git a/telemeta/htdocs/timeside/src/player.js b/telemeta/htdocs/timeside/src/player.js index 06adc848..2b49a5a9 100644 --- a/telemeta/htdocs/timeside/src/player.js +++ b/telemeta/htdocs/timeside/src/player.js @@ -5,7 +5,7 @@ var Player = TimesideClass.extend({ init: function(container, sound, soundDurationInMsec) { this._super(); var player = this; - + if (!container){ this.debug('ERROR: container is null in initializing the player') } diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 82b3ed75ecd37e25a0ca5aeaae78537b9f998ff8..5b6de1b90835ec05208a60d1ed09b048bec9d684 100644 GIT binary patch delta 18 ZcmdlJx+iqQVi{H=Ln{O0%`0R?_y9$~1~32s delta 18 ZcmdlJx+iqQVi{IL3o9do%`0R?_y9%m1~mWx diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index 83d9ec52..78c42dfb 100644 --- a/telemeta/locale/fr/LC_MESSAGES/django.po +++ b/telemeta/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-27 18:20+0200\n" +"POT-Creation-Date: 2011-04-27 21:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Guilyardi \n" "Language-Team: LANGUAGE \n" @@ -451,7 +451,7 @@ msgid "Expiration_date" msgstr "Date d'expiration" #: templates/telemeta/registration/logged_out.html:4 -#: templates/telemeta_default/base.html:73 +#: templates/telemeta_default/base.html:74 #: templates/telemeta_default/registration/logged_out.html:4 #: templates/telemeta_default/registration/password_change_done.html:4 #: templates/telemeta_default/registration/password_change_form.html:5 @@ -543,59 +543,59 @@ msgstr "Nom" msgid "E-mail" msgstr "E-mail" -#: templates/telemeta_default/base.html:45 +#: templates/telemeta_default/base.html:46 msgid "Welcome" msgstr "Bienvenue" -#: templates/telemeta_default/base.html:51 +#: templates/telemeta_default/base.html:52 msgid "Account" msgstr "Compte" -#: templates/telemeta_default/base.html:52 -#: templates/telemeta_default/base.html:56 +#: templates/telemeta_default/base.html:53 +#: templates/telemeta_default/base.html:57 msgid "Help" msgstr "Aide" -#: templates/telemeta_default/base.html:53 +#: templates/telemeta_default/base.html:54 msgid "Sign out" msgstr "Déconnexion" -#: templates/telemeta_default/base.html:57 +#: templates/telemeta_default/base.html:58 #: templates/telemeta_default/login.html:21 msgid "Sign in" msgstr "Connexion" -#: templates/telemeta_default/base.html:65 +#: templates/telemeta_default/base.html:66 #: templates/telemeta_default/search_criteria.html:132 msgid "Search" msgstr "Recherche" -#: templates/telemeta_default/base.html:74 +#: templates/telemeta_default/base.html:75 msgid "Collections" msgstr "Collections" -#: templates/telemeta_default/base.html:75 +#: templates/telemeta_default/base.html:76 msgid "Items" msgstr "Items" -#: templates/telemeta_default/base.html:76 +#: templates/telemeta_default/base.html:77 #: templates/telemeta_default/index.html:13 msgid "Geo Navigator" msgstr "Géo-Navigateur" -#: templates/telemeta_default/base.html:77 +#: templates/telemeta_default/base.html:78 msgid "Advanced search" msgstr "Recherche avancée" -#: templates/telemeta_default/base.html:79 +#: templates/telemeta_default/base.html:80 msgid "Admin" msgstr "Admin" -#: templates/telemeta_default/base.html:101 +#: templates/telemeta_default/base.html:102 msgid "Powered by" msgstr "Propulsé par" -#: templates/telemeta_default/base.html:102 +#: templates/telemeta_default/base.html:103 msgid "By" msgstr "Par" diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo index c567c409859cc71daa1a767a65d93ffc0aa1a629..e00a38e78a5e83d54bf6488dc8d4d1d5e729eb57 100644 GIT binary patch delta 402 zcmY+8Jxc>Y5QgXCC5H$WHa4OI8pTu^6vW2HA7G)9DsbG5xVrb@-kxBijb)k;ECt(? zc3R(0NN;0h<4+LZ+XTdchv#m0-ko{&AA^UFCI5*~0ayX2U;zw3U2k9;yn|Kn3F`ZX zN3;$v!fm(_WFNMb9j}Nwi*jpFRVk>s=$<3xE@^^p`y%lqY}*1Zt_hjrQx_5U#L`B cbt?%r;C~B@zPycj!V0c;^zE$$gf;NkFVsd{0ssI2 delta 127 zcmZo+pUV<(Pl#nI0}wC)u?!IF05K~N+W;{L1OTxz5C;Nr2_pkTDUdb-;#WX65WxXR yKL||bWmKIU#~99Tu3%_xWoo{852HBaWFux}0fpkjD|1qlOEUBG@(!;|WdHzi3=@d} diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.po b/telemeta/locale/fr/LC_MESSAGES/djangojs.po index 8b18239b..2a3739c2 100644 --- a/telemeta/locale/fr/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/fr/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-27 17:57+0200\n" +"POT-Creation-Date: 2011-04-28 10:54+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1\n" -#: htdocs/timeside/src/player.js:5 +#: htdocs/js/locale.js:2 +msgid "title" +msgstr "titre" + +#: htdocs/js/locale.js:3 +msgid "description" +msgstr "description" + +#: htdocs/js/locale.js:4 +msgid "delete the marker permanently?" +msgstr "supprimer le marqueur définitivement ?" + +#: htdocs/js/locale.js:5 +msgid "marker added to the selected playlist" +msgstr "marqueur ajouté à la liste de lecture" + +#: htdocs/js/locale.js:6 msgid "item added to the selected playlist" -msgstr "item ajouté à la liste de lecture sélectionnée" +msgstr "item ajouté à la liste de lecture" +#: htdocs/js/locale.js:7 +msgid "collection added to the selected playlist" +msgstr "collection ajoutée à la liste de lecture" diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html index b9214cef..81db87eb 100644 --- a/telemeta/templates/telemeta_default/base.html +++ b/telemeta/templates/telemeta_default/base.html @@ -17,10 +17,10 @@ {% endblock %} + - {% block extra_javascript %}{% endblock %} diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html index f852fd7b..6b97485f 100644 --- a/telemeta/templates/telemeta_default/collection_detail.html +++ b/telemeta/templates/telemeta_default/collection_detail.html @@ -20,7 +20,7 @@ var anchor = jQuery('#_add_to_playlist'); if(anchor.length){ anchor.click(function(evtObj_){ - p.showPopupAddToPlaylist(evtObj_,'collection','{{collection.public_id}}','Collection added to selected playlist');return false; + p.showPopupAddToPlaylist(evtObj_,'collection','{{collection.public_id}}',gettrans('collection added to the selected playlist'));return false; }); } {% endif %} diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html index 6a5c1d4b..6bd5b37f 100644 --- a/telemeta/templates/telemeta_default/home.html +++ b/telemeta/templates/telemeta_default/home.html @@ -68,7 +68,7 @@ {% for playlist in playlists %} - +
{{ playlist.playlist.title }} @@ -81,7 +81,7 @@ - +
diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html index b3c59b8f..7a151155 100644 --- a/telemeta/templates/telemeta_default/mediaitem_detail.html +++ b/telemeta/templates/telemeta_default/mediaitem_detail.html @@ -34,7 +34,7 @@ var anchor = jQuery('#_add_to_playlist'); if(anchor.length){ anchor.click(function(evtObj_){ - p.showPopupAddToPlaylist(evtObj_,'item','{{item.public_id}}',gettext('item added to the selected playlist'));return false; + p.showPopupAddToPlaylist(evtObj_,'item','{{item.public_id}}',gettrans('item added to the selected playlist'));return false; }); } {% endif %} -- 2.39.5
{% trans "Title" %} {% trans "Type" %}