]> git.openstreetmap.org Git - rails.git/log
rails.git
15 years agotiny fix
Jonas Krückel [Mon, 8 Jun 2009 09:42:24 +0000 (09:42 +0000)]
tiny fix

15 years agoRevert [15752]: The duplication of content intentional for dead-tree
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 23:42:26 +0000 (23:42 +0000)]
Revert [15752]: The duplication of content intentional for dead-tree
printouts, which I didn't consider. Oops! Thanks TomH :)

15 years agotry reestablishing NetConnection on retry, and trap empty relation tags
Richard Fairhurst [Sun, 7 Jun 2009 23:28:46 +0000 (23:28 +0000)]
try reestablishing NetConnection on retry, and trap empty relation tags

15 years agoUse {{count}} instead of {{distance}} for kilometer count as {{count}} is a magical...
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 22:14:22 +0000 (22:14 +0000)]
Use {{count}} instead of {{distance}} for kilometer count as {{count}} is a magical enumerated variable in Rails.

15 years agoMake some links more rails like, thus easier to read. Test that partials are included...
Shaun McDonald [Sun, 7 Jun 2009 21:45:33 +0000 (21:45 +0000)]
Make some links more rails like, thus easier to read. Test that partials are included as expected.

15 years agoUse {{count}} instead of {{(node|way_relation)_count}} since {{count}}
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 21:27:05 +0000 (21:27 +0000)]
Use {{count}} instead of {{(node|way_relation)_count}} since {{count}}
is a magical enumerated variable in Rails.

15 years agoEdgemaster & shaunmcdonald pointed out that my ad-hoc hackery was
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 21:10:34 +0000 (21:10 +0000)]
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

15 years agoMore tests to check that user creation works, and the url in the e-mail is the same...
Shaun McDonald [Sun, 7 Jun 2009 21:07:07 +0000 (21:07 +0000)]
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.

15 years agoAdd a tooltip to help & wiki/news blog/shop/map key
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 20:33:13 +0000 (20:33 +0000)]
Add a tooltip to help & wiki/news blog/shop/map key

15 years agoShould have been part of [15755]: Cursed vc-dir interface
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 20:01:29 +0000 (20:01 +0000)]
Should have been part of [15755]: Cursed vc-dir interface

15 years agoMade a lot of things translatable and added title="" tooltips
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 19:58:34 +0000 (19:58 +0000)]
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

15 years agosynced with english r15753, added more translations
Štefan Baebler [Sun, 7 Jun 2009 19:17:20 +0000 (19:17 +0000)]
synced with english r15753, added more translations

15 years agoinclude the correct language and direction in the html element. fixes #1930. fixes...
Shaun McDonald [Sun, 7 Jun 2009 18:44:59 +0000 (18:44 +0000)]
include the correct language and direction in the html element. fixes #1930. fixes #1929

15 years agoThe display:none attribution table looks horrid in text browsers
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 17:08:25 +0000 (17:08 +0000)]
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.

15 years agoMarge all the changeset list methods together into one.
Tom Hughes [Sun, 7 Jun 2009 16:59:58 +0000 (16:59 +0000)]
Marge all the changeset list methods together into one.

15 years agoBackout pagintion change as the included models are sometimes needed...
Tom Hughes [Sun, 7 Jun 2009 16:52:10 +0000 (16:52 +0000)]
Backout pagintion change as the included models are sometimes needed...

15 years agoMake creating a bbox object from a string work.
Tom Hughes [Sun, 7 Jun 2009 16:32:24 +0000 (16:32 +0000)]
Make creating a bbox object from a string work.

15 years agoDon't bother with the includes when doing the count - they aren't needed
Tom Hughes [Sun, 7 Jun 2009 16:32:00 +0000 (16:32 +0000)]
Don't bother with the includes when doing the count - they aren't needed
and just make it much less efficient.

15 years agoTranslated js_[123]: You don't have JS enabled
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 16:28:38 +0000 (16:28 +0000)]
Translated js_[123]: You don't have JS enabled

15 years agoMade UCL VR Centre and bytemark in 'layouts.intro_3' translatable
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 16:22:02 +0000 (16:22 +0000)]
Made UCL VR Centre and bytemark in 'layouts.intro_3' translatable

15 years agoMade GPX notification E-Mails translatable
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 15:50:30 +0000 (15:50 +0000)]
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.

15 years agoApply javascript translations changes to be translation.
Tom Hughes [Sun, 7 Jun 2009 14:40:56 +0000 (14:40 +0000)]
Apply javascript translations changes to be translation.

15 years agoAdd Belarusian translation. Closes #1928.
Tom Hughes [Sun, 7 Jun 2009 14:08:26 +0000 (14:08 +0000)]
Add Belarusian translation. Closes #1928.

15 years agotypos
Štefan Baebler [Sun, 7 Jun 2009 12:08:39 +0000 (12:08 +0000)]
typos

15 years agoMake links to user edits work again.
Tom Hughes [Sun, 7 Jun 2009 11:44:41 +0000 (11:44 +0000)]
Make links to user edits work again.

15 years agopartially synced
Štefan Baebler [Sun, 7 Jun 2009 11:35:02 +0000 (11:35 +0000)]
partially synced

15 years agoUse some rails magic to avoid having to duplicate all the changeset
Tom Hughes [Sun, 7 Jun 2009 11:24:11 +0000 (11:24 +0000)]
Use some rails magic to avoid having to duplicate all the changeset
list controller methods for the RSS feeds.

15 years agoTweak migration to ensure that migrating from a database with existing
Tom Hughes [Sun, 7 Jun 2009 10:01:28 +0000 (10:01 +0000)]
Tweak migration to ensure that migrating from a database with existing
diary entries sets a default language for those entries.

15 years agoDutch translations updates. Close #1925.
Tom Hughes [Sun, 7 Jun 2009 09:03:18 +0000 (09:03 +0000)]
Dutch translations updates. Close #1925.

15 years agoRework the javascript I18n interpolation a bit - the interpolation function
Tom Hughes [Sun, 7 Jun 2009 08:32:39 +0000 (08:32 +0000)]
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.

15 years agoBack out the changeset RSS stuff from the head for now.
Tom Hughes [Sun, 7 Jun 2009 08:03:07 +0000 (08:03 +0000)]
Back out the changeset RSS stuff from the head for now.

15 years agoMake a branch of the head for working on changeset browsing.
Tom Hughes [Sun, 7 Jun 2009 08:01:37 +0000 (08:01 +0000)]
Make a branch of the head for working on changeset browsing.

15 years agoThe list_bbox_rss won't work at all without a bbox. Thow an error when it's not supplied
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 03:06:09 +0000 (03:06 +0000)]
The list_bbox_rss won't work at all without a bbox. Thow an error when it's not supplied

15 years agoForgot that /history can also be called without a bbox (if one can't be found)
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 02:53:24 +0000 (02:53 +0000)]
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.

15 years agoAdd RSS feed for global recent changes & changes within a bbox. Solves #1737
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 02:39:45 +0000 (02:39 +0000)]
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.

15 years agoDon't add a <comments> entry for anonymous users
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 02:32:16 +0000 (02:32 +0000)]
Don't add a <comments> entry for anonymous users

15 years agoImplement /user/$user/edits/rss, partially solves #1737
Ævar Arnfjörð Bjarmason [Sun, 7 Jun 2009 01:32:19 +0000 (01:32 +0000)]
Implement /user/$user/edits/rss, partially solves #1737

15 years agoIcelandic translations for rails-i18n. This still has to be merged upstream.
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 21:43:30 +0000 (21:43 +0000)]
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.

15 years agoMake URL that link to the OSM Wiki configurable by translations. A lot
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 21:36:49 +0000 (21:36 +0000)]
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.

15 years agonew translations
Jonas Krückel [Sat, 6 Jun 2009 21:18:44 +0000 (21:18 +0000)]
new translations

15 years agouptodate with en.yml 15703
Jonas Krückel [Sat, 6 Jun 2009 21:12:26 +0000 (21:12 +0000)]
uptodate with en.yml 15703

15 years agoTranslations for settings/setting errors
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 20:13:55 +0000 (20:13 +0000)]
Translations for settings/setting errors

15 years agoBreytt þann => Breytt, more succinct
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 19:36:12 +0000 (19:36 +0000)]
Breytt þann => Breytt, more succinct

15 years ago{{view_history_link}} -> {{view_details_link}}. This broke the site in Icelandic
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 19:30:46 +0000 (19:30 +0000)]
{{view_history_link}} -> {{view_details_link}}. This broke the site in Icelandic

15 years agoSpelling error in ''browse.start_rjs.object_list.api'': are => area
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 19:24:19 +0000 (19:24 +0000)]
Spelling error in ''browse.start_rjs.object_list.api'': are => area

15 years agoMore progress on ticket:1919
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 19:22:39 +0000 (19:22 +0000)]
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

15 years agoobject_list.type.relation isn't used by anything
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 18:32:15 +0000 (18:32 +0000)]
object_list.type.relation isn't used by anything

15 years agoNuked 'browse.start_rjs.unable_to_load' and replaced it with
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 18:25:41 +0000 (18:25 +0000)]
Nuked 'browse.start_rjs.unable_to_load' and replaced it with
'browse.start_rjs.unable_to_load_size' which solves #1919 some more.

15 years agoDon't hardcode bbox size 0.25, use APP_CONFIG['max_request_area'] instead
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 18:13:11 +0000 (18:13 +0000)]
Don't hardcode bbox size 0.25, use APP_CONFIG['max_request_area'] instead

15 years agoImplement a hack so that we can interpolate JavaScript variables in
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 17:57:08 +0000 (17:57 +0000)]
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.

15 years agoImprove the data browser translation logic.
Tom Hughes [Sat, 6 Jun 2009 15:46:41 +0000 (15:46 +0000)]
Improve the data browser translation logic.

15 years agoMade a bunch of start.rjs stuff translatable, including
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 15:05:39 +0000 (15:05 +0000)]
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.

15 years agoTranslation for new strings in en.yml that weren't here already:
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 14:22:05 +0000 (14:22 +0000)]
Translation for new strings in en.yml that weren't here already:

 * Login to leave comment
 * Tooltip strings
 * Various new E-Mail templates translated

15 years agotranslation of tooltips
Jonas Krückel [Sat, 6 Jun 2009 13:45:17 +0000 (13:45 +0000)]
translation of tooltips

15 years agoAdded & cleaned up messages relating to a given user not existing
Ævar Arnfjörð Bjarmason [Sat, 6 Jun 2009 13:15:53 +0000 (13:15 +0000)]
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}}.

15 years agoMake tab tooltips translatable.
Tom Hughes [Sat, 6 Jun 2009 13:12:57 +0000 (13:12 +0000)]
Make tab tooltips translatable.

15 years agoCorrections
Jonas Krückel [Sat, 6 Jun 2009 12:20:01 +0000 (12:20 +0000)]
Corrections

15 years agonew translations (mainly email)
Jonas Krückel [Sat, 6 Jun 2009 11:58:10 +0000 (11:58 +0000)]
new translations (mainly email)

15 years agouptodate with en.yml 15675
Jonas Krückel [Sat, 6 Jun 2009 10:59:56 +0000 (10:59 +0000)]
uptodate with en.yml 15675

15 years agoSet reviewboard:url property on the locales dir.
Łukasz Jernaś [Sat, 6 Jun 2009 09:17:29 +0000 (09:17 +0000)]
Set reviewboard:url property on the locales dir.

15 years agoChanges to Polish translation from balrog-kun.
Łukasz Jernaś [Sat, 6 Jun 2009 09:09:13 +0000 (09:09 +0000)]
Changes to Polish translation from balrog-kun.

15 years agoMake the rest of the email translatable.
Tom Hughes [Fri, 5 Jun 2009 23:53:47 +0000 (23:53 +0000)]
Make the rest of the email translatable.

15 years agoAdd an extra message to detect Postgres deadlocks.
Tom Hughes [Fri, 5 Jun 2009 23:08:29 +0000 (23:08 +0000)]
Add an extra message to detect Postgres deadlocks.

15 years agoUpdate deadlock_retry plugin with latest upstream code.
Tom Hughes [Fri, 5 Jun 2009 23:07:10 +0000 (23:07 +0000)]
Update deadlock_retry plugin with latest upstream code.

15 years agoEscape quotes to keep javascript happy.
Tom Hughes [Fri, 5 Jun 2009 22:56:09 +0000 (22:56 +0000)]
Escape quotes to keep javascript happy.

15 years agoCatch creation of en.po
Thomas Wood [Fri, 5 Jun 2009 22:38:04 +0000 (22:38 +0000)]
Catch creation of en.po

15 years agoAdd bulk yaml production to yaml2po
Thomas Wood [Fri, 5 Jun 2009 22:27:21 +0000 (22:27 +0000)]
Add bulk yaml production to yaml2po

15 years agomore translations
Jonas Krückel [Fri, 5 Jun 2009 21:53:25 +0000 (21:53 +0000)]
more translations

15 years agoupdated translations
Jonas Krückel [Fri, 5 Jun 2009 21:48:44 +0000 (21:48 +0000)]
updated translations

15 years agouptodate with en.yml 15663
Jonas Krückel [Fri, 5 Jun 2009 21:40:21 +0000 (21:40 +0000)]
uptodate with en.yml 15663

15 years agofuther minor improvements
Artem Dudarev [Fri, 5 Jun 2009 20:21:57 +0000 (20:21 +0000)]
futher minor improvements

15 years agoAdd the counterpart script, po2yaml, and use strctxt rather than #: for identifying...
Thomas Wood [Fri, 5 Jun 2009 19:03:39 +0000 (19:03 +0000)]
Add the counterpart script, po2yaml, and use strctxt rather than #: for identifying strings.

15 years agoMake node/way/relation which is fed into the the 'browse.not_found.sorry' message...
Ævar Arnfjörð Bjarmason [Fri, 5 Jun 2009 19:02:31 +0000 (19:02 +0000)]
Make node/way/relation which is fed into the the 'browse.not_found.sorry' message translatable

15 years agoMake "Login to leave a comment" translatable.
Tom Hughes [Fri, 5 Jun 2009 18:11:50 +0000 (18:11 +0000)]
Make "Login to leave a comment" translatable.

15 years agoUpdate key when the zoom changes, even if the language is not english.
Tom Hughes [Fri, 5 Jun 2009 18:06:38 +0000 (18:06 +0000)]
Update key when the zoom changes, even if the language is not english.

15 years agoadded missing translations
Jonas Krückel [Fri, 5 Jun 2009 16:46:55 +0000 (16:46 +0000)]
added missing translations

15 years ago * Translated new things from en.yml since the last import
Ævar Arnfjörð Bjarmason [Fri, 5 Jun 2009 15:46:52 +0000 (15:46 +0000)]
 * Translated new things from en.yml since the last import
 * Changen innbox/útbox to innhólf/úthólf, as suggested by http://herdubreid.rhi.hi.is:1026/wordbank/search
 * Translated "add a marker" in Export tab
 * Translated some more e-mail stuff

15 years agochanged to plural diary_entry: view: title
Artem Dudarev [Fri, 5 Jun 2009 15:26:39 +0000 (15:26 +0000)]
changed to plural diary_entry: view: title

15 years agouptodate with en.yml 15653 now
Jonas Krückel [Fri, 5 Jun 2009 15:21:54 +0000 (15:21 +0000)]
uptodate with en.yml 15653 now

15 years agoremove_friend.success was missing a closing paren, so '{{name}' showed up literally...
Ævar Arnfjörð Bjarmason [Fri, 5 Jun 2009 15:09:41 +0000 (15:09 +0000)]
remove_friend.success was missing a closing paren, so '{{name}' showed up literally in all these languages when removing a friend

15 years agoFix indentation.
Tom Hughes [Fri, 5 Jun 2009 15:03:26 +0000 (15:03 +0000)]
Fix indentation.

15 years agoTranslate the title of the user diary view.
Tom Hughes [Fri, 5 Jun 2009 14:59:13 +0000 (14:59 +0000)]
Translate the title of the user diary view.

15 years agoRemove byte order mark from start of file and convert DOS line endings.
Tom Hughes [Fri, 5 Jun 2009 14:29:32 +0000 (14:29 +0000)]
Remove byte order mark from start of file and convert DOS line endings.

15 years agoRename zh-cn to zh-CN which is the recommended capitalisation.
Tom Hughes [Fri, 5 Jun 2009 14:21:26 +0000 (14:21 +0000)]
Rename zh-cn to zh-CN which is the recommended capitalisation.

15 years agoAdd zh-CN to OpenLayers.
Tom Hughes [Fri, 5 Jun 2009 14:20:15 +0000 (14:20 +0000)]
Add zh-CN to OpenLayers.

15 years agomeine changed to eigene, more corrections and changes, closing #1889
Jonas Krückel [Fri, 5 Jun 2009 14:15:36 +0000 (14:15 +0000)]
meine changed to eigene, more corrections and changes, closing #1889

15 years agoNew Chinese .yml file. Part done.
Jenny Herbert [Fri, 5 Jun 2009 14:04:34 +0000 (14:04 +0000)]
New Chinese .yml file.  Part done.

15 years agomore translations and corrections
Jonas Krückel [Fri, 5 Jun 2009 13:49:10 +0000 (13:49 +0000)]
more translations and corrections

15 years agonew translations
Jonas Krückel [Fri, 5 Jun 2009 13:25:45 +0000 (13:25 +0000)]
new translations

15 years ago(no commit message)
Davide Prade [Fri, 5 Jun 2009 13:11:29 +0000 (13:11 +0000)]

15 years ago(no commit message)
Davide Prade [Fri, 5 Jun 2009 13:01:02 +0000 (13:01 +0000)]

15 years ago(no commit message)
Davide Prade [Fri, 5 Jun 2009 12:57:50 +0000 (12:57 +0000)]

15 years ago(no commit message)
Davide Prade [Fri, 5 Jun 2009 12:54:14 +0000 (12:54 +0000)]

15 years ago(no commit message)
Davide Prade [Fri, 5 Jun 2009 12:51:46 +0000 (12:51 +0000)]

15 years ago(no commit message)
Davide Prade [Fri, 5 Jun 2009 12:49:51 +0000 (12:49 +0000)]

15 years ago(no commit message)
Davide Prade [Fri, 5 Jun 2009 12:46:55 +0000 (12:46 +0000)]

15 years ago(no commit message)
Davide Prade [Fri, 5 Jun 2009 12:45:31 +0000 (12:45 +0000)]

15 years ago(no commit message)
Davide Prade [Fri, 5 Jun 2009 12:42:27 +0000 (12:42 +0000)]

15 years ago(no commit message)
Davide Prade [Fri, 5 Jun 2009 12:40:05 +0000 (12:40 +0000)]

15 years ago(no commit message)
Davide Prade [Fri, 5 Jun 2009 12:39:00 +0000 (12:39 +0000)]