diff options
34 files changed, 96 insertions, 197 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 8883bb91f..5e0bbaf93 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -191,6 +191,8 @@ sub setup_request { $c->log->debug( sprintf "Set lang to '%s' and cobrand to '%s'", $set_lang, $cobrand->moniker ); + $c->stash->{site_name} = Utils::trim_text($c->render_fragment('site-name.html')); + $c->model('DB::Problem')->set_restriction( $cobrand->site_key() ); Memcached::set_namespace( FixMyStreet->config('FMS_DB_NAME') . ":" ); diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 315a5436c..279994e47 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -112,10 +112,9 @@ sub load_problem_or_display_error : Private { ); } elsif ( $problem->non_public ) { if ( !$c->user || $c->user->id != $problem->user->id ) { - my $site_name = Utils::trim_text($c->render_fragment('site-name.html')); $c->detach( '/page_error_403_access_denied', - [ sprintf(_('That report cannot be viewed on %s.'), $site_name) ] # + [ sprintf(_('That report cannot be viewed on %s.'), $c->stash->{site_name}) ] ); } } diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm index da549ece8..9cc571efc 100644 --- a/perllib/FixMyStreet/App/View/Web.pm +++ b/perllib/FixMyStreet/App/View/Web.pm @@ -40,15 +40,15 @@ TT View for FixMyStreet::App. =head2 loc - [% loc('Some text to localize') %] + [% loc('Some text to localize', 'Optional comment for translator') %] Passes the text to the localisation engine for translations. =cut sub loc { - my ( $self, $c, @args ) = @_; - return _(@args); + my ( $self, $c, $msgid ) = @_; + return _($msgid); } =head2 nget diff --git a/templates/web/arreglamibarrio/faq/faq-es.html b/templates/web/arreglamibarrio/faq/faq-es.html index 3d5397380..b9ab9842e 100644 --- a/templates/web/arreglamibarrio/faq/faq-es.html +++ b/templates/web/arreglamibarrio/faq/faq-es.html @@ -4,18 +4,18 @@ <ul class="plain-list">
<li><strong>Preguntas frecuentes</strong></li>
<li><a href="/privacy">Privacidad y cookies</a></li>
-<li><a href="/contact">Contacto [% PROCESS 'site-name.html' -%]</a></li>
+<li><a href="/contact">Contacto [% site_name %]</a></li>
</ul>
</aside>
</div>
<h1><a name="faq"></a>Preguntas frecuentes</h1>
<dl>
<dt>¿Qué es este sitio?</dt>
-<dd>[% PROCESS 'site-name.html' -%] es un sitio para ayudar a las personas a informar a su Administración local sobre averías o mal estado de nuestro espacio urgano, simplemente localizandolo en un mapa.</dd>
-<dt>¿Como puedo ponerme en contacto con [% PROCESS 'site-name.html' -%]?</dt>
+<dd>[% site_name %] es un sitio para ayudar a las personas a informar a su Administración local sobre averías o mal estado de nuestro espacio urgano, simplemente localizandolo en un mapa.</dd>
+<dt>¿Como puedo ponerme en contacto con [% site_name %]?</dt>
<dd>Esta es nuestra <a href="/contact">pagina de contacto</a>.</dd>
-<dt>¿Que tipo de problemas puedo notificar con [% PROCESS 'site-name.html' -%]?</dt>
-<dd>Esto depende de la finalidad de [% PROCESS 'site-name.html' -%];
+<dt>¿Que tipo de problemas puedo notificar con [% site_name %]?</dt>
+<dd>Esto depende de la finalidad de [% site_name %];
en el Reino Unido, FixMyStreet es principalmente para informar cosas que están rotas o sucias o dañadas o desechadas y hay que arreglar, de limpieza o de compensación, tales como:
<dl>
<dt>- vehículos abandonados<br>
@@ -29,9 +29,9 @@ <dd></dd>
</dl>
</dd>
-<dt>¿Para que NO es [% PROCESS 'site-name.html' -%] ?</dt>
+<dt>¿Para que NO es [% site_name %] ?</dt>
<dd> </dd>
-<dd>[% PROCESS 'site-name.html' -%] no debe usarse para ponerse en contacto con el Ayuntamiento para todas las incidencias - por favor utilice este sitio sólo para problemas como los anteriores. A menudo los informes de problemas siguen una burocracia y utilizar este sitio para asuntos urgentes pueden retrasarse en llegar al departamento correcto. Usted tendrá que ponerse en contacto con su autoridad directamente ante problemas como:
+<dd>[% site_name %] no debe usarse para ponerse en contacto con el Ayuntamiento para todas las incidencias - por favor utilice este sitio sólo para problemas como los anteriores. A menudo los informes de problemas siguen una burocracia y utilizar este sitio para asuntos urgentes pueden retrasarse en llegar al departamento correcto. Usted tendrá que ponerse en contacto con su autoridad directamente ante problemas como:
<ul>
<li>Comportamientos anti-sociales.
<li>Cualquier problema de urgencia o emergencias
@@ -51,25 +51,25 @@ <dd>Según los informes, se envía un correo electrónico al departamento pertinente. A partir de ese momento puede resolver el problema como normalmente lo haría. Alternativamente, se puede discutir el problema en el sitio web con los demás, y luego juntos requerir al Ayuntamiento que lo arregle, o fijarlo directamente en la web.</dd>
<dt>¿Es grátis? </dt>
<dd>Efectivamente el sitio es de uso gratuito. La plataforma arreglamibarrio.org es mantenido por la Asociación Observatorio Ciudadano Municipal de Alcantarilla, asociación sin ánimo de lucro registrada, así que si usted desea hacer una contribución puede hacerla.</dd>
-<dt>¿Puedo usar [% PROCESS 'site-name.html' -%] con mi móvil?</dt>
+<dt>¿Puedo usar [% site_name %] con mi móvil?</dt>
<dd>
-<p> [% PROCESS 'site-name.html' -%] la web funciona en su teléfono móvil, tiene un diseño "responsive" que se adapta al tamaño de su pantalla de forma automática.</p>
+<p> [% site_name %] la web funciona en su teléfono móvil, tiene un diseño "responsive" que se adapta al tamaño de su pantalla de forma automática.</p>
</dd>
</dl>
<h2><a name="practical"></a>Cuestiones prácticas </h2>
<dl>
<dt>Pertenezco a un Ayuntamiento, ¿dónde envían sus incidencias?</dt>
<dd>Usted puede crear una incidencia de prueba o contactarnos para saber dónde van los informes. Puede contactar con nosotros para actualizar la dirección o direcciones que utilizamos.</dd>
-<dt>Pertenezco a un Ayuntamiento, ¿podríamos tener [% PROCESS 'site-name.html' -%]
+<dt>Pertenezco a un Ayuntamiento, ¿podríamos tener [% site_name %]
en nuestra web?</dt>
<dd>Es posible, pongase en contacto con nosotros y lo estudiaremos </dd>
<dt>¿Eliminan contenido ilegal u ofensivo? </dt>
-<dd>[% PROCESS 'site-name.html' -%] no es responsable de el contenido o exactitud del material presentado por sus usuarios. Nos reservamos el derecho de editar o eliminar cualquier problema o actualizaciones que consideremos inadecuadas.</dd>
+<dd>[% site_name %] no es responsable de el contenido o exactitud del material presentado por sus usuarios. Nos reservamos el derecho de editar o eliminar cualquier problema o actualizaciones que consideremos inadecuadas.</dd>
<dt>¿Porque no puedo alejar más el zoom del mapa?</dt>
-<dd>Intentamos mantener a [% PROCESS 'site-name.html' -%] centrado en la localidad, por lo que restringimos el movimiento a las zonas cubiertas. El mapa le permitirá ver todos los informes que ha realizado, estén donde estén. Si usted es del Ayuntamiento, el correo electrónico de la incidencia también podría contener la ruta más cercana al pin en el mapa.</dd>
+<dd>Intentamos mantener a [% site_name %] centrado en la localidad, por lo que restringimos el movimiento a las zonas cubiertas. El mapa le permitirá ver todos los informes que ha realizado, estén donde estén. Si usted es del Ayuntamiento, el correo electrónico de la incidencia también podría contener la ruta más cercana al pin en el mapa.</dd>
<h2><a name="organisation"></a>Preguntas a la organización </h2>
<dl>
-<dt>¿Quién hizo [% PROCESS 'site-name.html' -%]?</dt>
+<dt>¿Quién hizo [% site_name %]?</dt>
<dd>La plataforma fue creada por mysociety.
<dt>¿Necesita ayuda con el proyecto? </dt>
<dd>Sí, toda ayuda, técnica o no técnica será bienvenida. Por favor, consulte nuestra página de participación.</dd>
diff --git a/templates/web/base/admin/config_page.html b/templates/web/base/admin/config_page.html index 7c9b5e317..71c524fb3 100644 --- a/templates/web/base/admin/config_page.html +++ b/templates/web/base/admin/config_page.html @@ -42,7 +42,7 @@ running version <strong>[% git_version || 'unknown' %]</strong>. [% INCLUDE subsection heading="Display" %] <tr> <td>Site title</td> - <td colspan=2>[% PROCESS 'site-name.html' -%]</td> + <td colspan=2>[% site_name %]</td> </tr> [% allowed_conf = FOR k IN c.config.ALLOWED_COBRANDS %] [% IF k.keys %][% k.items.join(':') %][% ELSE %][% k %][% END %] diff --git a/templates/web/base/admin/header.html b/templates/web/base/admin/header.html index 6282bf383..145bb986d 100644 --- a/templates/web/base/admin/header.html +++ b/templates/web/base/admin/header.html @@ -7,7 +7,7 @@ dd { margin-left: 8em; } select { width: auto; } </style> - <p><strong>[% loc('FixMyStreet admin:') %]</strong> + <p><strong>[% tprintf(loc('%s admin:', "%s here is the site name"), site_name) %]</strong> [%- FOREACH link IN allowed_links %] <a href="[% c.uri_for( link ) %]">[% allowed_pages.$link.0 %]</a> [% IF NOT loop.last %]|[% END %] diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html index a68df01d9..8c49a5685 100644 --- a/templates/web/base/admin/index.html +++ b/templates/web/base/admin/index.html @@ -2,7 +2,7 @@ [% PROCESS 'admin/report_blocks.html' %] <div class="fms-admin-info fms-admin-floated"> -This is the administration interface for [% PROCESS 'site-name.html' -%]. If you +This is the administration interface for [% site_name %]. If you need any help or guidance, there is <a href="http://fixmystreet.org/">plenty of online documentation</a>. The FixMyStreet Platform is <a href="https://github.com/mysociety/fixmystreet">actively supported</a> by diff --git a/templates/web/base/alert/_list.html b/templates/web/base/alert/_list.html index 2ffcfae39..395948248 100644 --- a/templates/web/base/alert/_list.html +++ b/templates/web/base/alert/_list.html @@ -1,11 +1,13 @@ <input type="hidden" name="type" value="local"> <input type="hidden" name="pc" value="[% pc | html %]"> + <input type="hidden" name="latitude" value="[% latitude | html %]"> + <input type="hidden" name="longitude" value="[% longitude | html %]"> <p> [% IF pretty_pc %] [% tprintf( loc('Here are the types of local problem alerts for ‘%s’.'), pretty_pc ) %] [% END %] - [% loc('Select which type of alert you\'d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert.') %] + [% loc('Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert.') %] </p> [% INCLUDE 'errors.html' %] @@ -16,14 +18,15 @@ <p id="rss_local"> <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> - <label for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> - [% loc('(a default distance which covers roughly 200,000 people)') %] <a href='[% rss_feed_uri %]'> - <img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> + <label class="inline" for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> + <a href='[% rss_feed_uri %]'><img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> + <br /> + [% loc('(a default distance which covers roughly 200,000 people)') %] </p> <p id="rss_local_alt"> - [% loc('(alternatively the RSS feed can be customised, within') %] - <a href="[% rss_feed_2k %]">2km</a> / <a href="[% rss_feed_5k %]">5km</a> / <a href="[% rss_feed_10k %]">10km</a> / <a href="[% rss_feed_20k %]">20km</a>) + [% SET distance_options = '<a href="' _ rss_feed_2k _ ' ">2km</a> / <a href="' _ rss_feed_5k _ ' ">5km</a> / <a href="' _ rss_feed_10k _ '">10km</a> / <a href="' _ rss_feed_20k _ '">20km</a>' %] + [% tprintf(loc('(alternatively the RSS feed can be customised, within %s)', "%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]"), distance_options) %] </p> <p> @@ -35,21 +38,20 @@ </p> [% IF reported_to_options %] - <div id="rss_list"> <p><strong> [% loc('Problems within the boundary of:') %] </strong></p> <ul class="plain-list"> [% ELSE %] - <div><ul id="rss_feed"> + <ul id="rss_feed" class="plain-list"> [% END %] [% FOREACH option IN options %] <li[% IF ! (loop.count % 2) %] class="a"[% END %]> <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <label class="inline" for="[% option.id %]">[% option.text %]</label> <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" title="[% option.rss_text %]" alt="RSS feed" border="0"></a> + <label class="inline" for="[% option.id %]">[% option.text %]</label> </li> [% END %] </ul> @@ -61,40 +63,31 @@ title="[% option.rss_text %]" alt="RSS feed" border="0"></a> [% FOREACH option IN reported_to_options %] <li[% IF ! (loop.count % 2) %] class="a"[% END %]> <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <label class="inline" for="[% option.id %]">[% option.text %]</label> <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" title="[% option.rss_text %]" alt="RSS feed" border="0"></a> + <label class="inline" for="[% option.id %]">[% option.text %]</label> </li> [% END %] </ul> <p><small> - [% loc( 'FixMyStreet sends different categories of problem + [% tprintf(loc('%s sends different categories of problem to the appropriate council, so problems within the boundary of a particular council might not match the problems sent to that council. For example, a graffiti report will be sent to the district council, so will appear in both of the district council’s alerts, but will only appear in the "Within the boundary" alert -for the county council.' ) %] +for the county council.', "%s is the site name"), site_name) %] </small></p> -</div> -<div id="rss_buttons"> [% END %] - <p> - <input type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> - <p> + <input id="alert_rss_button" class="green-btn" type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> <p id="alert_or"> [% loc('or') %] </p> [% UNLESS c.user_exists %] - <p> - [% loc('Your email:') %] <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]" size="30"> - </p> + <label for="rznvy">[% loc('Your email') %]</label> + <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]"> [% END %] - - <p> - <input type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> - </p> - </div> <!-- ???? --> + <input id="alert_email_button" style="margin-top:1em;" class="green-btn" type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> diff --git a/templates/web/base/alert/index.html b/templates/web/base/alert/index.html index d0aab1a86..2b12182df 100644 --- a/templates/web/base/alert/index.html +++ b/templates/web/base/alert/index.html @@ -4,13 +4,13 @@ <p> [% IF c.cobrand.is_council %] -FixMyStreet has a variety of RSS feeds and email alerts for local problems, including -alerts for all problems within a particular ward, or all problems -within a certain distance of a particular location. +[% tprintf(loc('%s has a variety of RSS feeds and email alerts for local +problems, including alerts for all problems within a particular ward, or all +problems within a certain distance of a particular location.', "%s is the site name"), site_name) %] [% ELSE %] -[% loc('FixMyStreet has a variety of RSS feeds and email alerts for local problems, including +[% tprintf(loc('%s has a variety of RSS feeds and email alerts for local problems, including alerts for all problems within a particular ward or council, or all problems -within a certain distance of a particular location.') %] +within a certain distance of a particular location.', "%s is the site name"), site_name) %] [% END %] </p> @@ -22,7 +22,7 @@ within a certain distance of a particular location.') %] <p> [% IF c.cobrand.is_council %] -To find out what local alerts we have for you, please enter your [% c.cobrand.council_area %] postcode or street name and area: +[% tprintf(loc('To find out what local alerts we have for you, please enter your %s postcode or street name and area:'), c.cobrand.council_area) %] [% ELSE %] [% loc('To find out what local alerts we have for you, please enter your postcode or street name and area' ) %] [% END %] diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html index 3f4ec8881..d38ae6754 100755 --- a/templates/web/base/around/display_location.html +++ b/templates/web/base/around/display_location.html @@ -30,7 +30,7 @@ PROCESS "maps/${map.type}.html" around_page = 1; SET bodyclass = 'mappage'; - SET rss = [ loc('Recent local problems, FixMyStreet'), rss_url ] IF c.cobrand.moniker != 'emptyhomes'; + SET rss = [ tprintf(loc('Recent local problems, %s', "%s is the site name"), site_name), rss_url ] IF c.cobrand.moniker != 'emptyhomes'; INCLUDE 'header.html', title => loc('Viewing a location') robots => 'noindex,nofollow'; diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index 4c9a59350..7efef4f6b 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -28,11 +28,7 @@ <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]"> <div id="form_sign_in"> - [% IF c.cobrand.moniker == 'fixmybarangay' %] - <h3>[% loc("Do you have a FixMyBarangay password?") %]</h3> - [% ELSE %] - <h3>[% loc("Do you have a FixMyStreet password?") %]</h3> - [% END %] + <h3>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h3> <div id="form_sign_in_yes" class="form-box"> <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5> diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html index 16098b7f5..0ad3ffb5f 100644 --- a/templates/web/base/common_header_tags.html +++ b/templates/web/base/common_header_tags.html @@ -42,5 +42,5 @@ <title> [% "$title :: " | html IF title %] - [% PROCESS 'site-name.html' -%] + [% site_name -%] </title> diff --git a/templates/web/base/contact/blurb.html b/templates/web/base/contact/blurb.html index 22c9a3cef..463813449 100644 --- a/templates/web/base/contact/blurb.html +++ b/templates/web/base/contact/blurb.html @@ -1,6 +1,6 @@ <p> [% loc('Please do <strong>not</strong> report problems through this form; messages go to -the team behind FixMyStreet, not a council. To report a problem, +the team behind this site, not a council. To report a problem, please <a href="/">go to the front page</a> and follow the instructions.') %] </p> diff --git a/templates/web/base/faq/faq-en-gb.html b/templates/web/base/faq/faq-en-gb.html index e1e07a8d7..b60f1102a 100755 --- a/templates/web/base/faq/faq-en-gb.html +++ b/templates/web/base/faq/faq-en-gb.html @@ -3,27 +3,27 @@ <div class="sticky-sidebar"> <aside> <ul class="plain-list"> - <li><strong>Frequently Asked Questions</strong></li> - <li><a href="/privacy">Privacy and cookies</a></li> - <li><a href="/contact">Contact [% PROCESS 'site-name.html' -%]</a></li> + <li><strong>[% loc('Frequently Asked Questions') %]</strong></li> + <li><a href="/privacy">[% loc('Privacy and cookies') %]</a></li> + <li><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</a></li> </ul> </aside> </div> -<h1><a name="faq"></a>Frequently Asked Questions</h1> +<h1><a name="faq"></a>[% loc('Frequently Asked Questions') %]</h1> <dl> <dt>What is this site?</dt> - <dd>[% PROCESS 'site-name.html' -%] is a site to help people report to their + <dd>[% site_name %] is a site to help people report to their local authority, view, or discuss local issues they’ve found, by simply locating them on a map.</dd> - <dt>How do I get in touch with [% PROCESS 'site-name.html' -%]?</dt> + <dt>How do I get in touch with [% site_name %]?</dt> <dd>Here’s our <a href="/contact">contact page</a>.</dd> - <dt>What sort of problems should I report with [% PROCESS 'site-name.html' -%]?</dt> - <dd>This depends upon the precise purpose of [% PROCESS 'site-name.html' -%]; + <dt>What sort of problems should I report with [% site_name %]?</dt> + <dd>This depends upon the precise purpose of [% site_name %]; in the UK, FixMyStreet is primarily for reporting things which are <strong>broken or dirty or damaged or dumped, and need fixing, cleaning or clearing</strong>, such as: @@ -38,8 +38,8 @@ </ul> </dd> - <dt>What isn’t [% PROCESS 'site-name.html' -%] for?</dt> - <dd>[% PROCESS 'site-name.html' -%] is not a way of getting in touch with your + <dt>What isn’t [% site_name %] for?</dt> + <dd>[% site_name %] is not a way of getting in touch with your authority for all issues – please use this site only for problems such as the above. We often route problem reports via cleansing services or highways and so using this site for other matters may result in a delay in @@ -75,9 +75,9 @@ a registered charity, so if you want to make a contribution, <a href="https://www.mysociety.org/donate/">please do</a>.</dd> - <dt>Can I use [% PROCESS 'site-name.html' -%] on my mobile?</dt> + <dt>Can I use [% site_name %] on my mobile?</dt> <dd> - <p>The [% PROCESS 'site-name.html' -%] website will already work on your mobile + <p>The [% site_name %] website will already work on your mobile phone, adapting to the size of your screen automatically.</p> </dd> </dl> @@ -90,18 +90,18 @@ to find out where reports go at the moment. Also <a href="/contact">contact us</a> to update the address or addresses we use.</dd> - <dt>I’m from an authority, can we have [% PROCESS 'site-name.html' -%] + <dt>I’m from an authority, can we have [% site_name %] on our website?</dt> <dd>Quite possibly – contact the people who run this site.</dd> <dt>Do you remove silly or illegal content?</dt> - <dd>[% PROCESS 'site-name.html' -%] is not responsible for the content and + <dd>[% site_name %] is not responsible for the content and accuracy of material submitted by its users. We reserve the right to edit or remove any problems or updates which we consider to be inappropriate upon being informed by a user of the site.</dd> <dt>Why can’t I zoom out more on the reporting map?</dt> - <dd>We want to keep [% PROCESS 'site-name.html' -%] locally focused, so restrict + <dd>We want to keep [% site_name %] locally focused, so restrict the ability to move radically between areas. The map on Your Reports will let you see all the reports you’ve made, wherever they are. If you’re from the authority then the emailed version of the problem @@ -111,7 +111,7 @@ to update the address or addresses we use.</dd> <h2><a name="organisation"></a>Organisation Questions</h2> <dl> - <dt>Who built [% PROCESS 'site-name.html' -%]?</dt> + <dt>Who built [% site_name %]?</dt> <dd>This will depend upon the installation of the FixMyStreet Platform, who should create their own <code>faq/</code> template in their cobrand directory to replace this default one. The FixMyStreet Platform was diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html index a58a3e696..102aacd25 100644 --- a/templates/web/base/footer.html +++ b/templates/web/base/footer.html @@ -21,7 +21,7 @@ <div id="footer"> - <p><a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', ' ') %]</a></p> + <p><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) | replace(' ', ' ') %]</a></p> <p>[% loc('Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?') %] [% loc('Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %] diff --git a/templates/web/base/open311/index.html b/templates/web/base/open311/index.html index 502b1a69a..d42cc2106 100644 --- a/templates/web/base/open311/index.html +++ b/templates/web/base/open311/index.html @@ -3,9 +3,9 @@ <div class="sticky-sidebar"> <aside> <ul class="plain-list"> - <li><a href="/faq">Frequently Asked Questions</a></li> - <li><a href="/privacy">Privacy and cookies</a></li> - <li><a href="/contact">Contact FixMyStreet</a></li> + <li><a href="/faq">[% loc('Frequently Asked Questions') %]</a></li> + <li><a href="/privacy">[% loc('Privacy and cookies') %]</a></li> + <li><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</a></li> </ul> </aside> </div> diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html index 0731d9f0e..329614488 100644 --- a/templates/web/base/report/display.html +++ b/templates/web/base/report/display.html @@ -2,7 +2,7 @@ PROCESS "maps/${map.type}.html"; problem_title = problem.title_safe _ ' - ' _ loc('Viewing a problem'); - SET rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] IF c.cobrand.moniker != 'emptyhomes'; + SET rss = [ tprintf(loc('Updates to this problem, %s', "%s is the site name"), site_name), "/rss/$problem.id" ] IF c.cobrand.moniker != 'emptyhomes'; SET robots = 'index, nofollow'; SET robots = 'noindex, nofollow' IF c.cobrand.moniker == 'emptyhomes'; INCLUDE 'header.html' diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html index d1431ffd3..ee219d563 100644 --- a/templates/web/base/report/new/fill_in_details_form.html +++ b/templates/web/base/report/new/fill_in_details_form.html @@ -110,7 +110,8 @@ [% INCLUDE 'report/new/notes.html' %] <div id="form_sign_in"> - <h3>[% loc("Now to submit your report… do you have a FixMyStreet password?") %]</h3> + <h3>[% loc("Now to submit your report…") %]</h3> + <h2>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h2> <div id="form_sign_in_yes"> diff --git a/templates/web/base/report/update-form.html b/templates/web/base/report/update-form.html index 4e762a9a5..3115855d3 100644 --- a/templates/web/base/report/update-form.html +++ b/templates/web/base/report/update-form.html @@ -83,7 +83,8 @@ </div> <div id="form_sign_in"> - <h3>[% loc("Now to submit your update… do you have a FixMyStreet password?") %]</h3> + <h3>[% loc("Now to submit your update…") %]</h3> + <h2>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h2> <div id="form_sign_in_yes"> diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html index b98c5bec6..ffb5d8838 100755 --- a/templates/web/base/reports/body.html +++ b/templates/web/base/reports/body.html @@ -21,7 +21,7 @@ SET bodyclass = 'mappage'; INCLUDE 'header.html', title = tprintf(loc('%s - Summary reports'), name) - rss = [ tprintf(loc('Problems within %s, FixMyStreet'), name), rss_url ] + rss = [ tprintf(loc('Problems within %s, %s', "First %s is the body name, second %s the site name"), name, site_name), rss_url ] %] [% map_html %] diff --git a/templates/web/base/static/privacy.html b/templates/web/base/static/privacy.html index 36720207b..11ab65311 100755 --- a/templates/web/base/static/privacy.html +++ b/templates/web/base/static/privacy.html @@ -1,13 +1,13 @@ [% INCLUDE 'header.html', - title = loc('Frequently Asked Questions'), + title = loc('Privacy and cookies'), bodyclass = 'twothirdswidthpage' %] <div class="sticky-sidebar"> <aside> <ul class="plain-list"> - <li><a href="/faq">Frequently Asked Questions</a></li> - <li><strong>Privacy and cookies</strong></li> - <li><a href="/contact">Contact [% PROCESS 'site-name.html' -%]</a></li> + <li><a href="/faq">[% loc('Frequently Asked Questions') %]</a></li> + <li><a href="/privacy">[% loc('Privacy and cookies') %]</a></li> + <li><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</a></li> </ul> </aside> </div> diff --git a/templates/web/bromley/header_logo.html b/templates/web/bromley/header_logo.html index 8d1fa7855..92ff771f9 100644 --- a/templates/web/bromley/header_logo.html +++ b/templates/web/bromley/header_logo.html @@ -1,5 +1,5 @@ <div class="bromley-header cf"> - <a href="http://www.bromley.gov.uk/" id="site-logo">[%- PROCESS 'site-name.html' -%]</a> + <a href="http://www.bromley.gov.uk/" id="site-logo">[% site_name %]</a> <ul class="linear-links subtext float-right top-links"> <li class="first-child"><i class="fa fa-home"></i><a href="http://www.bromley.gov.uk">Home</a></li> @@ -59,4 +59,4 @@ <li class="current"><span>FixMyStreet</span></li> </ul> <!-- END Breadcrumb --><!-- googleon:all --> - </div>
\ No newline at end of file + </div> diff --git a/templates/web/fixmystreet/alert/_list.html b/templates/web/fixmystreet/alert/_list.html deleted file mode 100644 index f376e3c66..000000000 --- a/templates/web/fixmystreet/alert/_list.html +++ /dev/null @@ -1,93 +0,0 @@ - <input type="hidden" name="type" value="local"> - <input type="hidden" name="pc" value="[% pc | html %]"> - <input type="hidden" name="latitude" value="[% latitude | html %]"> - <input type="hidden" name="longitude" value="[% longitude | html %]"> - - <p> - [% IF pretty_pc %] - [% tprintf( loc('Here are the types of local problem alerts for ‘%s’.'), pretty_pc ) %] - [% END %] - [% loc('Select which type of alert you\'d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert.') %] - </p> - - [% INCLUDE 'errors.html' %] - - <p> - [% loc('The simplest alert is our geographic one:') %] - </p> - - <p id="rss_local"> - <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> - <label class="inline" for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> - <a href='[% rss_feed_uri %]'><img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> - <br /> - [% loc('(a default distance which covers roughly 200,000 people)') %] - </p> - - <p id="rss_local_alt"> - [% loc('(alternatively the RSS feed can be customised, within') %] - <a href="[% rss_feed_2k %]">2km</a> / <a href="[% rss_feed_5k %]">5km</a> / <a href="[% rss_feed_10k %]">10km</a> / <a href="[% rss_feed_20k %]">20km</a>) - </p> - - <p> - [% IF c.cobrand.is_council %] - Or you can subscribe to an alert for all council problems or one based upon what ward you’re in: - [% ELSE %] - [% loc("Or you can subscribe to an alert based upon what ward or council you’re in:") %] - [% END %] - </p> - - [% IF reported_to_options %] - <p><strong> - [% loc('Problems within the boundary of:') %] - </strong></p> - <ul class="plain-list"> - [% ELSE %] - <ul id="rss_feed" class="plain-list"> - [% END %] - - [% FOREACH option IN options %] - <li[% IF ! (loop.count % 2) %] class="a"[% END %]> - <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" -title="[% option.rss_text %]" alt="RSS feed" border="0"></a> - <label class="inline" for="[% option.id %]">[% option.text %]</label> - </li> - [% END %] -</ul> - [% IF reported_to_options %] - <p><strong> - [% loc('Or problems reported to:') %] - </strong></p> - <ul class="plain-list"> - [% FOREACH option IN reported_to_options %] - <li[% IF ! (loop.count % 2) %] class="a"[% END %]> - <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" - title="[% option.rss_text %]" alt="RSS feed" border="0"></a> - <label class="inline" for="[% option.id %]">[% option.text %]</label> - </li> - [% END %] - </ul> - <p><small> - [% loc( 'FixMyStreet sends different categories of problem -to the appropriate council, so problems within the boundary of a particular council -might not match the problems sent to that council. For example, a graffiti report -will be sent to the district council, so will appear in both of the district -council’s alerts, but will only appear in the "Within the boundary" alert -for the county council.' ) %] - </small></p> - [% END %] - - <input id="alert_rss_button" class="green-btn" type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> - - <p id="alert_or"> - [% loc('or') %] - </p> - - [% UNLESS c.user_exists %] - <label for="rznvy">[% loc('Your email') %]</label> - <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]"> - [% END %] - <input id="alert_email_button" style="margin-top:1em;" class="green-btn" type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> - diff --git a/templates/web/fixmystreet/contact/blurb.html b/templates/web/fixmystreet/contact/blurb.html index 21a4ae715..3f9e88ed0 100644 --- a/templates/web/fixmystreet/contact/blurb.html +++ b/templates/web/fixmystreet/contact/blurb.html @@ -10,6 +10,6 @@ <p> [% loc('Please do <strong>not</strong> report problems through this form; messages go to -the team behind FixMyStreet, not a council. To report a problem, +the team behind this site, not a council. To report a problem, please <a href="/">go to the front page</a> and follow the instructions.') %] </p> diff --git a/templates/web/fixmystreet/contact/index.html b/templates/web/fixmystreet/contact/index.html index 92f2451ef..96ff7643d 100644 --- a/templates/web/fixmystreet/contact/index.html +++ b/templates/web/fixmystreet/contact/index.html @@ -7,9 +7,9 @@ <div class="sticky-sidebar"> <aside> <ul class="plain-list"> - <li><a href="/faq">Frequently Asked Questions</a></li> - <li><a href="/privacy">Privacy and cookies</a></li> - <li><strong>Contact FixMyStreet</strong></li> + <li><a href="/faq">[% loc('Frequently Asked Questions') %]</a></li> + <li><a href="/privacy">[% loc('Privacy and cookies') %]</a></li> + <li><strong>[% tprintf(loc("Contact %s", "%s is the site name"), site_name) %]</strong></li> </ul> </aside> </div> diff --git a/templates/web/fixmystreet/front/footer-marketing.html b/templates/web/fixmystreet/front/footer-marketing.html index 249dbca8d..c0c9b4168 100644 --- a/templates/web/fixmystreet/front/footer-marketing.html +++ b/templates/web/fixmystreet/front/footer-marketing.html @@ -9,7 +9,7 @@ <div id="footer-help"> <p> - Powered by <a class="platform-logo" href="http://fixmystreet.org/">FixMyStreet Platform</a> + [% loc('Powered by <a class="platform-logo" href="http://fixmystreet.org/">FixMyStreet Platform</a>') %] </p> <ul> <li> diff --git a/templates/web/fixmystreet/header_logo.html b/templates/web/fixmystreet/header_logo.html index 3ae706730..8ab06c936 100644 --- a/templates/web/fixmystreet/header_logo.html +++ b/templates/web/fixmystreet/header_logo.html @@ -1,2 +1,2 @@ - <a href="/" id="site-logo">[%- PROCESS 'site-name.html' -%]</a> + <a href="/" id="site-logo">[% site_name %]</a> <a href="/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> diff --git a/templates/web/fixmystreet/header_opengraph.html b/templates/web/fixmystreet/header_opengraph.html index d0cd31261..f83296160 100644 --- a/templates/web/fixmystreet/header_opengraph.html +++ b/templates/web/fixmystreet/header_opengraph.html @@ -1,6 +1,6 @@ <meta property="og:url" content="[% c.cobrand.base_url %][% c.req.uri.path %]"> - <meta property="og:title" content="[% title || 'FixMyStreet' %]"> - <meta property="og:site_name" content="[%- PROCESS 'site-name.html' -%]"> + <meta property="og:title" content="[% title || site_name %]"> + <meta property="og:site_name" content="[% site_name %]"> [% IF c.req.uri.path == '/' %]<meta property="og:description" content="Report, view, and discuss local street-related problems.">[% END %] <meta property="og:type" content="website"> <meta property="og:image" content="[% c.cobrand.base_url %]/cobrands/fixmystreet/fms-og_image.png"> diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 0006241c3..5f499dd6e 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -6,7 +6,7 @@ problem_title = problem.title_safe _ ' - ' _ loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title - rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] + rss = [ tprintf(loc('Updates to this problem, %s', "%s is the site name"), site_name), "/rss/$problem.id" ] robots = 'index, nofollow'; %] diff --git a/templates/web/fixmystreet/report/new/form_user_loggedout.html b/templates/web/fixmystreet/report/new/form_user_loggedout.html index 31cccd44e..c5a58e8a9 100644 --- a/templates/web/fixmystreet/report/new/form_user_loggedout.html +++ b/templates/web/fixmystreet/report/new/form_user_loggedout.html @@ -8,7 +8,7 @@ <div id="form_sign_in"> <h3>[% loc("Now to submit your report…") %]</h3> - <h2>[% loc("Do you have a FixMyStreet password?") %]</h2> + <h2>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h2> <div id="form_sign_in_yes" class="form-box"> diff --git a/templates/web/fixmystreet/report/update-form.html b/templates/web/fixmystreet/report/update-form.html index f5dca4669..a69b793b7 100644 --- a/templates/web/fixmystreet/report/update-form.html +++ b/templates/web/fixmystreet/report/update-form.html @@ -83,7 +83,7 @@ <div id="form_sign_in"> <h3>[% loc("Now to submit your update…") %]</h3> - <h2>[% loc("Do you have a FixMyStreet password?") %]</h2> + <h2>[% tprintf(loc("Do you have a %s password?", "%s is the site name"), site_name) %]</h2> <div id="form_sign_in_yes" class="form-box"> <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5> diff --git a/templates/web/greenwich/header_logo.html b/templates/web/greenwich/header_logo.html index fa279bdc4..d788de6f8 100644 --- a/templates/web/greenwich/header_logo.html +++ b/templates/web/greenwich/header_logo.html @@ -1,4 +1,4 @@ - <a href="http://www.royalgreenwich.gov.uk/" id="site-logo">[%- PROCESS 'site-name.html' -%]</a> + <a href="http://www.royalgreenwich.gov.uk/" id="site-logo">[% site_name %]</a> </div> <div class="container main-menu-container"> <ul id="greenwich-menu-desktop"> diff --git a/templates/web/harrogate/static/privacy.html b/templates/web/harrogate/static/privacy.html index 7f0f090e4..767f80fbf 100755 --- a/templates/web/harrogate/static/privacy.html +++ b/templates/web/harrogate/static/privacy.html @@ -7,7 +7,7 @@ <ul class="plain-list"> <li><a href="/faq">Frequently Asked Questions</a></li> <li><strong>Privacy and cookies</strong></li> - <li><a href="/contact">Contact [%- PROCESS 'site-name.html' -%]</a></li> + <li><a href="/contact">Contact [% site_name %]</a></li> </ul> </aside> </div> diff --git a/templates/web/trinidadtobago/header_logo.html b/templates/web/trinidadtobago/header_logo.html index d5da7e6b2..afc37c252 100644 --- a/templates/web/trinidadtobago/header_logo.html +++ b/templates/web/trinidadtobago/header_logo.html @@ -1 +1 @@ - <a href="[% c.config.BASE_URL %]/" id="site-logo">[% PROCESS 'site-name.html' -%]</a> + <a href="[% c.config.BASE_URL %]/" id="site-logo">[% site_name %]</a> |