Commit graph

3051 commits

Author SHA1 Message Date
Tom Hughes
671fc09bfc Correct resource name. 2009-07-03 17:44:21 +00:00
Matt Amos
feae60fb69 Fixed short link integration test so that it would have caught a bug in shortlink charset. 2009-07-03 11:19:23 +00:00
Štefan Baebler
57ffe8447e more strict translations 2009-07-03 07:54:26 +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
Štefan Baebler
b492385b59 updated 2009-07-03 05:16:38 +00:00
Ævar Arnfjörð Bjarmason
e7f5f42856 Changeset [16271] changed "=" in the shortlink to "-" but didn't
update the routes to match.

Change the regex to accept [=-]* ("=" since we want to be backwards
compatable)
2009-07-02 21:44:26 +00:00
Tom Hughes
b34c31bf8d Create separate queues for namefinder and geonames queries. 2009-07-02 16:53:35 +00:00
Tom Hughes
6a96c72e81 Merge some changes from the live server. 2009-07-02 16:49:48 +00:00
Matt Amos
57e571d241 Changed shortlink zoom level correction char to '-', as this seems to fare better with twitter et al.'s URL highlighting. Decoder is backwards-compatible with the old system. 2009-07-02 16:40:29 +00:00
Tom Hughes
901d77837b Remove byte order marker. 2009-07-02 16:33:56 +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
Jenny Herbert
16a4a50656 A little more Yoruba put in its .yml file. 2009-07-02 15:28:33 +00:00
Tom Hughes
58803106f4 Updated OpenLayers config for new XYZ based usage. 2009-07-02 10:52:09 +00:00
Štefan Baebler
5397fc05ab pluralized some phrases 2009-07-02 05:49:43 +00:00
Maarten Deen
4bbd4d233b Some more diacritics 2009-07-01 20:19:55 +00:00
Maarten Deen
305c0c6589 Updated diactirical sign ö 2009-07-01 19:16:51 +00:00
Ævar Arnfjörð Bjarmason
a13506c9be Translate geocoder.results.namefinder. May be incorrect in the context in which it is used 2009-07-01 18:14:55 +00:00
Štefan Baebler
c4b362efec fixed interpolation error introduced in [16237] 2009-07-01 05:27:51 +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
85f317b46e Add B000FTFT (as well as B000FTF) to the list of layers we should
ignore when constructing the shortlink.

The shortlink was also broken for the new /?{node,way,relation}=id
construct since the code assumed that all URL parameters that weren't
lat/lon/zoom/layers could be safely ignored. I've added
node/way/relation to that list but for future-proofness it might be
better to simply check if there's anything left in ''args'' that we
don't know how to encode, rather than checking on values we know about
now.
2009-06-29 09:47:35 +00:00
Ævar Arnfjörð Bjarmason
b06f4750e1 I forgot to set fillColor/fillOpacity in commit [16214]. Without it
any area being rendered by OpenLayers would turn into a black hole
since the default fillOpacity is 100%.
2009-06-29 02:17:02 +00:00
Ævar Arnfjörð Bjarmason
b46b3c4327 The default OpenLayers.Layer.GML style can be nearly invisible when
viewed on the main map.

Set a style that's blue (since not a lot of things on the map are
blue), with strokeWidth 3 and opacity 50%. It makes things visible
enough without being too intrusive.
2009-06-29 02:11:34 +00:00
Ævar Arnfjörð Bjarmason
8d76bf978a Use LoadFile(*DATA) to load the __DATA__ section as YAML 2009-06-29 01:42:40 +00:00
Ævar Arnfjörð Bjarmason
df07980b15 Add entries to is: blacklist 2009-06-29 01:41:33 +00:00
Frederik Ramm
6ae593fe77 german translations for oauth stuff 2009-06-28 23:04:52 +00:00
Jonas Krückel
8d0a9eaf5e new german translations 2009-06-28 21:30:32 +00:00
Jonas Krückel
a2bd0065c2 uptodate with en.yml 16206 2009-06-28 21:22:29 +00:00
Jonas Krückel
339d71c0ff updating with keys from en.yml 2009-06-28 21:18:35 +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
Štefan Baebler
eaefdd7b13 tnx, avar for beating me to it :) 2009-06-28 19:07:22 +00:00
Ævar Arnfjörð Bjarmason
12f78fc254 Add browse.relation_member.entry to the blacklist 2009-06-28 18:52:41 +00:00
Ævar Arnfjörð Bjarmason
b6c162ad46 Translated *.map.larger.* 2009-06-28 18:48:34 +00:00
Ævar Arnfjörð Bjarmason
48d24d68e2 Add back ''export.start_rjs.view_larger_map'' which steveb removed in
[16198] due to my mistake in [16196], which was fixed in [16200].
2009-06-28 18:40:50 +00:00
Ævar Arnfjörð Bjarmason
7d7225e1f9 I mistakenly removed ''export.start_rjs.view_larger_map'' from en.yml
when removing ''browse.map.view_larger_map'' in changeset
[16196]. This broke the HTML feature in the Export dialog
(''translation missing: en, export, start_rjs, view_larger_map'' was
inserted instead)
2009-06-28 18:38:01 +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
050393c613 synced with en.yml [16196] 2009-06-28 18:13:01 +00:00
Štefan Baebler
bfdce9c933 localized geocoder search results 2009-06-28 18:00:11 +00:00
Ævar Arnfjörð Bjarmason
f1bb6df967 Delete browse.map.view_larger_map from a bunch of translations. It has kind-of been replaced by browse.map.larger.area but the translation isn't the same so I can't move them over 2009-06-28 17:33:40 +00:00
Ævar Arnfjörð Bjarmason
2f1bfefa46 s/klukkan// 2009-06-28 17:23:01 +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
d63f13c18d Make ?{node,way,relation}=id GET argumens work for the shortlink as
well as the permalink.
2009-06-27 16:11:21 +00:00
Ævar Arnfjörð Bjarmason
05bc2b70ed Only hardcode http://osm.org/ in shortlinks when we're at
openstreetmap.org (according to window.location.hostname).

Solves ticket:1994 and my headaches when trying to hack railsport
locally.
2009-06-27 16:07:53 +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