Commit graph

1311 commits

Author SHA1 Message Date
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
Štefan Baebler
63de62bf04 next/previous page links maintain diary language 2009-06-15 17:48:25 +00:00
Matt Amos
09c2725fc9 Fixed typo in 'big changeset' display. 2009-06-15 14:16:19 +00:00
Štefan Baebler
00da8a9712 minor change: diary entries per language linked (lists and rss feeds)
(again, since r15900 was rolled back in r15905, see #1946 - this time without adding a plugin)
2009-06-15 05:03:11 +00:00
Tom Hughes
5475a9ec35 Revert r15900 for now. 2009-06-14 09:53:42 +00:00
Štefan Baebler
2b290f4994 cleanup 2009-06-14 07:27:24 +00:00
Štefan Baebler
61123eaeb4 Added localized language names with plugin from http://github.com/grosser/i18n_data/tree/master (fixes #1946)
Diary entries in same language linked (lists and rss)
2009-06-14 07:25:08 +00:00
Thomas Wood
5123163e92 Remove superfluous "language" from diary strings - it sounds weird (other option would be to change to "the {{language}} language") 2009-06-12 18:48:36 +00:00
Štefan Baebler
98b9ce8f97 diary entries (list and rss) for a given language.
TODO: language rss link, linking the localized lists
2009-06-12 06:34:18 +00:00
Štefan Baebler
6fadf04a4f removed double dot (double appeared with en, de, it, sl and probably other translations) 2009-06-11 20:27:31 +00:00
Thomas Wood
c10a2f2580 Fix missing </div> and wrong translation names in layout database offline alert box. 2009-06-11 18:25:44 +00:00
Shaun McDonald
65eb6af303 Give a nice error message when parsing the nwr tags and they are missing the k and/or v. Also includes tests. 2009-06-11 11:08:37 +00:00
Shaun McDonald
37df03a043 Cleanup the Relation.from_xml to come in line with the Way and Node versions. Includes tests. Bug fix for the previous tests. 2009-06-10 17:17:03 +00:00
Shaun McDonald
e4d7b3ee66 Throw errors in the way xml parsing if there is a problem. Bring the way parsing in line with the node parsing. Properly deal with the 0 id case. Some Way.from_xml tests. 2009-06-10 15:42:12 +00:00
Štefan Baebler
1de54dc135 localizable timestamps 2009-06-10 05:24:39 +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
Tom Hughes
1a59ac0d68 Put back missing divider. Closes #1939. 2009-06-08 22:09:22 +00:00
Shaun McDonald
e3693d487a More unit tests for the parsing of the Node.from_xml. Some code clean up to ensure that a node that cannot be parsed will always throw an exception, to be handled by the arround handler. 2009-06-08 18:53:19 +00:00
Ævar Arnfjörð Bjarmason
0b84885cfc Make the name of the "Data" layer in OpenLayers translatable: Most of
the OL dialog is still stuck in map.js and untranslatable though.
2009-06-08 18:10:17 +00:00
Ævar Arnfjörð Bjarmason
5d471088b4 Wrap 'changeset.changeset.no_comment' in italics with <i></i>. Right
now it's not possible to distinguish between a changeset that has no
comment and one whose comment is equivalent to the text of
'changeset.changeset.no_comment'.
2009-06-08 13:24:29 +00:00
Tom Hughes
d6ba46b120 Simplify rejection of existing renumbered nodes. 2009-06-08 11:08:18 +00:00
Richard Fairhurst
9cfaeb5460 potential fix for issue encountered on talk 2009-06-08 10:54:06 +00:00
Ævar Arnfjörð Bjarmason
a50d61c7ba Revert [15752]: The duplication of content intentional for dead-tree
printouts, which I didn't consider. Oops! Thanks TomH :)
2009-06-07 23:42:26 +00:00
Ævar Arnfjörð Bjarmason
d8d3d21a2c Use {{count}} instead of {{distance}} for kilometer count as {{count}} is a magical enumerated variable in Rails. 2009-06-07 22:14:22 +00:00
Shaun McDonald
32b422aefb Make some links more rails like, thus easier to read. Test that partials are included as expected. 2009-06-07 21:45:33 +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
Ævar Arnfjörð Bjarmason
1f92b6f35b Edgemaster & shaunmcdonald pointed out that my ad-hoc hackery was
covered by i18n translation framework. So use the magical :count
argument.

Also convert {{size}} to {{count}} in layouts.inbox
2009-06-07 21:10:34 +00:00
Ævar Arnfjörð Bjarmason
91bc3c9244 Add a tooltip to help & wiki/news blog/shop/map key 2009-06-07 20:33:13 +00:00
Ævar Arnfjörð Bjarmason
93a810f690 Should have been part of [15755]: Cursed vc-dir interface 2009-06-07 20:01:29 +00:00
Ævar Arnfjörð Bjarmason
7a9b2de42b Made a lot of things translatable and added title="" tooltips
* "OpenStreetMap" project name in <title> and <h1>
 * Tooltips for the greeting bar for anonymous and logged in users
 * Alternate text for the OSM logo
 * Now using a CSS class for bolding inbox(N) instead of hard-coding font-weight: bold
 * Separate tooltips for inbox(n) depending on whether it's 0, 1 or > 1
2009-06-07 19:58:34 +00:00
Shaun McDonald
c03c8f4749 include the correct language and direction in the html element. fixes #1930. fixes #1929 2009-06-07 18:44:59 +00:00
Ævar Arnfjörð Bjarmason
86a0ba0172 The display:none attribution table looks horrid in text browsers
(e.g. w3m). And there's no reason to include plain URLs to CC-BY-SA
and OSM *AND* mention both in the message below without including any
links.

Instead erase those links and work them into the message instead.
2009-06-07 17:08:25 +00:00
Ævar Arnfjörð Bjarmason
91badcf98b Made UCL VR Centre and bytemark in 'layouts.intro_3' translatable 2009-06-07 16:22:02 +00:00
Ævar Arnfjörð Bjarmason
938cdd8503 Made GPX notification E-Mails translatable
The multiline 'notifier.gpx_notification.success.loaded_successfully'
message is how one should properly do multiline messages to be
embedded into E-Mail. It wraps at 80 columns (if translated correctly)
and isn't as inhererently limited as splitting the E-Mail into one
message per-line like the other notification messages do it.
2009-06-07 15:50:30 +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
Tom Hughes
e1cb17faa6 Back out the changeset RSS stuff from the head for now. 2009-06-07 08:03:07 +00:00
Ævar Arnfjörð Bjarmason
e9ab43cd30 The list_bbox_rss won't work at all without a bbox. Thow an error when it's not supplied 2009-06-07 03:06:09 +00:00
Ævar Arnfjörð Bjarmason
b1117365d2 Forgot that /history can also be called without a bbox (if one can't be found)
I think the best thing to do here is to simply remove the RSS link, if
someone wants a RSS feed without a bbox they can click the Recent
Changes link and get a feed there.
2009-06-07 02:53:24 +00:00
Ævar Arnfjörð Bjarmason
0d16fd57d4 Add RSS feed for global recent changes & changes within a bbox. Solves #1737
This has so much copy/paste code it hurts, the new list*_rss methods
are just copies of the old list* methods, but see #1927 for that.
2009-06-07 02:39:45 +00:00
Ævar Arnfjörð Bjarmason
bbc700b9ac Don't add a <comments> entry for anonymous users 2009-06-07 02:32:16 +00:00
Ævar Arnfjörð Bjarmason
011237c2c5 Implement /user/$user/edits/rss, partially solves #1737 2009-06-07 01:32:19 +00:00
Ævar Arnfjörð Bjarmason
e72f35f8d9 Make URL that link to the OSM Wiki configurable by translations. A lot
of these pages have been translated into other languages and users
using other languages would want to visit those in preference to the
English version.
2009-06-06 21:36:49 +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