rails.git
10 years agoIf I'd wanted colons I'd have put them in.
Tom Hughes [Sun, 18 Oct 2009 23:24:18 +0000 (23:24 +0000)]
If I'd wanted colons I'd have put them in.

10 years agoLocalisation updates from translatewiki.net (2009-10-19)
Translatewiki [Sun, 18 Oct 2009 22:42:22 +0000 (22:42 +0000)]
Localisation updates from translatewiki.net (2009-10-19)

10 years agoLocalisation updates from translatewiki.net (2009-10-19)
Translatewiki [Sun, 18 Oct 2009 22:39:13 +0000 (22:39 +0000)]
Localisation updates from translatewiki.net (2009-10-19)

10 years agoUse colon in field labels on export page
Translatewiki [Sun, 18 Oct 2009 16:28:54 +0000 (16:28 +0000)]
Use colon in field labels on export page

10 years agoLocalisation updates from translatewiki.net (2009-10-18)
Translatewiki [Sun, 18 Oct 2009 14:51:16 +0000 (14:51 +0000)]
Localisation updates from translatewiki.net (2009-10-18)
* re-sort en.yml and add a FIXME for leading whitespace

10 years agoLocalisation updates from translatewiki.net (2009-10-18)
Translatewiki [Sun, 18 Oct 2009 14:48:06 +0000 (14:48 +0000)]
Localisation updates from translatewiki.net (2009-10-18)

10 years agoUpdate capitalisation of recently added messages
Translatewiki [Sun, 18 Oct 2009 14:39:09 +0000 (14:39 +0000)]
Update capitalisation of recently added messages

10 years agoMention the OSM blob and twitter in the signup message.
Tom Hughes [Sun, 18 Oct 2009 14:02:13 +0000 (14:02 +0000)]
Mention the OSM blob and twitter in the signup message.

10 years agoLocalisation updates from translatewiki.net (2009-10-17)
Translatewiki [Fri, 16 Oct 2009 22:46:18 +0000 (22:46 +0000)]
Localisation updates from translatewiki.net (2009-10-17)

10 years agoLocalisation updates from translatewiki.net (2009-10-17)
Translatewiki [Fri, 16 Oct 2009 22:44:15 +0000 (22:44 +0000)]
Localisation updates from translatewiki.net (2009-10-17)

10 years agoCompiled version of Ævar's tweaks
Richard Fairhurst [Fri, 16 Oct 2009 15:14:14 +0000 (15:14 +0000)]
Compiled version of Ævar's tweaks

10 years agos/Out-of-copyright/UK historic/: These layers are irrelevant to most
Ævar Arnfjörð Bjarmason [Fri, 16 Oct 2009 12:37:05 +0000 (12:37 +0000)]
s/Out-of-copyright/UK historic/: These layers are irrelevant to most
of the Planet and should be clearly marked as UK-only

10 years agoLink to the foundation blog from the sidebar.
Tom Hughes [Fri, 16 Oct 2009 10:31:55 +0000 (10:31 +0000)]
Link to the foundation blog from the sidebar.

10 years agomissing other: fixed
Ævar Arnfjörð Bjarmason [Thu, 15 Oct 2009 17:07:07 +0000 (17:07 +0000)]
missing other: fixed

10 years ago#2351: Make the preset hint translatable
Ævar Arnfjörð Bjarmason [Thu, 15 Oct 2009 12:03:10 +0000 (12:03 +0000)]
#2351: Make the preset hint translatable

10 years ago#2351: Make inspector and (and Yahoo) strings in Potlatch translatable.
Ævar Arnfjörð Bjarmason [Thu, 15 Oct 2009 11:59:21 +0000 (11:59 +0000)]
#2351: Make inspector and (and Yahoo) strings in Potlatch translatable.

10 years ago#2351: Make strings in potlatch.as translatable. Except for the Node/Way thing, don...
Ævar Arnfjörð Bjarmason [Thu, 15 Oct 2009 11:20:16 +0000 (11:20 +0000)]
#2351: Make strings in potlatch.as translatable. Except for the Node/Way thing, don't know what to do with that.

10 years ago#2351: Make strings in offline.as translatable
Ævar Arnfjörð Bjarmason [Thu, 15 Oct 2009 11:07:28 +0000 (11:07 +0000)]
#2351: Make strings in offline.as translatable

10 years agoIgnore traces which have not been inserted yet when calculating
Tom Hughes [Thu, 15 Oct 2009 10:09:33 +0000 (10:09 +0000)]
Ignore traces which have not been inserted yet when calculating
the per-user statistics.

10 years agoUse bounding box information to zoom to search results when possible.
Tom Hughes [Thu, 15 Oct 2009 09:27:21 +0000 (09:27 +0000)]
Use bounding box information to zoom to search results when possible.

10 years ago[18163] commited by me yesterday (and reverted in [18165]) was
Ævar Arnfjörð Bjarmason [Thu, 15 Oct 2009 08:21:57 +0000 (08:21 +0000)]
[18163] commited by me yesterday (and reverted in [18165]) was
broken. I didn't restart rails when testing it because I thought lib/
was auto-refreshed as well and that:

    ruby -e 'x = []; x[0]["foo"] = "bar"'

Would work and autovify like it does in Perl. But no, you have to do:

    ruby -e 'x = [{}]; x[0]["foo"] = "bar"'

This commit is equivalent to [18163] aside from that fix to lib/potlatch.rb

10 years agoRevert r18163 as it is completely broken.
Tom Hughes [Thu, 15 Oct 2009 07:46:54 +0000 (07:46 +0000)]
Revert r18163 as it is completely broken.

10 years agoAttempt to unbreak Potlatch.
Tom Hughes [Thu, 15 Oct 2009 07:40:47 +0000 (07:40 +0000)]
Attempt to unbreak Potlatch.

10 years agoMake the preset list at the bottom of the screen (Airport, Bus stop,
Ævar Arnfjörð Bjarmason [Wed, 14 Oct 2009 23:42:09 +0000 (23:42 +0000)]
Make the preset list at the bottom of the screen (Airport, Bus stop,
...) translatable

10 years agoUpdate line breaks in message
Translatewiki [Wed, 14 Oct 2009 23:16:31 +0000 (23:16 +0000)]
Update line breaks in message

10 years agoLocalisation updates from translatewiki.net (2009-10-15)
Translatewiki [Wed, 14 Oct 2009 23:07:34 +0000 (23:07 +0000)]
Localisation updates from translatewiki.net (2009-10-15)

10 years agoLocalisation updates from translatewiki.net (2009-10-15)
Translatewiki [Wed, 14 Oct 2009 23:02:03 +0000 (23:02 +0000)]
Localisation updates from translatewiki.net (2009-10-15)

10 years agoUse "email" consistently.
Translatewiki [Wed, 14 Oct 2009 22:56:18 +0000 (22:56 +0000)]
Use "email" consistently.

10 years agoÆvar's enhancement to write the language in created_by
Richard Fairhurst [Wed, 14 Oct 2009 21:18:13 +0000 (21:18 +0000)]
Ævar's enhancement to write the language in created_by

10 years agoImprove the UI of the /user/forgot-password page
Ævar Arnfjörð Bjarmason [Wed, 14 Oct 2009 19:49:20 +0000 (19:49 +0000)]
Improve the UI of the /user/forgot-password page

 * Align the submit button like on the rest of the /user/* pages
 * Tabindex
 * Help text to explain what the page does

10 years agoReduce choice anxiety when signing up for a new user by explaining
Ævar Arnfjörð Bjarmason [Wed, 14 Oct 2009 19:39:19 +0000 (19:39 +0000)]
Reduce choice anxiety when signing up for a new user by explaining
that the display name can be changed later.

10 years agoAdd experimental support (disabled by default) for new geocoder.
Tom Hughes [Wed, 14 Oct 2009 14:42:09 +0000 (14:42 +0000)]
Add experimental support (disabled by default) for new geocoder.

10 years agoAdd the language the user is using to Potlatch's created_by string. Like JOSM
Ævar Arnfjörð Bjarmason [Mon, 12 Oct 2009 15:52:51 +0000 (15:52 +0000)]
Add the language the user is using to Potlatch's created_by string. Like JOSM

10 years agoAdded a :display_name option for the changesets query code.
Matt Amos [Mon, 12 Oct 2009 10:12:12 +0000 (10:12 +0000)]
Added a :display_name option for the changesets query code.

10 years agoDon't make the text accompanying a checkbox a question
Ævar Arnfjörð Bjarmason [Mon, 12 Oct 2009 08:54:19 +0000 (08:54 +0000)]
Don't make the text accompanying a checkbox a question

10 years agoclearly a fantastic feature, but still...
Richard Fairhurst [Mon, 12 Oct 2009 08:18:27 +0000 (08:18 +0000)]
clearly a fantastic feature, but still...

10 years agoadd 1:25k as background layer
Richard Fairhurst [Mon, 12 Oct 2009 08:17:32 +0000 (08:17 +0000)]
add 1:25k as background layer

10 years agoAdd some administrator only actions to the user page.
Tom Hughes [Mon, 12 Oct 2009 08:00:59 +0000 (08:00 +0000)]
Add some administrator only actions to the user page.

10 years agoRemove a trailing newline and rename duplicate second "Page 4" to "Page 5"
Translatewiki [Sat, 10 Oct 2009 23:14:36 +0000 (23:14 +0000)]
Remove a trailing newline and rename duplicate second "Page 4" to "Page 5"

10 years agoadd OS7 to autocomplete
Richard Fairhurst [Sat, 10 Oct 2009 22:11:03 +0000 (22:11 +0000)]
add OS7 to autocomplete

10 years agoLocalisation updates from translatewiki.net (2009-10-10)
Translatewiki [Sat, 10 Oct 2009 19:24:32 +0000 (19:24 +0000)]
Localisation updates from translatewiki.net (2009-10-10)

10 years agoLocalisation updates from translatewiki.net (2009-10-10)
Translatewiki [Sat, 10 Oct 2009 19:19:58 +0000 (19:19 +0000)]
Localisation updates from translatewiki.net (2009-10-10)

10 years agoDisplay user's email addresses and the IP address used to create
Tom Hughes [Fri, 9 Oct 2009 15:45:01 +0000 (15:45 +0000)]
Display user's email addresses and the IP address used to create
their account to people that are logged in as administrators.

10 years agoFix tests which do logins to handle the cookie test.
Tom Hughes [Fri, 9 Oct 2009 09:13:13 +0000 (09:13 +0000)]
Fix tests which do logins to handle the cookie test.

10 years agoTest that the user has cookies enabled at critical points where we
Tom Hughes [Fri, 9 Oct 2009 08:47:47 +0000 (08:47 +0000)]
Test that the user has cookies enabled at critical points where we
are about to require them and warn the user if they are not enabled.

10 years agolocalisation updates from translatewiki.net (2009-10-08)
Translatewiki [Thu, 8 Oct 2009 22:11:35 +0000 (22:11 +0000)]
localisation updates from translatewiki.net (2009-10-08)

10 years agolocalisation updates from translatewiki.net (2009-10-08)
Translatewiki [Thu, 8 Oct 2009 21:39:07 +0000 (21:39 +0000)]
localisation updates from translatewiki.net (2009-10-08)

10 years agoFix output of javascript strings - use english strings to walk the
Tom Hughes [Thu, 8 Oct 2009 12:25:55 +0000 (12:25 +0000)]
Fix output of javascript strings - use english strings to walk the
tree but output strings in the correct locale. Closes #2362.

10 years ago* localisation updates from translatewiki.net (2009-10-07)
Translatewiki [Tue, 6 Oct 2009 23:03:08 +0000 (23:03 +0000)]
* localisation updates from translatewiki.net (2009-10-07)

10 years ago* localisation updates from translatewiki.net (2009-10-07)
Translatewiki [Tue, 6 Oct 2009 22:57:32 +0000 (22:57 +0000)]
* localisation updates from translatewiki.net (2009-10-07)
* new languages: Czech (cs)

10 years agoRename .htaccess to htacess.example to stop it causing problems when
Tom Hughes [Tue, 6 Oct 2009 17:29:44 +0000 (17:29 +0000)]
Rename .htaccess to htacess.example to stop it causing problems when
the directives in it are not allowed.

10 years agoRemove hack that was needed to cope with our old asset tagging but
Tom Hughes [Tue, 6 Oct 2009 17:26:51 +0000 (17:26 +0000)]
Remove hack that was needed to cope with our old asset tagging but
which now does nothing except break installation in subdirectories.

10 years agoUse relative URLs in the stylesheet so we can run in a subdirectory.
Tom Hughes [Tue, 6 Oct 2009 17:24:38 +0000 (17:24 +0000)]
Use relative URLs in the stylesheet so we can run in a subdirectory.

10 years agoFixed bug in _blocks partial when used by the index view.
Matt Amos [Tue, 6 Oct 2009 14:19:54 +0000 (14:19 +0000)]
Fixed bug in _blocks partial when used by the index view.

10 years agoMerge blocking branch to head.
Tom Hughes [Tue, 6 Oct 2009 12:37:49 +0000 (12:37 +0000)]
Merge blocking branch to head.

10 years agoAdd parentheses to avoid warning.
Tom Hughes [Mon, 5 Oct 2009 20:28:15 +0000 (20:28 +0000)]
Add parentheses to avoid warning.

10 years agoMerge 17944:17988 from trunk.
Tom Hughes [Mon, 5 Oct 2009 20:25:45 +0000 (20:25 +0000)]
Merge 17944:17988 from trunk.

10 years agoOS7 tile layer support
Richard Fairhurst [Mon, 5 Oct 2009 12:36:01 +0000 (12:36 +0000)]
OS7 tile layer support

10 years agostill tidy properties when icon has changed
Richard Fairhurst [Mon, 5 Oct 2009 11:50:24 +0000 (11:50 +0000)]
still tidy properties when icon has changed

10 years ago* localisation updates from translatewiki.net (2009-10-05)
Translatewiki [Mon, 5 Oct 2009 08:20:20 +0000 (08:20 +0000)]
* localisation updates from translatewiki.net (2009-10-05)
* svn:eol-style native

10 years agoAnother update for ru.yml. If this does not work, please let me know. Would also...
Translatewiki [Sun, 4 Oct 2009 11:35:49 +0000 (11:35 +0000)]
Another update for ru.yml. If this does not work, please let me know. Would also like to get rid of the leading newlines...

10 years agoFix syntax error in r17978
Translatewiki [Sun, 4 Oct 2009 11:32:30 +0000 (11:32 +0000)]
Fix syntax error in r17978

10 years agoLocalisation updates from translatewiki.net (2009-10-04)
Translatewiki [Sun, 4 Oct 2009 11:28:57 +0000 (11:28 +0000)]
Localisation updates from translatewiki.net (2009-10-04)

10 years agoLocalisation updates from translatewiki.net (2009-10-04)
Translatewiki [Sun, 4 Oct 2009 11:10:29 +0000 (11:10 +0000)]
Localisation updates from translatewiki.net (2009-10-04)

10 years agoMake Mail/Revert in History dialog i18n-able
Ævar Arnfjörð Bjarmason [Sun, 4 Oct 2009 08:40:37 +0000 (08:40 +0000)]
Make Mail/Revert in History dialog i18n-able

10 years agoSynced from Translatewiki. Including one new language (gl)
Ævar Arnfjörð Bjarmason [Sun, 4 Oct 2009 07:54:27 +0000 (07:54 +0000)]
Synced from Translatewiki. Including one new language (gl)

10 years agoModify the existing i18n() javascript function to lookup strings in
Tom Hughes [Fri, 2 Oct 2009 23:41:19 +0000 (23:41 +0000)]
Modify the existing i18n() javascript function to lookup strings in
the javascript i18n array as well as expanding arguments, and make all
lookups go through it.

10 years agoMove javascript translations to a separate key based on the path to
Tom Hughes [Fri, 2 Oct 2009 23:33:17 +0000 (23:33 +0000)]
Move javascript translations to a separate key based on the path to
the javascript file that uses them and amend the layout to automatically
find and output all javascript strings.

10 years agoThere is no need to translate the names of layers which are not shown
Tom Hughes [Fri, 2 Oct 2009 23:03:42 +0000 (23:03 +0000)]
There is no need to translate the names of layers which are not shown
in the layer switcher.

10 years agoSynced from Translatewiki
Ævar Arnfjörð Bjarmason [Fri, 2 Oct 2009 20:58:59 +0000 (20:58 +0000)]
Synced from Translatewiki

10 years agoFollow up to [17948]: Make the layer switcher translatable too!
Ævar Arnfjörð Bjarmason [Fri, 2 Oct 2009 20:39:47 +0000 (20:39 +0000)]
Follow up to [17948]: Make the layer switcher translatable too!

10 years agoSome of our JavaScript files have UI messages but we don't want to
Ævar Arnfjörð Bjarmason [Fri, 2 Oct 2009 20:19:28 +0000 (20:19 +0000)]
Some of our JavaScript files have UI messages but we don't want to
make them dynamic.

So I'm creating a globally scoped JavaScript array called rails_i18n
which holds some of these messages. It's loaded in <head> before any
of the JavaScript files so it should always be available.

10 years agoMerging 17905:17944 from trunk.
Matt Amos [Fri, 2 Oct 2009 15:36:46 +0000 (15:36 +0000)]
Merging 17905:17944 from trunk.

10 years agoAdd parentheses to avoid warnings.
Tom Hughes [Fri, 2 Oct 2009 14:40:25 +0000 (14:40 +0000)]
Add parentheses to avoid warnings.

10 years agoAmend [17942]:
Ævar Arnfjörð Bjarmason [Fri, 2 Oct 2009 13:04:47 +0000 (13:04 +0000)]
Amend [17942]:

 * Center-align donation text
 * Add title="" to the donate link
 * Use an official cc_button.png from http://1.1.1.1/bmi/i.creativecommons.org/l/by-sa/2.0/88x31.png that doesn't include English text
 * Add rel=license to license link as suggested by CC
 * Add width/height to CC button

10 years agoReplace the donate button with a text version that can be translated.
Tom Hughes [Fri, 2 Oct 2009 12:29:44 +0000 (12:29 +0000)]
Replace the donate button with a text version that can be translated.

10 years agoLocalisation updates from translatewiki.net (2009-10-02)
Translatewiki [Fri, 2 Oct 2009 11:28:35 +0000 (11:28 +0000)]
Localisation updates from translatewiki.net (2009-10-02)

10 years ago* Remove trailing newline from help_html
Translatewiki [Fri, 2 Oct 2009 11:20:57 +0000 (11:20 +0000)]
* Remove trailing newline from help_html
* Update message order

10 years agoAdding blocking to user auth bits of amf_controller. Or, at least, the bits I could...
Matt Amos [Fri, 2 Oct 2009 10:49:03 +0000 (10:49 +0000)]
Adding blocking to user auth bits of amf_controller. Or, at least, the bits I could find.

10 years agoFix wrong comment.
Matt Amos [Fri, 2 Oct 2009 10:46:19 +0000 (10:46 +0000)]
Fix wrong comment.

10 years agouse {{count}} instead of {{sent_count}} so rails plural forms will kick in
Ævar Arnfjörð Bjarmason [Fri, 2 Oct 2009 10:41:47 +0000 (10:41 +0000)]
use {{count}} instead of {{sent_count}} so rails plural forms will kick in

10 years agofix GPS offset
Richard Fairhurst [Fri, 2 Oct 2009 07:05:05 +0000 (07:05 +0000)]
fix GPS offset

10 years agoAdd "blocks on" and "blocks by" links to the user page when a logged
Tom Hughes [Thu, 1 Oct 2009 21:30:45 +0000 (21:30 +0000)]
Add "blocks on" and "blocks by" links to the user page when a logged
in user is looking at their own page.

10 years agoSwap two translations so they are the right way round.
Tom Hughes [Thu, 1 Oct 2009 21:13:13 +0000 (21:13 +0000)]
Swap two translations so they are the right way round.

10 years agoReplace a couple calls to inject with more readble constructs.
Tom Hughes [Thu, 1 Oct 2009 20:39:04 +0000 (20:39 +0000)]
Replace a couple calls to inject with more readble constructs.

10 years agoSet a limit on the new/edit block text area. Make it as big as diary
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 20:29:17 +0000 (20:29 +0000)]
Set a limit on the new/edit block text area. Make it as big as diary
comments instead of the insane default rails size of 40/20 cols/rows

10 years agoCorrect comment.
Tom Hughes [Thu, 1 Oct 2009 20:24:53 +0000 (20:24 +0000)]
Correct comment.

10 years ago * The Back link in block/id/edit wasn't translatable
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 20:24:36 +0000 (20:24 +0000)]
 * The Back link in block/id/edit wasn't translatable
 * New text for back links to make them more understandable

10 years agoCorrect comment.
Tom Hughes [Thu, 1 Oct 2009 20:22:52 +0000 (20:22 +0000)]
Correct comment.

10 years ago * <title> for /blocks/new/*
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 20:18:24 +0000 (20:18 +0000)]
 * <title> for /blocks/new/*
 * use h() to escape usernames

10 years agoAdd a route for '/blocks/new/:display_name' so links will be
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 20:08:13 +0000 (20:08 +0000)]
Add a route for '/blocks/new/:display_name' so links will be
'/blocks/new/Example' not '/blocks/new?display_name=Example'

10 years agoDon't bother creating the user index on user_roles as migration 48 will
Tom Hughes [Thu, 1 Oct 2009 20:04:33 +0000 (20:04 +0000)]
Don't bother creating the user index on user_roles as migration 48 will
create one on user+role that will do the same job.

Removing it here is a bit of a hack as it will not get dropped from
existing databases but as it was not given an explicit name it is hard
to write a migration to drop it.

10 years agouse h() to avoid XSS in usernames
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 20:02:54 +0000 (20:02 +0000)]
use h() to avoid XSS in usernames

10 years agotitle/links for revoke page
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:59:02 +0000 (19:59 +0000)]
title/links for revoke page

10 years agoOops. Mixed up heading/title
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:55:25 +0000 (19:55 +0000)]
Oops. Mixed up heading/title

10 years agotitle/heading & XSS fix for /edit
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:45:36 +0000 (19:45 +0000)]
title/heading & XSS fix for /edit

10 years agoAdd <title> to /blocks and don't Camel Case headings
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:27:15 +0000 (19:27 +0000)]
Add <title> to /blocks and don't Camel Case headings

10 years agoSet title on /blocks/:id and link to usernames
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:18:23 +0000 (19:18 +0000)]
Set title on /blocks/:id and link to usernames

10 years agoBack -> View all blocks
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:10:31 +0000 (19:10 +0000)]
Back -> View all blocks

10 years agoWhen a user hasn't made any blocks or been blocked don't display a
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 19:04:38 +0000 (19:04 +0000)]
When a user hasn't made any blocks or been blocked don't display a
skeleton table. Just a <p> saying there's nothing here.