]> git.openstreetmap.org Git - rails.git/log
rails.git
15 years agodelete localised directory
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 16:05:56 +0000 (16:05 +0000)]
delete localised directory

15 years agoI'm hacking the Potlatch i18n system, moving the old files to the new location before...
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 16:05:09 +0000 (16:05 +0000)]
I'm hacking the Potlatch i18n system, moving the old files to the new location before I overwrite them to preserve history

15 years agoSyncing translations from the wiki. Hopefully for the last time :)
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 15:51:33 +0000 (15:51 +0000)]
Syncing translations from the wiki. Hopefully for the last time :)

15 years agoRemove remaining trailing spaces from translations.
Tom Hughes [Tue, 22 Sep 2009 20:15:09 +0000 (20:15 +0000)]
Remove remaining trailing spaces from translations.

15 years agoUse the list form for school instead of the colon
Ævar Arnfjörð Bjarmason [Tue, 22 Sep 2009 19:16:34 +0000 (19:16 +0000)]
Use the list form for school instead of the colon

15 years agoUse <br /> everywhere and not a mix of <br>, <br/> and <br /> so as to
Ævar Arnfjörð Bjarmason [Tue, 22 Sep 2009 12:40:59 +0000 (12:40 +0000)]
Use <br /> everywhere and not a mix of <br>, <br/> and <br /> so as to
not confuse translators.

I don't know if this gets sanitized in rails. Maybe this makes us more
XHTML compliant too.

15 years agoUpdate Vietnamese translation. Closes #2299.
Tom Hughes [Sun, 20 Sep 2009 16:47:19 +0000 (16:47 +0000)]
Update Vietnamese translation. Closes #2299.

15 years agoUse i18n() parameters for this JavaScript message instead of ad-hoc
Ævar Arnfjörð Bjarmason [Sun, 20 Sep 2009 10:41:57 +0000 (10:41 +0000)]
Use i18n() parameters for this JavaScript message instead of ad-hoc
string concatenation.

See [17712] for why I'm changing this.

15 years agoSee [17712] for why I'm changing this
Ævar Arnfjörð Bjarmason [Sun, 20 Sep 2009 10:25:31 +0000 (10:25 +0000)]
See [17712] for why I'm changing this

The 'user.view.mapper since' message is broken. It should be done with
translation parameters. But messages can't include HTML like <b> and I
don't want to experiment with making that work or changing this into a
HTML table that doesn't look crappy.

15 years agoTranslatewiki doesn't support trailing whitespace in messages. So if
Ævar Arnfjörð Bjarmason [Sun, 20 Sep 2009 10:10:12 +0000 (10:10 +0000)]
Translatewiki doesn't support trailing whitespace in messages. So if
we want to move to it (without hacking it) we're going to have to
eliminate those.

I compiled a list of them and I'm removing trailing whitespace from
those messages where the whitespace was a no-op. Mostly cases like
"<td>foo </td><td>bar</td>" or "<p>foo \n</p>"

These are the commands I ran to remove them:

    perl -pi -e 's[(      )(coordinates:)(\s*)"(.*?) "$][$1$2$3"$4"]g' *yml
    perl -pi -e 's[(      )(subject:|language:|location:|latitude:|latitude:|longitude:|coordinates:)(\s*)"(.*?) "$][$1$2$3"$4"]g' *yml
    perl -pi -e 's[(      )(recent_entries:)(\s*)"(.*?) "$][$1$2$3"$4"]g' *yml
    perl -pi -e 's[(      )(home location:|latitude:|longitude:|preferred languages:|profile description:|)(\s*)"(.*?) "$][$1$2$3"$4"]g' *yml
    perl -pi -e 's[^(        )(heading:)(\s*)"(.*?) "$][$1$2$3"$4"]g' *yml
    perl -pi -e 's[^(      )(email or username:|password:|confirm email address:|display name:|email address:|confirm password:|nearby users:)(\s*)"(.*?) "$][$1$2$3"$4"]g' *yml
    perl -pi -e 's[(      contact_webmaster:\s*)\x27(.*?) \x27][$1\x27$2\x27]' *yml

15 years agoadd ability to specify custom background in the query string
Richard Fairhurst [Fri, 18 Sep 2009 14:11:18 +0000 (14:11 +0000)]
add ability to specify custom background in the query string

15 years agoWhen displaying objects in /browse/* and in the JavaScript "Data"
Ævar Arnfjörð Bjarmason [Thu, 17 Sep 2009 23:36:54 +0000 (23:36 +0000)]
When displaying objects in /browse/* and in the JavaScript "Data"
feature use the name key corresponding to the user's
locale. E.g. "name:is" for Icelandic.

This will fall back on "name". The interface will be equivalent unless
the user has selected another language than English in the preferences
and objects with localized name:* tags corresponding to the user's
language are being displayed.

15 years ago"Athugasemd eftir Foo þann fimmtudaginn [...]" is grammatically
Ævar Arnfjörð Bjarmason [Thu, 17 Sep 2009 22:58:10 +0000 (22:58 +0000)]
"Athugasemd eftir Foo þann fimmtudaginn [...]" is grammatically
incorrect. Use "Athugasemd eftir Foo sett inn fimmtudaginn [...]"

15 years agoIcelandic day names should be in lower case
Ævar Arnfjörð Bjarmason [Thu, 17 Sep 2009 22:49:42 +0000 (22:49 +0000)]
Icelandic day names should be in lower case

15 years agoOr maybe this one. #2279. Ugh.
Richard Fairhurst [Thu, 17 Sep 2009 00:51:45 +0000 (00:51 +0000)]
Or maybe this one. #2279. Ugh.

15 years agoLocalisation
Richard Fairhurst [Thu, 17 Sep 2009 00:48:55 +0000 (00:48 +0000)]
Localisation

15 years agoPotlatch 1.2b
Richard Fairhurst [Thu, 17 Sep 2009 00:38:20 +0000 (00:38 +0000)]
Potlatch 1.2b

15 years agoDisplay the changeset comment (if any) as part of the description of
Tom Hughes [Tue, 15 Sep 2009 22:03:09 +0000 (22:03 +0000)]
Display the changeset comment (if any) as part of the description of
any object in the data browser. Closes #2282.

15 years agoUpdate be locale. Closes #2284.
Tom Hughes [Tue, 15 Sep 2009 20:20:21 +0000 (20:20 +0000)]
Update be locale. Closes #2284.

15 years agoRemove scale bar. Closes #1704.
Tom Hughes [Tue, 15 Sep 2009 16:01:50 +0000 (16:01 +0000)]
Remove scale bar. Closes #1704.

15 years agoSo the way [17620] did it sucked but [17624] broke it unless you
Ævar Arnfjörð Bjarmason [Mon, 14 Sep 2009 23:36:21 +0000 (23:36 +0000)]
So the way [17620] did it sucked but [17624] broke it unless you
didn't have any changes because .item_count is the number of edits,
not pages.

Using .page_count works though, Whee!

15 years agoauto_link() changeset comments in the global/user/bbox/etc history too
Ævar Arnfjörð Bjarmason [Mon, 14 Sep 2009 23:26:36 +0000 (23:26 +0000)]
auto_link() changeset comments in the global/user/bbox/etc history too
(as well as in changeset detail & atom feeds)

15 years agoUpdate Russian translation. Closes #2281.
Tom Hughes [Mon, 14 Sep 2009 23:22:10 +0000 (23:22 +0000)]
Update Russian translation. Closes #2281.

15 years agoOutput tags to the feed as raw HTML so that links are not escaped (any
Tom Hughes [Mon, 14 Sep 2009 23:17:52 +0000 (23:17 +0000)]
Output tags to the feed as raw HTML so that links are not escaped (any
real HTML in the tag has already been escaped). Closes #2264.

15 years agoEscape tag values - there is no reason at all to render things which
Tom Hughes [Mon, 14 Sep 2009 23:17:02 +0000 (23:17 +0000)]
Escape tag values - there is no reason at all to render things which
might look like HTML tags in a tag value.

15 years agoImprove handling of the case where there is only one page of changesets.
Tom Hughes [Mon, 14 Sep 2009 23:04:06 +0000 (23:04 +0000)]
Improve handling of the case where there is only one page of changesets.

15 years agoWhile we don't have the sanitizing backend to safely solve ticket
Ævar Arnfjörð Bjarmason [Mon, 14 Sep 2009 21:08:17 +0000 (21:08 +0000)]
While we don't have the sanitizing backend to safely solve ticket
#2264 I'm going to remove the auto_link feature of changeset tags. The
links are broken in all conforming Atom readers at the moment.

15 years agoNow when all the entries fit on one page a trailing slash won't be
Ævar Arnfjörð Bjarmason [Mon, 14 Sep 2009 19:42:32 +0000 (19:42 +0000)]
Now when all the entries fit on one page a trailing slash won't be
included after "Showing page %d (%d of %d)"

15 years agoLink to username in "Send message to" message
Ævar Arnfjörð Bjarmason [Mon, 14 Sep 2009 19:32:29 +0000 (19:32 +0000)]
Link to username in "Send message to" message

15 years agoTreat an explicit public=0 argument as meaning private.
Tom Hughes [Sat, 12 Sep 2009 16:46:25 +0000 (16:46 +0000)]
Treat an explicit public=0 argument as meaning private.

15 years agoUpdate zh-TW translation. Closes #2272.
Tom Hughes [Sat, 12 Sep 2009 10:57:33 +0000 (10:57 +0000)]
Update zh-TW translation. Closes #2272.

15 years agooops, wrong e-mail address
Ævar Arnfjörð Bjarmason [Mon, 7 Sep 2009 19:29:25 +0000 (19:29 +0000)]
oops, wrong e-mail address

15 years agoAdd xid_to_int4() function for Postgres.
Tom Hughes [Mon, 7 Sep 2009 16:44:54 +0000 (16:44 +0000)]
Add xid_to_int4() function for Postgres.

15 years agoThere was no "Sorry not found" message for changesets so
Ævar Arnfjörð Bjarmason [Mon, 7 Sep 2009 12:16:17 +0000 (12:16 +0000)]
There was no "Sorry not found" message for changesets so
/browse/changeset/123456789 would return the message "Sorry, the with
the id 123456789, could not be found.". It now says "Sorry, the
changeset with the id 123456789, could not be found."

15 years agocancel upload howler
Richard Fairhurst [Mon, 7 Sep 2009 11:16:35 +0000 (11:16 +0000)]
cancel upload howler

15 years agofix annoying retry bug, and fine-tune relations colours
Richard Fairhurst [Sun, 6 Sep 2009 23:54:02 +0000 (23:54 +0000)]
fix annoying retry bug, and fine-tune relations colours

15 years agofix menu issue spotted by randomjunk
Richard Fairhurst [Fri, 4 Sep 2009 14:51:48 +0000 (14:51 +0000)]
fix menu issue spotted by randomjunk

15 years agoWorkaround rails 2.3.4 bogus deprecation warnings.
Tom Hughes [Fri, 4 Sep 2009 10:52:58 +0000 (10:52 +0000)]
Workaround rails 2.3.4 bogus deprecation warnings.

15 years agoUpdate to rails 2.3.4 for security fixes.
Tom Hughes [Fri, 4 Sep 2009 08:45:38 +0000 (08:45 +0000)]
Update to rails 2.3.4 for security fixes.

15 years agoAdd support for reloading the language table.
Tom Hughes [Thu, 3 Sep 2009 21:55:42 +0000 (21:55 +0000)]
Add support for reloading the language table.

15 years agoAdd Guadeloupean Creole French translation of web site. Closes #2255.
Tom Hughes [Thu, 3 Sep 2009 21:31:34 +0000 (21:31 +0000)]
Add Guadeloupean Creole French translation of web site. Closes #2255.

15 years ago(binary)
Richard Fairhurst [Tue, 1 Sep 2009 14:38:52 +0000 (14:38 +0000)]
(binary)

15 years agotypo correction
Jonas Krückel [Tue, 1 Sep 2009 10:47:24 +0000 (10:47 +0000)]
typo correction

15 years agomore translations
Jonas Krückel [Tue, 1 Sep 2009 10:37:47 +0000 (10:37 +0000)]
more translations

15 years agoFixed bug when oauthorizing with a token which no longer exists (merged 17416 from...
Matt Amos [Tue, 1 Sep 2009 10:25:53 +0000 (10:25 +0000)]
Fixed bug when oauthorizing with a token which no longer exists (merged 17416 from oauth branch).

15 years agoFix file_column plugin to generate absolute URLs without falling over
Tom Hughes [Mon, 31 Aug 2009 23:43:15 +0000 (23:43 +0000)]
Fix file_column plugin to generate absolute URLs without falling over
in a heap and then use that in the user details view.

15 years agoTidy up.
Tom Hughes [Mon, 31 Aug 2009 23:32:03 +0000 (23:32 +0000)]
Tidy up.

15 years agoFix backwards compatibility code to handle an old style public
Tom Hughes [Mon, 31 Aug 2009 23:28:51 +0000 (23:28 +0000)]
Fix backwards compatibility code to handle an old style public
attribute correctly. Closes #2242.

15 years agoAdded user ID, description, languages and image link to the user details API call.
Matt Amos [Mon, 31 Aug 2009 23:11:15 +0000 (23:11 +0000)]
Added user ID, description, languages and image link to the user details API call.

15 years agoPotlatch 1.2a
Richard Fairhurst [Sun, 30 Aug 2009 19:14:50 +0000 (19:14 +0000)]
Potlatch 1.2a

15 years agonew translations
Jonas Krückel [Fri, 28 Aug 2009 11:54:29 +0000 (11:54 +0000)]
new translations

15 years agoFormat dates in the changeset list so the year is shown. Closes #2232.
Tom Hughes [Fri, 28 Aug 2009 07:55:34 +0000 (07:55 +0000)]
Format dates in the changeset list so the year is shown. Closes #2232.

15 years agofix indentation in yaml
Shaun McDonald [Fri, 28 Aug 2009 07:15:06 +0000 (07:15 +0000)]
fix indentation in yaml

15 years agouptodate with en.yml 17163
Jonas Krückel [Thu, 27 Aug 2009 23:30:06 +0000 (23:30 +0000)]
uptodate with en.yml 17163

15 years agoRevert es.yml to utf-8 encoding. Closes #2231.
Tom Hughes [Thu, 27 Aug 2009 22:42:14 +0000 (22:42 +0000)]
Revert es.yml to utf-8 encoding. Closes #2231.

15 years agoWrap tile numbers at the international dateline. Closes #2226.
Tom Hughes [Thu, 27 Aug 2009 15:50:52 +0000 (15:50 +0000)]
Wrap tile numbers at the international dateline. Closes #2226.

15 years agoUpdate of spanish translation
Iván Sánchez Ortega [Wed, 26 Aug 2009 13:43:35 +0000 (13:43 +0000)]
Update of spanish translation

15 years agoAdded referer URL in user_token so that redirections (e.g: from oauth token requests...
Matt Amos [Tue, 25 Aug 2009 15:00:32 +0000 (15:00 +0000)]
Added referer URL in user_token so that redirections (e.g: from oauth token requests) are followed after the user has confirmed the sign-up. Added test for the same.

15 years agoUpdated Hungarian translation for Potlatch 1.2
Balló György [Wed, 19 Aug 2009 14:52:54 +0000 (14:52 +0000)]
Updated Hungarian translation for Potlatch 1.2

15 years agoUpdated Hungarian translation of OpenStreetMap website
Balló György [Wed, 19 Aug 2009 13:46:12 +0000 (13:46 +0000)]
Updated Hungarian translation of OpenStreetMap website

15 years agoCommit resource changes from r17160.
Tom Hughes [Wed, 19 Aug 2009 10:29:57 +0000 (10:29 +0000)]
Commit resource changes from r17160.

15 years agoRemove debugging.
Tom Hughes [Wed, 19 Aug 2009 08:04:42 +0000 (08:04 +0000)]
Remove debugging.

15 years agoCleanup some of the oauth stuff:
Tom Hughes [Wed, 19 Aug 2009 07:59:15 +0000 (07:59 +0000)]
Cleanup some of the oauth stuff:
- Detabify views.
- Move translations to correct names.
- Make flash messages translatable.

15 years agoCall the set_locale filter for oauth methods which display web
Tom Hughes [Wed, 19 Aug 2009 07:45:24 +0000 (07:45 +0000)]
Call the set_locale filter for oauth methods which display web
pages to the user. Closes #2203.

15 years agotests for diary rss feeds
Štefan Baebler [Wed, 19 Aug 2009 05:07:26 +0000 (05:07 +0000)]
tests for diary rss feeds

15 years agoRemove explicit specification of I18n.local as the locale in resource
Tom Hughes [Tue, 18 Aug 2009 20:21:25 +0000 (20:21 +0000)]
Remove explicit specification of I18n.local as the locale in resource
lookups - it's the default anyway.

15 years agoAdd parentheses to fix warning.
Tom Hughes [Tue, 18 Aug 2009 20:06:33 +0000 (20:06 +0000)]
Add parentheses to fix warning.

15 years agoMerge oauth branch at r17138 to trunk.
Tom Hughes [Tue, 18 Aug 2009 20:02:52 +0000 (20:02 +0000)]
Merge oauth branch at r17138 to trunk.

15 years agoMerge oauth branch at r17138 to trunk.
Tom Hughes [Tue, 18 Aug 2009 20:01:56 +0000 (20:01 +0000)]
Merge oauth branch at r17138 to trunk.

15 years agofixing interpolation error with per language rss feeds that was introduced in [16903]
Štefan Baebler [Tue, 18 Aug 2009 19:36:58 +0000 (19:36 +0000)]
fixing interpolation error with per language rss feeds that was introduced in [16903]

15 years agolocalized link to home location
Štefan Baebler [Tue, 18 Aug 2009 18:26:01 +0000 (18:26 +0000)]
localized link to home location

15 years agoReverting experimental stuff in r17121.
Matt Amos [Tue, 18 Aug 2009 16:33:18 +0000 (16:33 +0000)]
Reverting experimental stuff in r17121.

15 years agoExperimental CSS media queries to support iPhone and other small-screen devices.
Matt Amos [Tue, 18 Aug 2009 16:06:26 +0000 (16:06 +0000)]
Experimental CSS media queries to support iPhone and other small-screen devices.

15 years agoadd crossdomain.xml to allow flash to access oauth
Dave Stubbs [Sun, 16 Aug 2009 15:59:56 +0000 (15:59 +0000)]
add crossdomain.xml to allow flash to access oauth

15 years agoQualify SCALE properly - apparently object visibility when running the
Tom Hughes [Sun, 16 Aug 2009 10:36:16 +0000 (10:36 +0000)]
Qualify SCALE properly - apparently object visibility when running the
test suite is not the same as when running live... Rails FAIL!

15 years agoFixes bug #2152 by preventing over-expansion of bboxes beyond the world range.
Matt Amos [Sun, 16 Aug 2009 00:19:18 +0000 (00:19 +0000)]
Fixes bug #2152 by preventing over-expansion of bboxes beyond the world range.

15 years agoLog unexpected exceptions raised by API calls.
Tom Hughes [Sat, 15 Aug 2009 11:35:43 +0000 (11:35 +0000)]
Log unexpected exceptions raised by API calls.

15 years agoIdentifiable traces should be trated as private in the trace list.
Tom Hughes [Thu, 13 Aug 2009 17:59:38 +0000 (17:59 +0000)]
Identifiable traces should be trated as private in the trace list.

15 years agoThe "public" field no longer exists in gpx_files.
Tom Hughes [Thu, 13 Aug 2009 17:57:14 +0000 (17:57 +0000)]
The "public" field no longer exists in gpx_files.

15 years agoMerge 16891:17044 from trunk.
Tom Hughes [Thu, 13 Aug 2009 17:18:08 +0000 (17:18 +0000)]
Merge 16891:17044 from trunk.

15 years agoAdd extra visibility options for GPS traces, and enhance the API call
Tom Hughes [Thu, 13 Aug 2009 17:06:11 +0000 (17:06 +0000)]
Add extra visibility options for GPS traces, and enhance the API call
that returns trace data to return more information if the owner of the
trace has allowed it. Based on a patch from Matt Amos.

15 years agoRemove layers argument from the shortlink if we change to mapnik from
Tom Hughes [Thu, 13 Aug 2009 14:02:49 +0000 (14:02 +0000)]
Remove layers argument from the shortlink if we change to mapnik from
a non-mapnik layer.

15 years agoEscape usernames. Closes #2149.
Tom Hughes [Sat, 8 Aug 2009 22:45:56 +0000 (22:45 +0000)]
Escape usernames. Closes #2149.

15 years agoFix test to reflect change to changeset templates.
Matt Amos [Fri, 7 Aug 2009 14:14:27 +0000 (14:14 +0000)]
Fix test to reflect change to changeset templates.

15 years agoAdd type="html" to <title> so a <title> with "&lt;" will be displayed
Ævar Arnfjörð Bjarmason [Fri, 7 Aug 2009 12:17:02 +0000 (12:17 +0000)]
Add type="html" to <title> so a <title> with "&lt;" will be displayed
as "<" and not literally as "&lt;".

See section 3.1.1 in RFC 4287

15 years agoUpdate Vietnamese translation. Closes #2142.
Tom Hughes [Fri, 7 Aug 2009 07:45:15 +0000 (07:45 +0000)]
Update Vietnamese translation. Closes #2142.

15 years agoMake the diary RSS feed translatable
Ævar Arnfjörð Bjarmason [Fri, 7 Aug 2009 01:03:42 +0000 (01:03 +0000)]
Make the diary RSS feed translatable

15 years agoInclude the changeset comment in the <title> of the Atom feeds if
Ævar Arnfjörð Bjarmason [Fri, 7 Aug 2009 00:59:01 +0000 (00:59 +0000)]
Include the changeset comment in the <title> of the Atom feeds if
there's a changeset comment.

I'm not doing any snipping of the comment so they could run to 255
characters (the max size in the database), but from testing a few feed
clients it looks like they do this pretty well at the client side.

15 years agosmall parallel way fix, plus handy new 'join' keypress (J)
Richard Fairhurst [Fri, 7 Aug 2009 00:25:00 +0000 (00:25 +0000)]
small parallel way fix, plus handy new 'join' keypress (J)

15 years agoTranslated user account creation message
Ævar Arnfjörð Bjarmason [Thu, 6 Aug 2009 22:19:03 +0000 (22:19 +0000)]
Translated user account creation message

15 years agoUpdated Hungarian translation of OpenStreetMap website
Balló György [Thu, 6 Aug 2009 19:25:09 +0000 (19:25 +0000)]
Updated Hungarian translation of OpenStreetMap website

15 years agoMade XML parsing routines raise an exception if the document is valid XML, but not...
Matt Amos [Thu, 6 Aug 2009 17:28:49 +0000 (17:28 +0000)]
Made XML parsing routines raise an exception if the document is valid XML, but not valid as an OSM document. This is now the same behaviour as when the document isn't valid XML.

15 years agoMerging 16820:16891 from trunk.
Matt Amos [Thu, 6 Aug 2009 16:24:39 +0000 (16:24 +0000)]
Merging 16820:16891 from trunk.

15 years agoibid
Richard Fairhurst [Thu, 6 Aug 2009 10:49:01 +0000 (10:49 +0000)]
ibid

15 years agoargh, caught out by annoying Ming 0.3>0.4 change. Recommit with correct line widths
Richard Fairhurst [Thu, 6 Aug 2009 08:26:06 +0000 (08:26 +0000)]
argh, caught out by annoying Ming 0.3>0.4 change. Recommit with correct line widths

15 years agoRender the links using partial so we can do the appropriate rendering
Tom Hughes [Wed, 5 Aug 2009 23:39:24 +0000 (23:39 +0000)]
Render the links using partial so we can do the appropriate rendering
for HTML and Atom versions and hopefully get the escaping right in the
feed. Closes #2135.

15 years agohandful of small fixes
Richard Fairhurst [Wed, 5 Aug 2009 23:16:22 +0000 (23:16 +0000)]
handful of small fixes

15 years agobunch of small tweaks
Richard Fairhurst [Wed, 5 Aug 2009 23:14:27 +0000 (23:14 +0000)]
bunch of small tweaks

15 years agoSend an appropriate Vary header when we negotiate the language to stop
Tom Hughes [Wed, 5 Aug 2009 20:35:28 +0000 (20:35 +0000)]
Send an appropriate Vary header when we negotiate the language to stop
caches doing the wrong thing. Closes #1995.

15 years agoibid
Richard Fairhurst [Wed, 5 Aug 2009 14:11:13 +0000 (14:11 +0000)]
ibid