Æ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
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
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
f7adbbb3a8
Fixed dereference of nil node when browsing deleted way.
2009-06-22 15:27:20 +00:00
Thomas Wood
80ff70a1ff
Extend work started in [15970] to add edit link to way pages on databrowser.
2009-06-18 14:29:28 +00:00
Thomas Wood
3edd81f03b
Add an edit link to the browse page for nodes, since it's been bugging me a while. Ways will follow when i can work out how to generate a lat/lon for them...
...
Translation updates required (small edit)
2009-06-17 16:37:43 +00:00
Tom Hughes
2e2f212472
Rename views to rails 2 style names.
2009-06-09 20:50:14 +00:00
Tom Hughes
a8c7d1c4ce
Don't use single quotes to wrap translated strings in javascript in case
...
the translation contains an apostrophe. Closes #1942 .
2009-06-09 18:59:44 +00:00
Ævar Arnfjörð Bjarmason
7862c89a92
Use {{count}} instead of {{(node|way_relation)_count}} since {{count}}
...
is a magical enumerated variable in Rails.
2009-06-07 21:27:05 +00:00
Tom Hughes
fc398f6441
Rework the javascript I18n interpolation a bit - the interpolation function
...
is now in site.js so everything can use it, and the syntax has changed a bit
to avoid the need for double interpolation.
2009-06-07 08:32:39 +00:00
Ævar Arnfjörð Bjarmason
cc5694da1c
More progress on ticket:1919
...
These messages now don't use JavaScript string concatenation but
variable interpolation:
* browse.start_rjs.history_for_feature
* browse.start_rjs.edited_by_user_at_timestamp
* browse.start_rjs.object_list.selected.type.node
* browse.start_rjs.object_list.selected.type.way
* browse.start_rjs.object_list.history.type.node
* browse.start_rjs.object_list.history.type.way
These previously extant messages have been deleted, merged, and given
more descriptive names:
* browse.start_rjs.history_for
* browse.start_rjs.edited_by
* browse.start_rjs.at_timestamp
2009-06-06 19:22:39 +00:00
Ævar Arnfjörð Bjarmason
de18f26d3c
Nuked 'browse.start_rjs.unable_to_load' and replaced it with
...
'browse.start_rjs.unable_to_load_size' which solves #1919 some more.
2009-06-06 18:25:41 +00:00
Ævar Arnfjörð Bjarmason
3622db1665
Don't hardcode bbox size 0.25, use APP_CONFIG['max_request_area'] instead
2009-06-06 18:13:11 +00:00
Ævar Arnfjörð Bjarmason
b653ace377
Implement a hack so that we can interpolate JavaScript variables in
...
translation strings from Ruby, doing the string replacement lient-side
instead of on the server.
This partially solves ticket:1919. I still have to move the rest of
the JS functions over to the new system.
2009-06-06 17:57:08 +00:00
Tom Hughes
91aaae1933
Improve the data browser translation logic.
2009-06-06 15:46:41 +00:00
Ævar Arnfjörð Bjarmason
c875a70b31
Made a bunch of start.rjs stuff translatable, including
...
* Object list, API, Display object list, Details
Also make node/way/relation translatable, and in different contexts
too (e.g. Icelandic needs this).
This introduces more stuff that needs to be fixed in ticket 1919.
2009-06-06 15:05:39 +00:00
Ævar Arnfjörð Bjarmason
ae7f3f2786
Make node/way/relation which is fed into the the 'browse.not_found.sorry' message translatable
2009-06-05 19:02:31 +00:00
Tom Hughes
c372f6cc18
Set the OpenLayers locale when creating a map.
2009-06-04 20:37:59 +00:00
Tom Hughes
d24d7e3bf7
Go back to using to_sentence now that we are using rails 2.3 for the site.
2009-06-04 08:40:37 +00:00
Tom Hughes
a7219de757
Revert to using join instead of to_sentence for now as to_sentence is
...
broken in rails 2.2 when I18N is in use. We can go back to using
to_sentence once we have gone to rails 2.3 which fixes the problem.
Close #1906 .
2009-06-02 23:40:46 +00:00
Tom Hughes
4c463ca6ba
Pluralise related way text properly.
2009-06-02 17:00:43 +00:00
Shaun McDonald
698a49077c
Add some more missing translations. Use .to_sentence instead of .join(', ') so that it is localisable and is more readable.
2009-06-02 16:07:52 +00:00
Shaun McDonald
87ee00a65e
Made also part of translatable. Fixes #1897 .
2009-06-02 07:14:55 +00:00
Tom Hughes
0a334787f1
Handle nodes which are in the same way multiple times.
2009-06-01 09:08:30 +00:00
Shaun McDonald
010dc87195
Fix typo, which meant that there was a missing translation when selecting an area in the databrowser data browser that was too large
2009-05-31 23:02:50 +00:00
Shaun McDonald
afce15dd86
Use a more rails like way for the new coordinates link, which also localizes the display of the lat lon numbers. Couple more translations.
2009-05-31 14:05:12 +00:00
Tom Hughes
ef313e7378
Fix warnings.
2009-05-31 12:06:57 +00:00
Tom Hughes
3d906fe8c6
Merge 15165:15373 from trunk.
2009-05-31 11:32:32 +00:00
Andy Allan
b22ae71613
Last of the databrowser i18n
2009-05-31 09:33:20 +00:00
Andy Allan
4e0cf1c5d3
Databrowser i18n. The stuff in start.rjs is a bit bizarre and might need a second pair of eyes
2009-05-30 17:45:31 +00:00
Andy Allan
8f8cbc4ae8
more databrowser i18n
2009-05-30 16:17:10 +00:00
Andy Allan
c48263e15c
more databrowser i18n
2009-05-30 15:44:39 +00:00
Andy Allan
b5cb37bdee
more translations, and this time with stuff in the locale file too
2009-05-30 14:58:35 +00:00
Andy Allan
a6f88faa20
First two bits of databrowser i18n
2009-05-30 13:46:59 +00:00
Andy Allan
cdbfc1e341
Override interestingTagsExclude in GML layer - improve databrowser in US by ignoring vanilla TIGER nodes
2009-05-22 14:20:22 +00:00
Tom Hughes
4d62aea5ec
Destroy OL objects which use the dataLayer before we destroy the layer
...
or we will get errors which stop the rest of stopBrowse() executing.
2009-05-11 10:31:34 +00:00
Thomas Wood
c18d684dda
Sort the tags for the databrowser output.
2009-05-04 22:42:07 +00:00
Thomas Wood
22292debda
Data browser changes, make links more user friendly, displaying name tag where possible.
...
Changes to models ok'd (and suggested as temporary solution) by TomH
References #1777
2009-05-02 00:26:37 +00:00
Thomas Wood
38c8e3e37e
Quick fix to reference relation rather than relation_member when linking to the relation, not sure when the bug was introduced. Tests still need to be written for the browse controller.
...
Closes #1764
2009-04-27 21:26:23 +00:00
Frederik Ramm
5c783cd0ee
there is not HTML attribute named "padding". either use "cellpadding" (this patch), or use the CSS attribute (i.e. style="padding: 0px").
2009-04-21 23:55:02 +00:00
Thomas Wood
fddf6fb529
Fix bbox display again, how do we keep mixing our lons and lats?
2009-04-21 21:30:37 +00:00
Thomas Wood
e5076f332a
Fix bug introduced in r14610 (.downcase in wrong place)
...
No need to sanitise type of relation member, since will only be a Node, Way, or Relation and not user-provided.
2009-04-20 19:13:52 +00:00
Shaun McDonald
68360190d5
fix bug in the case of the action in the data browser when linking to relation members
2009-04-20 17:28:01 +00:00
