Commit graph

1362 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
2153fb6efd Fixed a bug in how fields in /message/new were being pre-filled out.
When someone went to /message/new/:user the "Subject" are would be
pre-filled out with t('message.new.title'). The problem was that the
@title template variable was being used for two purposes, to set the
HTML <title> AND to pre-fill out the subject.

We don't always want these two to be the same, but sometimes we
do. E.g. when someone replies to a diary entry and visits
/message/new/:user?title=Foo we want Foo in the <title> and in the
pre-filled out Subject, and the same goes for replying to a message.

So I've split up the @title variable into @title and @subject.
2009-07-12 16:01:49 +00:00
Tom Hughes
f5e14bcc48 Don't send a noification email if somebody comments on their own diary
entry. Fixes #2053.
2009-07-11 13:24:57 +00:00
Štefan Baebler
dcbb319015 added brief help for tag entry, continuing on #2032 2009-07-09 06:11:24 +00:00
Richard Fairhurst
8eb77ef5e1 "list mode" should really be "live mode" :) 2009-07-08 22:29:45 +00:00
Richard Fairhurst
369202787b Potlatch 1.1 (server code) 2009-07-08 20:52:02 +00:00
Tom Hughes
0b6f0c1d34 Use join to construct tag strings instead of mucking around counting
position in the string.
2009-07-07 23:05:35 +00:00
Štefan Baebler
9afb533280 added comment for future generations 2009-07-07 22:50:46 +00:00
Štefan Baebler
ebbcf63f0d Introducing comma as tag separator (if present, otherwise it behaves as before), allowing spaces in tags. fixes #2032 2009-07-07 22:05:03 +00:00
Ævar Arnfjörð Bjarmason
a08215633c When two users are <1 km apart display the distance between them in
meters, not kilometers.

Solves ticket:2028
2009-07-04 21:35:09 +00:00
Tom Hughes
671fc09bfc Correct resource name. 2009-07-03 17:44:21 +00:00
Štefan Baebler
8a80162db1 additional translations in geocoder describer 2009-07-03 06:38:43 +00:00
Štefan Baebler
2c6d4c1039 added missing =, fixes #1930 2009-07-03 05:49:14 +00:00
Tom Hughes
06b2d278ea Make the search box load each set of results separately so that one
service being slow doesn't delay the response from others.
2009-07-02 16:12:38 +00:00
Tom Hughes
b52327bf89 Fix warnings arising from geocoder translations, and use count magic
for the distance translation.
2009-06-30 23:45:32 +00:00
Štefan Baebler
c4965a1700 made geocoder results translatable. It could probably be improved but am not sure how. 2009-06-29 23:36:57 +00:00
Ævar Arnfjörð Bjarmason
bc66c8adeb Make the printable_name() function call i18n.t to translate its
output. Makes e.g. "#{name}, v#{object.version.to_s}" which is used in
the changeset browser translatable.

I'm still not happy with how the anchor is constructed. we're linking
from /browse/changeset/1234 to e.g. node "[[366672999, v1]]" even
though the page we're linking to might take us to that node at version
2. The link should be "[[366672999]], v1" instead.

But that's something to solve later.
2009-06-28 21:13:27 +00:00
Ævar Arnfjörð Bjarmason
91a6ed60c1 Another commit in the spirit of [16199]: Don't enforce word order for translations. 2009-06-28 19:47:57 +00:00
Ævar Arnfjörð Bjarmason
1fea79bbbd The relation browser used the translated nominative model names of
Node/Way/Relation in /browse/relation/:id. And used the bad practice
of concating things together to translate them.

Fixed it to use translation variables.
2009-06-28 18:25:21 +00:00
Štefan Baebler
bfdce9c933 localized geocoder search results 2009-06-28 18:00:11 +00:00
Štefan Baebler
4b705207e0 made relation_members.member_type translatable via model translations 2009-06-28 13:21:24 +00:00
Tom Hughes
e46c82fe3d Tidy up some recent commits:
- Simplify shortlinkPrefix by removing redundant code.
- Factor out duplicate code for displaying objects on maps.
- Reindent some stuff to make it more readable.
2009-06-27 17:11:54 +00:00
Ævar Arnfjörð Bjarmason
34b147266c Change the feature commited in [16174] to use the main map view
instead of being located at /map.
2009-06-27 15:34:26 +00:00
Ævar Arnfjörð Bjarmason
8bc8e537b2 Introducing a new /browse/{node,way,relation,changeset}/{id}/map page
which is slippy map covering the screen showing the map data that is
in the small map at /browse/{node,way,relation,changeset}/{id}.

/browse/{node,way,relation,changeset}/{id} now contains a link to both
"View Larger Map" which has been changed to link to this new map
feature, and "View on main map" which as before links to the area
showing the feature on the main slippy map.

/browse/{node,way,relation,changeset}/{id}/map supports permalinks
using its own hacked version of updateLocation() (which doesn't set a
cookie), but shortlinks are not supported. The Edit/History/Export
links link back to the main map.
2009-06-27 09:30:10 +00:00
Ævar Arnfjörð Bjarmason
9b780a689b When I navigate to /browse/{node,way,relation}/:id/history there's no
link that will take me back to /browse/{node,way,relation}/:id

So I'm adding it.
2009-06-26 21:04:36 +00:00
Ævar Arnfjörð Bjarmason
87497a9042 "Node history: {{node_name}}" was untranslatable! 2009-06-26 21:01:15 +00:00
Ævar Arnfjörð Bjarmason
af75542795 Call .to_sentence on site.key.table.entry. Translations are free to take advantage of this or ignore it completely 2009-06-26 18:23:06 +00:00
Thomas Wood
4ef3012417 Fix indentation. 2009-06-26 14:27:45 +00:00
Thomas Wood
fa98753614 Only try to load the map if changeset or feature not deleted. 2009-06-26 14:25:29 +00:00
Matt Amos
1d8e66016c Adding 'shortlink' functions which will allow URLs like http://osm.org/go/XXXX suitable for use in twitter, etc... 2009-06-25 23:31:53 +00:00
Tom Hughes
817434a2e6 Rework the translatable map key to be driven by a YAML file listing the
entries to show for each layer and zoom level.
2009-06-24 23:30:41 +00:00
Tom Hughes
2112dd7f63 Make the "what does this mean" link added in r16069 more like similar
notes on other forms.
2009-06-24 11:50:41 +00:00
Tom Hughes
b1ada7b9d6 Put back HTML escaping of trace names removed in r16062. 2009-06-24 11:41:26 +00:00
Ævar Arnfjörð Bjarmason
0e530b0a0d Remove the third param to showKeyEntry(). Not used yet. 2009-06-24 07:15:18 +00:00
Ævar Arnfjörð Bjarmason
079b9fed84 Change the map key from a static PNG image to a generated HTML table that can be translated. Solves ticket:1916 2009-06-23 12:04:06 +00:00
Tom Hughes
f4571eeb7c Revert r16046.
DO NOT COMMIT MAJOR ENHANCEMENTS TO TRUNK WITHOUT TALKING TO ME FIRST.
2009-06-23 02:48:38 +00:00
Ævar Arnfjörð Bjarmason
7551e8a0c1 Add a link to [[Visibility of GPS traces]] on the wiki to explain what public/private means. Solves ticket:1002 2009-06-23 01:27:40 +00:00
Ævar Arnfjörð Bjarmason
be57524849 Add 'diary_entry.no_such_entry.title' for diary entries that don't exist 2009-06-23 00:17:20 +00:00
Ævar Arnfjörð Bjarmason
9e504a0b33 'trace.tags.none' was never displayed because the empty list ([]) is true in ruby. Use trace.tags.empty?
Wrap 'trace.tags.none' in <i> to make it obvious that "none" is a system-generated value
2009-06-23 00:02:35 +00:00
Ævar Arnfjörð Bjarmason
cc3faefa46 * Changed "t'trace.edit.start_coord' %>Start coordinate:" to "t'trace.edit.start_coord' %>"
* "map" was untranslatable
2009-06-22 23:47:49 +00:00
Ævar Arnfjörð Bjarmason
dfadcc797c Fixed up the <title>/<h2> mess in trace/edit and trace/view
* @title was never set on trace editing, and thus <h2></h2> was produced
 * Changed split 'trace.view.viewing_trace' into 'trace.view.title' and 'trace.view.heading'
 * Introduced corresponding 'trace.edit.title' and 'trace.edit.heading'
2009-06-22 23:43:53 +00:00
Ævar Arnfjörð Bjarmason
17e9016373 "download" in edit trace was untranslatable 2009-06-22 23:27:11 +00:00
Ævar Arnfjörð Bjarmason
a268dbbff0 trace.edit.tags and trace.edit.save_button were mistakenly in the locale files but not actually used. fixed this 2009-06-22 23:20:53 +00:00
Ævar Arnfjörð Bjarmason
340d5c05cf * Put checkboxes before form labels in an attempt to make them align with the text.
* Put a <br/> between the form and the submit button so they're not squashed together
2009-06-22 20:33:14 +00:00
Ævar Arnfjörð Bjarmason
7253c38234 The <title> wasn't being properly set on /message/new/$user, only on /message/new/$user?title=$title 2009-06-22 19:13:54 +00:00
Matt Amos
b8f6dbd403 Adding initial version of the OAuth token authentication method. This adds basic OAuth support for registering apps, getting and revoking keys, etc... The tokens come with 6 separate permissions bits; read/write user preferences, write diaries, write API and read/write GPS traces. Needs more tests. 2009-06-22 16:54:37 +00:00
Matt Amos
f7adbbb3a8 Fixed dereference of nil node when browsing deleted way. 2009-06-22 15:27:20 +00:00
Thomas Wood
06e9b7213d Fix bug introduced in r16011 with link to new message from diary entry.
(Thanks shaun for spotting this)
2009-06-20 22:28:11 +00:00
Thomas Wood
554818b5b4 Contrary to what the previous commit message said, we do actually have more cases of user A triggering mail to user B.
(references #1968)
2009-06-20 20:42:22 +00:00
Thomas Wood
0ed4cdbd49 Force locale on subject translation for diary comment notifications, since the sending user's locale is not that of recipient.
It is assumed that sender locale is that of recipient for the rest of the emails, which is fine, since the sender is the recipient.
The bodies are accounted for correctly by common_headers and the monkeypatching of ActionMailer.
(references #1968)
2009-06-20 20:36:52 +00:00
Thomas Wood
2fabbed189 Autoselect new diary entry language to that of last posted entry rather than user's default language.
(Closes #1967)
2009-06-20 18:27:03 +00:00