Commit graph

2348 commits

Author SHA1 Message Date
Æ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
Shaun McDonald
887eba8c8d More tests to check that user creation works, and the url in the e-mail is the same. Seems that we can only test that a particular page is loading fine in all locales in the integration tests, and not the functional tests. 2009-06-07 21:07:07 +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
Štefan Baebler
f5e4e04e48 synced with english r15753, added more translations 2009-06-07 19:17:20 +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
1b58ea44d5 Translated js_[123]: You don't have JS enabled 2009-06-07 16:28:38 +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
2b07fd8b4b Apply javascript translations changes to be translation. 2009-06-07 14:40:56 +00:00
Tom Hughes
1aec77434e Add Belarusian translation. Closes #1928. 2009-06-07 14:08:26 +00:00
Štefan Baebler
5a87d2b199 typos 2009-06-07 12:08:39 +00:00
Štefan Baebler
a3f7f3ed96 partially synced 2009-06-07 11:35:02 +00:00
Tom Hughes
bb1198fb61 Tweak migration to ensure that migrating from a database with existing
diary entries sets a default language for those entries.
2009-06-07 10:01:28 +00:00
Tom Hughes
46c76da1fe Dutch translations updates. Close #1925. 2009-06-07 09:03:18 +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
991c940138 Icelandic translations for rails-i18n. This still has to be merged upstream.
Most of these strings have been translated without seeing them in
actual use in a rails application, but the German / Norwegian strings
were consulted during translation so it shouldn't be too bad.
2009-06-06 21:43:30 +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
Jonas Krückel
d0fcedcfb7 new translations 2009-06-06 21:18:44 +00:00
Jonas Krückel
cf9d422e92 uptodate with en.yml 15703 2009-06-06 21:12:26 +00:00
Ævar Arnfjörð Bjarmason
86bcd5ff6b Translations for settings/setting errors 2009-06-06 20:13:55 +00:00
Ævar Arnfjörð Bjarmason
7d1485e63c Breytt þann => Breytt, more succinct 2009-06-06 19:36:12 +00:00
Ævar Arnfjörð Bjarmason
42fc3ef5cc {{view_history_link}} -> {{view_details_link}}. This broke the site in Icelandic 2009-06-06 19:30:46 +00:00
Ævar Arnfjörð Bjarmason
563c9fe08f Spelling error in ''browse.start_rjs.object_list.api'': are => area 2009-06-06 19:24:19 +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
f9e5cdbb93 object_list.type.relation isn't used by anything 2009-06-06 18:32:15 +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
1ac570033a Translation for new strings in en.yml that weren't here already:
* Login to leave comment
 * Tooltip strings
 * Various new E-Mail templates translated
2009-06-06 14:22:05 +00:00
Jonas Krückel
9dc591ec64 translation of tooltips 2009-06-06 13:45:17 +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
Jonas Krückel
2963c48fbf Corrections 2009-06-06 12:20:01 +00:00
Jonas Krückel
04d291250b new translations (mainly email) 2009-06-06 11:58:10 +00:00
Jonas Krückel
6cb1fe4b4f uptodate with en.yml 15675 2009-06-06 10:59:56 +00:00
Łukasz Jernaś
dc2a18085c Set reviewboard:url property on the locales dir. 2009-06-06 09:17:29 +00:00