]> git.openstreetmap.org Git - rails.git/log
rails.git
15 years agoRemove old attempt at i18n.
Tom Hughes [Sat, 30 May 2009 15:39:30 +0000 (15:39 +0000)]
Remove old attempt at i18n.

15 years agoFix quoting in fr translation
Shaun McDonald [Sat, 30 May 2009 15:29:10 +0000 (15:29 +0000)]
Fix quoting in fr translation

15 years agoUpdated de translation
Shaun McDonald [Sat, 30 May 2009 15:13:03 +0000 (15:13 +0000)]
Updated de translation

15 years agoFix typo in en translation file and add first pass of fr translation
Shaun McDonald [Sat, 30 May 2009 15:02:15 +0000 (15:02 +0000)]
Fix typo in en translation file and add first pass of fr translation

15 years agomore translations, and this time with stuff in the locale file too
Andy Allan [Sat, 30 May 2009 14:58:35 +0000 (14:58 +0000)]
more translations, and this time with stuff in the locale file too

15 years agofix #1818
Richard Fairhurst [Sat, 30 May 2009 14:42:28 +0000 (14:42 +0000)]
fix #1818

15 years agoFix typo
Shaun McDonald [Sat, 30 May 2009 14:26:28 +0000 (14:26 +0000)]
Fix typo

15 years agoUpdate the German translation
Shaun McDonald [Sat, 30 May 2009 14:19:20 +0000 (14:19 +0000)]
Update the German translation

15 years agoSome more of the user account translations. Custom generate method for languages...
Shaun McDonald [Sat, 30 May 2009 14:04:42 +0000 (14:04 +0000)]
Some more of the user account translations. Custom generate method for languages, that doesn't appear to work. Setting user language on create. Start translations in controllers. Diary entries can now be saved.

15 years agoFix wrapping in changeset lists properly.
Tom Hughes [Sat, 30 May 2009 13:50:21 +0000 (13:50 +0000)]
Fix wrapping in changeset lists properly.

15 years agoFirst two bits of databrowser i18n
Andy Allan [Sat, 30 May 2009 13:46:59 +0000 (13:46 +0000)]
First two bits of databrowser i18n

15 years agoStop long changeset comments causing other fields to get split over
Tom Hughes [Sat, 30 May 2009 13:38:17 +0000 (13:38 +0000)]
Stop long changeset comments causing other fields to get split over
multiple lines.

15 years agoRedirect to canonical hosts.
Tom Hughes [Sat, 30 May 2009 11:55:31 +0000 (11:55 +0000)]
Redirect to canonical hosts.

15 years agoMake links in tags active in the data browser. Fixes #1855.
Tom Hughes [Sat, 30 May 2009 11:27:25 +0000 (11:27 +0000)]
Make links in tags active in the data browser. Fixes #1855.

15 years agoInclude node coordinates on the data browser view for a node. Fixes #1856.
Tom Hughes [Sat, 30 May 2009 11:05:15 +0000 (11:05 +0000)]
Include node coordinates on the data browser view for a node. Fixes #1856.

15 years agoHopefully fixing the eranious char at the start of the file.
Shaun McDonald [Fri, 29 May 2009 23:53:19 +0000 (23:53 +0000)]
Hopefully fixing the eranious char at the start of the file.

15 years agoFixing indentation problem in de translation.
Shaun McDonald [Fri, 29 May 2009 17:24:37 +0000 (17:24 +0000)]
Fixing indentation problem in de translation.

15 years agofriend map translations
Shaun McDonald [Fri, 29 May 2009 17:19:04 +0000 (17:19 +0000)]
friend map translations

15 years agonew de translation. More of the user view translated.
Shaun McDonald [Fri, 29 May 2009 17:04:17 +0000 (17:04 +0000)]
new de translation. More of the user view translated.

15 years agoTypo in site key. More of the user view i18n'ed
Shaun McDonald [Fri, 29 May 2009 15:44:27 +0000 (15:44 +0000)]
Typo in site key. More of the user view i18n'ed

15 years agoHalf the user view translated.
Shaun McDonald [Fri, 29 May 2009 15:10:36 +0000 (15:10 +0000)]
Half the user view translated.

15 years agoMight be useful to set the locale everywhere we need the web, rather than just the...
Shaun McDonald [Fri, 29 May 2009 14:11:12 +0000 (14:11 +0000)]
Might be useful to set the locale everywhere we need the web, rather than just the diary entries.

15 years agoAdding some missing translations from the left menu
Shaun McDonald [Fri, 29 May 2009 12:01:31 +0000 (12:01 +0000)]
Adding some missing translations from the left menu

15 years agoi18n'ed the site set of views.
Shaun McDonald [Fri, 29 May 2009 11:42:11 +0000 (11:42 +0000)]
i18n'ed the site set of views.

15 years agoCouple of bugfixes, brackets and quotes
Shaun McDonald [Fri, 29 May 2009 10:04:50 +0000 (10:04 +0000)]
Couple of bugfixes, brackets and quotes

15 years agoAdding Jokru's translation into de so far.
Shaun McDonald [Fri, 29 May 2009 09:52:28 +0000 (09:52 +0000)]
Adding Jokru's translation into de so far.

15 years agoi18n'ing the site layout.
Shaun McDonald [Thu, 28 May 2009 18:07:11 +0000 (18:07 +0000)]
i18n'ing the site layout.

15 years agoimprove error handling when connection fails; closes #1864 and #1871
Richard Fairhurst [Wed, 27 May 2009 21:04:26 +0000 (21:04 +0000)]
improve error handling when connection fails; closes #1864 and #1871

15 years agoDiary entries pretty much i18n'd. Additional test that checks there are no missing...
Shaun McDonald [Wed, 27 May 2009 17:19:59 +0000 (17:19 +0000)]
Diary entries pretty much i18n'd. Additional test that checks there are no missing translation strings, need more like it.

15 years agoRemove the languages hash since we are now storing the languages in a table. Translat...
Shaun McDonald [Wed, 27 May 2009 15:50:55 +0000 (15:50 +0000)]
Remove the languages hash since we are now storing the languages in a table. Translated the posted by line in diary entry list.

15 years agoAdd Globalize2 so that we get some nice fall backs to other languages when a translat...
Shaun McDonald [Wed, 27 May 2009 15:39:14 +0000 (15:39 +0000)]
Add Globalize2 so that we get some nice fall backs to other languages when a translation is missing in the requested language.

15 years agoOnly use the db functions for migrations if USE_DB_FUNCTIONS is set
Tom Hughes [Wed, 27 May 2009 15:25:28 +0000 (15:25 +0000)]
Only use the db functions for migrations if USE_DB_FUNCTIONS is set
in the environment. This could possibly be revisited when we move to
rails 2.3 by using a nested transaction to try the function without
causing the surrounding transaction to abort.

15 years agotranslating the listing of diary entries. Adding some initial tests for checking...
Shaun McDonald [Wed, 27 May 2009 15:06:25 +0000 (15:06 +0000)]
translating the listing of diary entries. Adding some initial tests for checking that you don't get any errors in any locale, when listing the diary entries. Don't yet check for missing translations through an assert_select, .., :count => 0.

15 years agoDisabled edit tab until z13 is reached.
Tom Hughes [Wed, 27 May 2009 13:34:50 +0000 (13:34 +0000)]
Disabled edit tab until z13 is reached.

15 years agoUse a nicer less error prone version of the select helper
Shaun McDonald [Wed, 27 May 2009 13:15:58 +0000 (13:15 +0000)]
Use a nicer less error prone version of the select helper

15 years agoActually set the locale from the users browser request, rather than just parsing it.
Shaun McDonald [Wed, 27 May 2009 12:57:28 +0000 (12:57 +0000)]
Actually set the locale from the users browser request, rather than just parsing it.

15 years agoCreate a proper exception class for invalid bounding box exceptions.
Tom Hughes [Tue, 26 May 2009 23:47:45 +0000 (23:47 +0000)]
Create a proper exception class for invalid bounding box exceptions.

15 years agoMerge r15175 from i18n_2 branch.
Thomas Wood [Tue, 26 May 2009 22:33:28 +0000 (22:33 +0000)]
Merge r15175 from i18n_2 branch.

15 years agoWorking around mysql bug...
Matt Amos [Tue, 26 May 2009 16:55:05 +0000 (16:55 +0000)]
Working around mysql bug...

15 years agoAdded missing ordering to relation members. This was only visible in some relations...
Matt Amos [Tue, 26 May 2009 15:57:57 +0000 (15:57 +0000)]
Added missing ordering to relation members. This was only visible in some relations when grabbing from the history API.

15 years agoBetter testing of bbox handling in relations. Maybe fixes #1861, but wasn't able...
Matt Amos [Tue, 26 May 2009 15:37:29 +0000 (15:37 +0000)]
Better testing of bbox handling in relations. Maybe fixes #1861, but wasn't able to reproduce the exact case. Fixed bug handling bboxes where element is repeated in relation.

15 years agoDiary entry test for the new language field. Currently fails as expected.
Shaun McDonald [Tue, 26 May 2009 15:36:10 +0000 (15:36 +0000)]
Diary entry test for the new language field. Currently fails as expected.

15 years agoSome test improvements
Shaun McDonald [Tue, 26 May 2009 14:45:30 +0000 (14:45 +0000)]
Some test improvements

15 years agoUse SOTM logo to link to the SOTM site.
Tom Hughes [Tue, 26 May 2009 13:16:10 +0000 (13:16 +0000)]
Use SOTM logo to link to the SOTM site.

15 years agoFix the fixtures. Related changeset 15184.
Shaun McDonald [Tue, 26 May 2009 13:12:42 +0000 (13:12 +0000)]
Fix the fixtures. Related changeset 15184.

15 years agofix #1849
Richard Fairhurst [Mon, 25 May 2009 10:19:50 +0000 (10:19 +0000)]
fix #1849

15 years agofix upload item count
Richard Fairhurst [Sat, 23 May 2009 19:11:44 +0000 (19:11 +0000)]
fix upload item count

15 years agoUse a block to add the language record as rails seems to ignore any
Tom Hughes [Sat, 23 May 2009 12:39:45 +0000 (12:39 +0000)]
Use a block to add the language record as rails seems to ignore any
attempt to set the primary key in the argument list of the create method.

15 years agoRename language_code to code - language_code is tautological when it's
Tom Hughes [Sat, 23 May 2009 00:00:25 +0000 (00:00 +0000)]
Rename language_code to code - language_code is tautological when it's
in the language table anyway.

15 years agoAltered to match rails 2.3.2 implementation.
Tom Hughes [Fri, 22 May 2009 23:49:08 +0000 (23:49 +0000)]
Altered to match rails 2.3.2 implementation.

15 years agoDon't ask the backend directly for the available locales - just ask
Tom Hughes [Fri, 22 May 2009 23:42:17 +0000 (23:42 +0000)]
Don't ask the backend directly for the available locales - just ask
the I18n module and let it worry about where to find them.

15 years agoadapt for larger fonts on Linux; fix indexing with renumbered nodes
Richard Fairhurst [Fri, 22 May 2009 19:43:56 +0000 (19:43 +0000)]
adapt for larger fonts on Linux; fix indexing with renumbered nodes

15 years agoFix missing require in migrations.
Thomas Wood [Fri, 22 May 2009 18:53:24 +0000 (18:53 +0000)]
Fix missing require in migrations.

15 years agoReverting config file that shouldn't have been committed.
Shaun McDonald [Fri, 22 May 2009 18:41:33 +0000 (18:41 +0000)]
Reverting config file that shouldn't have been committed.

15 years agoFirst stage of i18n. Some migrations and extra plugins.
Shaun McDonald [Fri, 22 May 2009 18:36:17 +0000 (18:36 +0000)]
First stage of i18n. Some migrations and extra plugins.

15 years agoMaking new short lived branch for the Rails 2.2 based internationalization.
Shaun McDonald [Fri, 22 May 2009 15:36:56 +0000 (15:36 +0000)]
Making new short lived branch for the Rails 2.2 based internationalization.

15 years agoOverride interestingTagsExclude in GML layer - improve databrowser in US by ignoring...
Andy Allan [Fri, 22 May 2009 14:20:22 +0000 (14:20 +0000)]
Override interestingTagsExclude in GML layer - improve databrowser in US by ignoring vanilla TIGER nodes

15 years agoDisabled automatic parsing of XML to a hash in request bodies for a modest 15% speedup.
Matt Amos [Thu, 21 May 2009 23:48:34 +0000 (23:48 +0000)]
Disabled automatic parsing of XML to a hash in request bodies for a modest 15% speedup.

15 years agoReverting earlier change that means that zoom isn't set in certain code paths.
Shaun McDonald [Thu, 21 May 2009 23:20:46 +0000 (23:20 +0000)]
Reverting earlier change that means that zoom isn't set in certain code paths.

15 years agoCheck for wrapped timeout errors properly.
Tom Hughes [Thu, 21 May 2009 21:55:30 +0000 (21:55 +0000)]
Check for wrapped timeout errors properly.

15 years agoFixed typo.
Matt Amos [Thu, 21 May 2009 21:24:29 +0000 (21:24 +0000)]
Fixed typo.

15 years agoRationalise API error classes by getting of the render_opts method which
Tom Hughes [Thu, 21 May 2009 19:28:39 +0000 (19:28 +0000)]
Rationalise API error classes by getting of the render_opts method which
was never used except to extract the data it contained. Instead each class
now has a status method that returns the HTTP status code to use and a
to_s method to return a textual description of the error.

15 years agoFixup AMF controller tests.
Tom Hughes [Thu, 21 May 2009 17:30:32 +0000 (17:30 +0000)]
Fixup AMF controller tests.

15 years agoFix some comments to reflect reality.
Tom Hughes [Thu, 21 May 2009 17:30:20 +0000 (17:30 +0000)]
Fix some comments to reflect reality.

15 years agoallow the user to pass in a gpx and a zoom
Shaun McDonald [Thu, 21 May 2009 17:25:39 +0000 (17:25 +0000)]
allow the user to pass in a gpx and a zoom

15 years agoAdd svn ignore for the sql files used for dumping the db schema.
Shaun McDonald [Thu, 21 May 2009 14:57:47 +0000 (14:57 +0000)]
Add svn ignore for the sql files used for dumping the db schema.

15 years agoAdded locking around update and delete methods on main API objects. This should remov...
Matt Amos [Thu, 21 May 2009 14:57:03 +0000 (14:57 +0000)]
Added locking around update and delete methods on main API objects. This should remove the 500 errors which come from concurrent overlapping updates. Experimental - might be too slow for production.

15 years agoUse utility method for error reporting.
Matt Amos [Thu, 21 May 2009 14:55:25 +0000 (14:55 +0000)]
Use utility method for error reporting.

15 years agoDon't store the real database config in svn, instead store examples for Postgres...
Shaun McDonald [Thu, 21 May 2009 14:45:16 +0000 (14:45 +0000)]
Don't store the real database config in svn, instead store examples for Postgres and MySQL. (Reverting Edgemaster's silly revert.)

15 years agoRaising an exception in Ruby requires a .new. Add a timeout line to the capabilities...
Shaun McDonald [Thu, 21 May 2009 14:05:09 +0000 (14:05 +0000)]
Raising an exception in Ruby requires a .new. Add a timeout line to the capabilities call.

15 years agoGive the API error handler a generic rescue that returns 500 with
Tom Hughes [Thu, 21 May 2009 10:02:26 +0000 (10:02 +0000)]
Give the API error handler a generic rescue that returns 500 with
the exception details.

15 years agoMonkey patch rails to ensure OSM::APITimeoutError exceptions are not lost.
Tom Hughes [Thu, 21 May 2009 09:57:21 +0000 (09:57 +0000)]
Monkey patch rails to ensure OSM::APITimeoutError exceptions are not lost.

15 years agoPotlatch 1.0
Richard Fairhurst [Thu, 21 May 2009 00:30:33 +0000 (00:30 +0000)]
Potlatch 1.0

15 years agoAdd a global timeout that is applied to most API requests.
Tom Hughes [Wed, 20 May 2009 22:18:36 +0000 (22:18 +0000)]
Add a global timeout that is applied to most API requests.

15 years agoUsing an around_handler for catching and rendering errors in most of the API controll...
Matt Amos [Wed, 20 May 2009 17:39:59 +0000 (17:39 +0000)]
Using an around_handler for catching and rendering errors in most of the API controller methods. This simplifies the code and makes errors and error messages a bit more consistent. Also added a utility method for checking the HTTP method.

15 years agoLog arguments to AMF read methods.
Tom Hughes [Wed, 20 May 2009 13:24:59 +0000 (13:24 +0000)]
Log arguments to AMF read methods.

15 years agoBack out the stupid change.
Thomas Wood [Sat, 16 May 2009 22:46:42 +0000 (22:46 +0000)]
Back out the stupid change.

15 years agoSecond part of [15085]
Thomas Wood [Sat, 16 May 2009 22:42:34 +0000 (22:42 +0000)]
Second part of [15085]

15 years agoDatabase config changes to hopefully stop people from accidently commiting database...
Thomas Wood [Sat, 16 May 2009 22:37:08 +0000 (22:37 +0000)]
Database config changes to hopefully stop people from accidently commiting database.yml. (As recommended by Shaun)
I'll back this out if it doesn't work nicely with what's on dev.

15 years agoRevert harry's commit of the database configuration.
Tom Hughes [Fri, 15 May 2009 17:59:01 +0000 (17:59 +0000)]
Revert harry's commit of the database configuration.

15 years agolabel changesets as (big) based on their bbox area
Harry Wood [Fri, 15 May 2009 16:24:55 +0000 (16:24 +0000)]
label changesets as (big) based on their bbox area

15 years agoExtra little test, setting the language on the diary fixtures.
Shaun McDonald [Fri, 15 May 2009 15:41:45 +0000 (15:41 +0000)]
Extra little test, setting the language on the diary fixtures.

15 years agoArrays of object IDs are a bad idea.
Tom Hughes [Fri, 15 May 2009 09:18:10 +0000 (09:18 +0000)]
Arrays of object IDs are a bad idea.

15 years agoOptimise retrieval of full relations.
Tom Hughes [Fri, 15 May 2009 09:10:50 +0000 (09:10 +0000)]
Optimise retrieval of full relations.

15 years agoOops. Fixed another Time/DateTime problem.
Matt Amos [Thu, 14 May 2009 13:13:09 +0000 (13:13 +0000)]
Oops. Fixed another Time/DateTime problem.

15 years agoFixed problem with Time vs. DateTime classes in fixtures. Weirdly only affected mysql...
Matt Amos [Thu, 14 May 2009 11:52:15 +0000 (11:52 +0000)]
Fixed problem with Time vs. DateTime classes in fixtures. Weirdly only affected mysql backend.

15 years agoFixed precondition failed message which was trying to dereference nil.
Matt Amos [Thu, 14 May 2009 11:19:28 +0000 (11:19 +0000)]
Fixed precondition failed message which was trying to dereference nil.

15 years agoApply #1824.
Richard Fairhurst [Thu, 14 May 2009 08:38:32 +0000 (08:38 +0000)]
Apply #1824.

15 years agoRemove a rescue, which is stopping a more detailed error message being returned to...
Shaun McDonald [Wed, 13 May 2009 23:42:18 +0000 (23:42 +0000)]
Remove a rescue, which is stopping a more detailed error message being returned to the user.

15 years agoalways set new node id when updating/deleting (to be read in conjunction with zere...
Richard Fairhurst [Wed, 13 May 2009 19:23:59 +0000 (19:23 +0000)]
always set new node id when updating/deleting (to be read in conjunction with zere's patch)

15 years agoAdded a consistency check that both ids are valid and match. Fixed diff upload code...
Matt Amos [Wed, 13 May 2009 19:21:04 +0000 (19:21 +0000)]
Added a consistency check that both ids are valid and match. Fixed diff upload code where this wasn't being set.

15 years agoActually mark a trace as being public based on the saved preference, rather than...
Shaun McDonald [Tue, 12 May 2009 15:29:27 +0000 (15:29 +0000)]
Actually mark a trace as being public based on the saved preference, rather than simply ignoring the saved preference.

15 years agoRemoved updatetimeout method, as it isn't needed any more.
Matt Amos [Tue, 12 May 2009 14:38:22 +0000 (14:38 +0000)]
Removed updatetimeout method, as it isn't needed any more.

15 years agoFixed bug #1816 - the timeout updating logic should have been in a before_save handle...
Matt Amos [Tue, 12 May 2009 13:54:37 +0000 (13:54 +0000)]
Fixed bug #1816 - the timeout updating logic should have been in a before_save handler, not in save_with_tags.

15 years agoUse a local lookup table for country bounding boxes rather than relying
Tom Hughes [Mon, 11 May 2009 16:50:09 +0000 (16:50 +0000)]
Use a local lookup table for country bounding boxes rather than relying
on geonames.org being able to do it in a reasonable time.

15 years agodisabling test case because i don't think there is a fix with the current version...
Matt Amos [Mon, 11 May 2009 16:17:36 +0000 (16:17 +0000)]
disabling test case because i don't think there is a fix with the current version of composite_primary_keys.

15 years agoUse a regular expression for the test, since it can give one of two responses based...
Shaun McDonald [Mon, 11 May 2009 15:50:03 +0000 (15:50 +0000)]
Use a regular expression for the test, since it can give one of two responses based on the order in the db.

15 years agoA better optimisation, as suggested by TomH.
Matt Amos [Mon, 11 May 2009 15:16:36 +0000 (15:16 +0000)]
A better optimisation, as suggested by TomH.

15 years agoAdded optimisation for way checking. Same method as for relations.
Matt Amos [Mon, 11 May 2009 14:34:04 +0000 (14:34 +0000)]
Added optimisation for way checking. Same method as for relations.

15 years agoDestroy OL objects which use the dataLayer before we destroy the layer
Tom Hughes [Mon, 11 May 2009 10:31:34 +0000 (10:31 +0000)]
Destroy OL objects which use the dataLayer before we destroy the layer
or we will get errors which stop the rest of stopBrowse() executing.