Commit graph

1496 commits

Author SHA1 Message Date
Tom Hughes
1368f194da Try preferred_language_from as it looks for an exact match - only if that
fails do we fall back to compatible_language_from which will take any
language where the first token matches. Fixes #2069.
2009-07-15 23:29:07 +00:00
Tom Hughes
a5ab006122 Lookup the user before setting the locale. Fixes #2068. 2009-07-15 18:21:32 +00:00
Tom Hughes
291350850d Say which way is too long. 2009-07-15 13:34:14 +00:00
Tom Hughes
2c5f5a0114 Fix changeset paging. 2009-07-15 11:33:21 +00:00
Ævar Arnfjörð Bjarmason
5d33aaa332 Potlatch's i18n support predates our Rails i18n effort, so it was
still doing its own language detection.

Scrap that and use I18n.locale instead, now Potlatch is guaranteed to
use whatever translation the rest of the site uses.

I've tested this by switching the language in preferences back and
forth, and also ensured that Potlatch will fall back on English if the
specified language doesn't exist in its list of translations.
2009-07-14 21:55:40 +00:00
Tom Hughes
35d5e9d19d Fix send message links for friends and nearby mappers. Fixes #2065. 2009-07-14 19:48:21 +00:00
Tom Hughes
64fb530581 Merge 16110:16487 from trunk. 2009-07-14 08:03:24 +00:00
Tom Hughes
942ca1ff23 Merge 16355:16480 from trunk. 2009-07-13 23:28:02 +00:00
Tom Hughes
ab3e5e6d43 Remove redundant text. 2009-07-13 08:30:48 +00:00
Tom Hughes
2ac919d4f1 Fix a missing translation. Closes #2052. 2009-07-13 08:26:13 +00:00
Tom Hughes
b5a6493aff Remove SOTM advert from site. 2009-07-13 08:11:11 +00:00
Æ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
50f78e52e8 Style the table in the feed content. 2009-07-07 23:30:04 +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
Tom Hughes
5198500d48 More improvements to Atom feeds. 2009-07-06 00:03:33 +00:00
Tom Hughes
9a32033209 Merge 16216:16355 from trunk. 2009-07-05 23:47:40 +00:00
Tom Hughes
d63f605893 Add some more detail to the changeset Atom feeds. 2009-07-05 23:46:28 +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
0348316d0b Make subtitle an HTML element. 2009-07-04 12:15:29 +00:00
Tom Hughes
b450ce9d85 Fix links to changeset feeds. 2009-07-04 12:12:05 +00:00
Tom Hughes
336d40f2c5 Switch to using ATOM for changeset feeds. 2009-07-04 11:34:23 +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
Tom Hughes
493fd3fa11 Go back to using < and > for navigation instead of the nasty looking
unicode arrows which aren't at all consistent with the use of | as the
separator.

Also remove some of the translations - there is no reason that I can
see to allow translations to completely change how the navigation control
is laid out.
2009-06-29 17:11:50 +00:00
Tom Hughes
6baccfaddd Merge 16110:16216 from trunk. 2009-06-29 16:50:34 +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
e657cff464 Merge 16070:16110 from trunk. 2009-06-25 16:45:26 +00:00