Commit 00e4eecb authored by Pierre Arnaud's avatar Pierre Arnaud

Wording

parent 16157963
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Passim 0.0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2015-04-16 01:36+0200\n"
"POT-Creation-Date: 2015-04-20 14:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -67,9 +67,9 @@ msgid "Most recently updated Information Services"
msgstr ""
#: passim/templates/accueil.mako:33 passim/templates/organisms.mako:100
#: passim/templates/territories.mako:41 passim/templates/territories.mako:76
#: passim/templates/territories.mako:113 passim/templates/territories.mako:150
#: passim/templates/territories.mako:187 passim/templates/maps/dep.mako:20
#: passim/templates/territories.mako:45 passim/templates/territories.mako:80
#: passim/templates/territories.mako:117 passim/templates/territories.mako:154
#: passim/templates/territories.mako:193 passim/templates/maps/dep.mako:20
msgid "Name"
msgstr ""
......@@ -129,7 +129,7 @@ msgid "Contribute Form"
msgstr ""
#: passim/templates/contribute.mako:9 passim/templates/site.mako:100
#: passim/templates/site.mako:142 passim/views/__init__.py:164
#: passim/views/__init__.py:164
msgid "Contribute"
msgstr ""
......@@ -317,9 +317,9 @@ msgstr ""
msgid "List"
msgstr ""
#: passim/templates/organisms.mako:101 passim/templates/territories.mako:42
#: passim/templates/territories.mako:77 passim/templates/territories.mako:114
#: passim/templates/territories.mako:151 passim/templates/territories.mako:188
#: passim/templates/organisms.mako:101 passim/templates/territories.mako:46
#: passim/templates/territories.mako:81 passim/templates/territories.mako:118
#: passim/templates/territories.mako:155 passim/templates/territories.mako:194
msgid "Transport Type"
msgstr ""
......@@ -327,7 +327,7 @@ msgstr ""
msgid "Transport Mode"
msgstr ""
#: passim/templates/site.mako:9 passim/templates/territories.mako:23
#: passim/templates/site.mako:9 passim/templates/territories.mako:27
msgid "Search services for whole France"
msgstr ""
......@@ -363,7 +363,7 @@ msgstr ""
msgid "Maps"
msgstr ""
#: passim/templates/site.mako:114 passim/templates/territories.mako:31
#: passim/templates/site.mako:114 passim/templates/territories.mako:35
msgid "Multimodal Information Services"
msgstr ""
......@@ -379,35 +379,43 @@ msgstr ""
msgid "Transport Offers"
msgstr ""
#: passim/templates/site.mako:142
msgid "Thanks for signalling us any erroneous, missing or incomplete info"
msgstr ""
#: passim/templates/site.mako:148
msgid "Back-office access"
msgid "More details (back-office)"
msgstr ""
#: passim/templates/territories.mako:21
msgid "Information Services for whole France"
msgstr ""
#: passim/templates/territories.mako:20
#: passim/templates/territories.mako:23
msgid "Traveler Info Services List For"
msgstr ""
#: passim/templates/territories.mako:40 passim/templates/territories.mako:49
#: passim/templates/territories.mako:75 passim/templates/territories.mako:85
#: passim/templates/territories.mako:112 passim/templates/territories.mako:122
#: passim/templates/territories.mako:149 passim/templates/territories.mako:159
#: passim/templates/territories.mako:186 passim/templates/territories.mako:197
#: passim/templates/territories.mako:44 passim/templates/territories.mako:53
#: passim/templates/territories.mako:79 passim/templates/territories.mako:89
#: passim/templates/territories.mako:116 passim/templates/territories.mako:126
#: passim/templates/territories.mako:153 passim/templates/territories.mako:163
#: passim/templates/territories.mako:192 passim/templates/territories.mako:203
msgid "Web Site"
msgstr ""
#: passim/templates/territories.mako:66
#: passim/templates/territories.mako:70
msgid "Local Interest Traveler Info Services"
msgstr ""
#: passim/templates/territories.mako:103
#: passim/templates/territories.mako:107
msgid "Departmental Interest Traveler Info Services"
msgstr ""
#: passim/templates/territories.mako:140
#: passim/templates/territories.mako:144
msgid "Regional Interest Traveler Info Services"
msgstr ""
#: passim/templates/territories.mako:177
#: passim/templates/territories.mako:182
msgid "National Information"
msgstr ""
......
......@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Passim 0.0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2015-04-16 01:36+0200\n"
"PO-Revision-Date: 2015-04-16 01:38+0100\n"
"Last-Translator: Valéry Febvre <vfebvre@easter-eggs.com>\n"
"POT-Creation-Date: 2015-04-20 14:36+0200\n"
"PO-Revision-Date: 2015-04-20 14:37+0100\n"
"Last-Translator: Pierre ARNAUD <parnaud@easter-eggs.com>\n"
"Language-Team: fr <LL@li.org>\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"MIME-Version: 1.0\n"
......@@ -93,12 +93,12 @@ msgstr ""
#: passim/templates/accueil.mako:19
msgid "Most recently updated Information Services"
msgstr "Les dernières mises à jour"
msgstr "Dernière mise à jour"
#: passim/templates/accueil.mako:33 passim/templates/organisms.mako:100
#: passim/templates/territories.mako:41 passim/templates/territories.mako:76
#: passim/templates/territories.mako:113 passim/templates/territories.mako:150
#: passim/templates/territories.mako:187 passim/templates/maps/dep.mako:20
#: passim/templates/territories.mako:45 passim/templates/territories.mako:80
#: passim/templates/territories.mako:117 passim/templates/territories.mako:154
#: passim/templates/territories.mako:193 passim/templates/maps/dep.mako:20
msgid "Name"
msgstr "Nom"
......@@ -160,7 +160,7 @@ msgid "Contribute Form"
msgstr "Formulaire de contribution"
#: passim/templates/contribute.mako:9 passim/templates/site.mako:100
#: passim/templates/site.mako:142 passim/views/__init__.py:164
#: passim/views/__init__.py:164
msgid "Contribute"
msgstr "Contribuer"
......@@ -439,9 +439,9 @@ msgstr "Offre de transport :"
msgid "List"
msgstr "Liste"
#: passim/templates/organisms.mako:101 passim/templates/territories.mako:42
#: passim/templates/territories.mako:77 passim/templates/territories.mako:114
#: passim/templates/territories.mako:151 passim/templates/territories.mako:188
#: passim/templates/organisms.mako:101 passim/templates/territories.mako:46
#: passim/templates/territories.mako:81 passim/templates/territories.mako:118
#: passim/templates/territories.mako:155 passim/templates/territories.mako:194
msgid "Transport Type"
msgstr "Type de transport"
......@@ -449,7 +449,7 @@ msgstr "Type de transport"
msgid "Transport Mode"
msgstr "Mode de transport"
#: passim/templates/site.mako:9 passim/templates/territories.mako:23
#: passim/templates/site.mako:9 passim/templates/territories.mako:27
msgid "Search services for whole France"
msgstr "Recherche sur la France entière"
......@@ -485,7 +485,7 @@ msgstr "Home"
msgid "Maps"
msgstr "Cartes"
#: passim/templates/site.mako:114 passim/templates/territories.mako:31
#: passim/templates/site.mako:114 passim/templates/territories.mako:35
msgid "Multimodal Information Services"
msgstr "Services d'information multimodale"
......@@ -501,37 +501,45 @@ msgstr "Indicateurs par départements"
msgid "Transport Offers"
msgstr "Offres de transport"
#: passim/templates/site.mako:142
msgid "Thanks for signalling us any erroneous, missing or incomplete info"
msgstr "Une info manquante, erronée ou incomplète ? Merci de nous la signaler"
#: passim/templates/site.mako:148
msgid "Back-office access"
msgstr "Accès back-office"
msgid "More details (back-office)"
msgstr "Fiche détaillée (back-office)"
#: passim/templates/territories.mako:21
msgid "Information Services for whole France"
msgstr "Service d'information couvrant toute la France"
#: passim/templates/territories.mako:20
#: passim/templates/territories.mako:23
msgid "Traveler Info Services List For"
msgstr "Service d'information de transport pour"
#: passim/templates/territories.mako:40 passim/templates/territories.mako:49
#: passim/templates/territories.mako:75 passim/templates/territories.mako:85
#: passim/templates/territories.mako:112 passim/templates/territories.mako:122
#: passim/templates/territories.mako:149 passim/templates/territories.mako:159
#: passim/templates/territories.mako:186 passim/templates/territories.mako:197
#: passim/templates/territories.mako:44 passim/templates/territories.mako:53
#: passim/templates/territories.mako:79 passim/templates/territories.mako:89
#: passim/templates/territories.mako:116 passim/templates/territories.mako:126
#: passim/templates/territories.mako:153 passim/templates/territories.mako:163
#: passim/templates/territories.mako:192 passim/templates/territories.mako:203
msgid "Web Site"
msgstr "Web Site"
#: passim/templates/territories.mako:66
#: passim/templates/territories.mako:70
msgid "Local Interest Traveler Info Services"
msgstr "Information d'intérêt local"
#: passim/templates/territories.mako:103
#: passim/templates/territories.mako:107
msgid "Departmental Interest Traveler Info Services"
msgstr "Information d'intérêt départemental"
#: passim/templates/territories.mako:140
#: passim/templates/territories.mako:144
msgid "Regional Interest Traveler Info Services"
msgstr "Information d'intérêt régional"
#: passim/templates/territories.mako:177
#: passim/templates/territories.mako:182
msgid "National Information"
msgstr "Information national"
msgstr "Information d'intérêt national"
#: passim/templates/maps/dep.mako:11
msgid "PASSIM : Indicators by département"
......@@ -809,3 +817,6 @@ msgstr "Indicateurs par régions"
#: passim/views/maps.py:54
msgid "a map of multimodale info systems (MIS) in France"
msgstr "Carte des services d'info multimodale (SIM) en France métropolitaine"
#~ msgid "Back-office access"
#~ msgstr "Accès back-office"
......@@ -139,13 +139,13 @@ from passim.resources import UsersResource
% if route_name.startswith('organisms'):
<%include file="contribute-form.mako" args="subject=subject, body=body"/>
<p class="pull-right contribute-text">
<a class="label label-info modal-trigger" href="#contribute-modal">${_(u"Contribute")}</a>
<a class="label label-info modal-trigger" href="#contribute-modal">${_(u"Thanks for signalling us any erroneous, missing or incomplete info")}</a>
% if isinstance(id, unicode):
<a href="${request.registry.settings['petitpois_url']}/poi/view/${id}" target="_blank">
<a href="${request.registry.settings['petitpois_url']}poi/view/${id}" target="_blank">
% else:
<a href="${request.registry.settings['petitpois_url']}" target="_blank">
% endif
${_(u"Back-office access")}
${_(u"More details (back-office)")}
</a>
</p>
% endif
......
......@@ -17,7 +17,11 @@ ${parent.search_bar()}
% if error:
${error}
% else:
${_(u'Traveler Info Services List For')} « ${full_name} »
% if full_name == "France":
${_(u'Information Services for whole France')}
% else:
${_(u'Traveler Info Services List For')} « ${full_name} »
% endif
% endif
<span class="pull-right">
<a class="btn btn-default btn-sm" href="${request.route_path('territories', type='pays', name='france')}" rel="tooltip" title="${_('Search services for whole France')}">France</a>
......@@ -53,7 +57,7 @@ ${parent.search_bar()}
</td>
<td>
% for offre in multimodal["transport_type"]:
<a href="#" rel="tooltip" title="${offre}"><img alt="${offre}" src="${request.static_path('passim:static/img/types-de-transports/' + offre + '.png')}"></a>
<a href="#" rel="tooltip" title="${offre}"><img alt="${offre}" src="${request.static_path('passim:static/img/types-de-transports/' + offre + '.png')}"></a>
% endfor
</td>
</tr>
......@@ -89,7 +93,7 @@ ${parent.search_bar()}
</td>
<td>
% for offre in local["transport_type"]:
<a href="#" rel="tooltip" title="${offre}"><img alt="${offre}" src="${request.static_path('passim:static/img/types-de-transports/' + offre + '.png')}"></a>
<a href="#" rel="tooltip" title="${offre}"><img alt="${offre}" src="${request.static_path('passim:static/img/types-de-transports/' + offre + '.png')}"></a>
% endfor
</td>
% endif
......@@ -163,7 +167,7 @@ ${parent.search_bar()}
</td>
<td>
% for offre in regional["transport_type"]:
<a href="#" rel="tooltip" title="${offre}"><img alt="${offre}" src="${request.static_path('passim:static/img/types-de-transports/' + offre + '.png')}"></a>
<a href="#" rel="tooltip" title="${offre}"><img alt="${offre}" src="${request.static_path('passim:static/img/types-de-transports/' + offre + '.png')}"></a>
% endfor
</td>
% endif
......@@ -174,7 +178,9 @@ ${parent.search_bar()}
% endif
% if len(result["national"]) > 0:
% if full_name != "France":
<h4>${_("National Information")}</h4>
% endif
<table class="table table-bordered table-condensed table-hover table-responsive">
<colgroup>
<col class="col-md-1">
......@@ -201,7 +207,7 @@ ${parent.search_bar()}
</td>
<td>
% for offre in national["transport_type"]:
<a href="#" rel="tooltip" title="${offre}"><img alt="${offre}" src="${request.static_path('passim:static/img/types-de-transports/' + offre + '.png')}"></a>
<a href="#" rel="tooltip" title="${offre}"><img alt="${offre}" src="${request.static_path('passim:static/img/types-de-transports/' + offre + '.png')}"></a>
% endfor
</td>
</tr>
......
......@@ -274,7 +274,7 @@ def organisms(request):
id=id,
result=parse_result,
success_message=None,
subject=_(u'Contribution to PASSIM : [{0}]'),
subject=_(u'Contribution to PASSIM : [{0}]').format(parse_result["name"]),
body=_(u'''Your are [an end-user, a company...]
Your e-mail address: [xxx@yyy.org]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment