Commit graph

653 commits

Author SHA1 Message Date
Æ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
Æ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
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
Ævar Arnfjörð Bjarmason
db51d7f3dd Added & cleaned up messages relating to a given user not existing
The following pages now have a <title> that can be set in localizations:

 * /user/USER_DOES_NOT_EXIST
 * /user/USER_DOES_NOT_EXIST/diary
 * /user/USER_DOES_NOT_EXIST/traces
 * /message/*/ID_DOES_NOT_EXIST

In addition I've cleaned up the i18n message keys of all the
''no_such_user.rhtml'' pages involved. They now all use
title/heading/body for the <title>, <h2> and <p> respectively. And the
message key {{user}} instead of {{name}}.
2009-06-06 13:15:53 +00:00
Tom Hughes
f798504669 Make tab tooltips translatable. 2009-06-06 13:12:57 +00:00
Tom Hughes
d9dbd3edf1 Make the rest of the email translatable. 2009-06-05 23:53:47 +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
e2cb38cd6e Make "Login to leave a comment" translatable. 2009-06-05 18:11:50 +00:00
Tom Hughes
52bfc5a905 Update key when the zoom changes, even if the language is not english. 2009-06-05 18:06:38 +00:00
Tom Hughes
1bd3a83add Translate the title of the user diary view. 2009-06-05 14:59:13 +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
3b329ff9f9 Link SOTM ad to "landing" page. 2009-06-03 17:16:28 +00:00
Tom Hughes
b7aa25947e Reinstate IE test and pass result to flash. 2009-06-03 09:33:41 +00:00
Tom Hughes
972363baf6 Removed test for IE as we don't use the result anymore. 2009-06-03 09:18:20 +00:00
Tom Hughes
4a93c5de4b Issue unsaved changes alerts on IE. 2009-06-03 09:17:29 +00:00
Tom Hughes
11f457e842 Use "confirm_email" instead "confirm email" in resource names so it
matches the method name.
2009-06-03 07:42:40 +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
Tom Hughes
d5d6698fae Translate heading for map key sidebar (uses existing site.map.map_key
translation). Closes #1905.
2009-06-02 13:33:18 +00:00
Ævar Arnfjörð Bjarmason
e70e2dbe9f Change /index.php/ in wiki.openstreetmap.org links to /wiki/. This looks nicer 2009-06-02 12:23:37 +00:00
Tom Hughes
6254853c5c Add a few missing translations. Closes #1903. 2009-06-02 12:02:21 +00:00
Tom Hughes
35eeff0081 Fix up translation issues in diary comment notifier. 2009-06-02 08:25:00 +00:00
Tom Hughes
1be7bb8a04 Make a few more strings translatable in the diary entry controller
and tidy up the translations for some of the partials.
2009-06-02 08:13:41 +00:00
Shaun McDonald
87ee00a65e Made also part of translatable. Fixes #1897. 2009-06-02 07:14:55 +00:00