aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/default
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/default')
-rw-r--r--templates/web/default/alert/list.html6
-rwxr-xr-xtemplates/web/default/around/display_location.html4
-rw-r--r--templates/web/default/auth/token.html4
-rw-r--r--templates/web/default/contact/index.html10
-rw-r--r--templates/web/default/report/display.html6
-rw-r--r--templates/web/default/static/about.html4
6 files changed, 17 insertions, 17 deletions
diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html
index 5b1677e8b..931636f06 100644
--- a/templates/web/default/alert/list.html
+++ b/templates/web/default/alert/list.html
@@ -3,7 +3,7 @@
[% INCLUDE 'header.html', title => title %]
[% IF pretty_pc %]
-[% title = tprintf( loc('Local RSS feeds and email alerts for %s'), pretty_pc ) %]
+[% title = tprintf( loc('Local RSS feeds and email alerts for ‘%s’'), pretty_pc ) %]
[% END %]
@@ -24,7 +24,7 @@
<p>
[% IF pretty_pc %]
- [% tprintf( loc('Here are the types of local problem alerts for %s.'), pretty_pc ) | html %]
+ [% tprintf( loc('Here are the types of local problem alerts for &lsquo;%s&rsquo;.'), pretty_pc ) | html %]
[% 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>
@@ -38,7 +38,7 @@
<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 %]'>
+ [% 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>
</p>
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html
index de970e98a..4c728806b 100755
--- a/templates/web/default/around/display_location.html
+++ b/templates/web/default/around/display_location.html
@@ -74,8 +74,8 @@
<p id="alert_links_area">
<a id="email_alert" rel="nofollow" href="[% email_url | html %]">
- [% loc('Email me new local problems') %]
- </a> |
+ [%- loc('Email me new local problems') -%]
+</a> |
<a href="[% rss_url | html %]" id="rss_alert">
<span>[% rss_alt %]</span>
<img src="/i/feed.png" width="16" height="16" title="[% rss_title %]" alt="[% rss_alt %]" border="0" style="vertical-align: top">
diff --git a/templates/web/default/auth/token.html b/templates/web/default/auth/token.html
index 16dfbb11c..b3a3d5cc8 100644
--- a/templates/web/default/auth/token.html
+++ b/templates/web/default/auth/token.html
@@ -14,7 +14,7 @@
[% ELSE %]
-<h1>[% loc('Please check you email') %]</h1>
+<h1>[% loc('Please check your email') %]</h1>
<p>We have sent you an email containing a link to confirm your account.</p>
@@ -22,4 +22,4 @@
[% END %]
-[% INCLUDE 'footer.html' %] \ No newline at end of file
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/contact/index.html b/templates/web/default/contact/index.html
index 35c7f7e36..8fd280ab8 100644
--- a/templates/web/default/contact/index.html
+++ b/templates/web/default/contact/index.html
@@ -69,7 +69,7 @@
<div class="form-error">[% field_errors.name %]</div>
[% END %]
<div class="form-field">
-<label for="form_name">Your name:</label>
+<label for="form_name">[% loc('Your name:') %]</label>
<input type="text" name="name" id="form_name" value="[% form_name %]" size="30"></div>
@@ -77,24 +77,24 @@
<div class="form-error">[% field_errors.em %]</div>
[% END %]
<div class="form-field">
-<label for="form_email">Your&nbsp;email:</label>
+<label for="form_email">[% loc('Your&nbsp;email:') %]</label>
<input type="text" name="em" id="form_email" value="[% em %]" size="30"></div>
[% IF field_errors.subject %]
<div class="form-error">[% field_errors.subject %]</div>
[% END %]
<div class="form-field">
-<label for="form_subject">Subject:</label>
+<label for="form_subject">[% loc('Subject:') %]</label>
<input type="text" name="subject" id="form_subject" value="[% subject %]" size="30"></div>
[% IF field_errors.message %]
<div class="form-error">[% field_errors.message %]</div>
[% END %]
<div class="form-field">
-<label for="form_message">Message:</label>
+<label for="form_message">[% loc('Message:') %]</label>
<textarea name="message" id="form_message" rows="7" cols="50">[% message %]</textarea></div>
-<div class="checkbox"><input type="submit" value="Post"></div>
+<div class="checkbox"><input type="submit" value="[% loc('Post') %]"></div>
</form>
diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html
index 2225934a5..fdef6c775 100644
--- a/templates/web/default/report/display.html
+++ b/templates/web/default/report/display.html
@@ -1,7 +1,7 @@
[%
PROCESS "maps/${map.type}.html";
- problem_title = problem.title | html;
+ problem_title = problem.title _ ' - ' _ loc('Viewing a problem') | html;
INCLUDE 'header.html'
title = problem_title
rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ]
@@ -42,7 +42,7 @@
<a rel="nofollow" id="email_alert" href="[% c.uri_for( '/alert', { type => 'updates', id => problem.id } ) %]">[% loc('Email me updates' ) %]</a>
<form action="[% c.uri_for( '/alert/subscribe' ) %]" method="post" id="email_alert_box">
- <p>[% loc('Receive email when updates are left on this problem' ) %]</p>
+ <p>[% loc('Receive email when updates are left on this problem.' ) %]</p>
<label class="n" for="alert_rznvy">[% loc('Email') %]</label>
<input type="text" name="rznvy" id="alert_rznvy" value="[% email %]" size="30">
<input type="hidden" name="id" value="[% problem.id %]">
@@ -52,7 +52,7 @@
</form>
&nbsp;
<a href="[% c.uri_for( '/rss', problem.id ) %]">
- <img src="/i/feed.png" width="16" height="16" title="[% loc('Rss feed') %]" alt="[% loc('Rss feed of updates to the problem' ) %]" border="0" style="vertical-align: middle">
+ <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0" style="vertical-align: middle">
</a>
</div>
diff --git a/templates/web/default/static/about.html b/templates/web/default/static/about.html
index 7219f6320..9c319f051 100644
--- a/templates/web/default/static/about.html
+++ b/templates/web/default/static/about.html
@@ -1,4 +1,4 @@
-[% INCLUDE 'header.html', title => loc('About Us') %]
+[% INCLUDE 'header.html', title => loc('About us') %]
<h1>[% loc('About us') %]</h1>
@@ -6,4 +6,4 @@
[%# FIXME - put in blurb here %]
-[% INCLUDE 'footer.html' %] \ No newline at end of file
+[% INCLUDE 'footer.html' %]