]> git.openstreetmap.org Git - rails.git/log
projects / rails.git / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
rails.git
15 years agoFollow up to [17948]: Make the layer switcher translatable too!
commit | commitdiff | tree
Æ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!

15 years agoSome of our JavaScript files have UI messages but we don't want to
commit | commitdiff | tree
Æ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.

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

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

15 years agoAmend [17942]:
commit | commitdiff | tree
Æ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

15 years agoReplace the donate button with a text version that can be translated.
commit | commitdiff | tree
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.

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

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

15 years agoAdding blocking to user auth bits of amf_controller. Or, at least, the bits I could...
commit | commitdiff | tree
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.

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

15 years agouse {{count}} instead of {{sent_count}} so rails plural forms will kick in
commit | commitdiff | tree
Æ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

15 years agofix GPS offset
commit | commitdiff | tree
Richard Fairhurst [Fri, 2 Oct 2009 07:05:05 +0000 (07:05 +0000)]
fix GPS offset

15 years agoAdd "blocks on" and "blocks by" links to the user page when a logged
commit | commitdiff | tree
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.

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

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

15 years agoSet a limit on the new/edit block text area. Make it as big as diary
commit | commitdiff | tree
Æ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

15 years agoCorrect comment.
commit | commitdiff | tree
Tom Hughes [Thu, 1 Oct 2009 20:24:53 +0000 (20:24 +0000)]
Correct comment.

15 years ago * The Back link in block/id/edit wasn't translatable
commit | commitdiff | tree
Æ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

15 years agoCorrect comment.
commit | commitdiff | tree
Tom Hughes [Thu, 1 Oct 2009 20:22:52 +0000 (20:22 +0000)]
Correct comment.

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

15 years agoAdd a route for '/blocks/new/:display_name' so links will be
commit | commitdiff | tree
Æ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'

15 years agoDon't bother creating the user index on user_roles as migration 48 will
commit | commitdiff | tree
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.

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

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

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

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

15 years agoAdd <title> to /blocks and don't Camel Case headings
commit | commitdiff | tree
Æ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

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

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

15 years agoWhen a user hasn't made any blocks or been blocked don't display a
commit | commitdiff | tree
Æ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.

15 years ago * use h() on username to avoid XSS
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 18:49:38 +0000 (18:49 +0000)]
 * use h() on username to avoid XSS
 * Link to username in <h1>
 * Set <title> on /blocks and /blocks_by

15 years agoMore specific alt/title text
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 18:42:45 +0000 (18:42 +0000)]
More specific alt/title text

15 years agoAdding title for role icons when viewing user isn't an admin, re-adding translations...
commit | commitdiff | tree
Matt Amos [Thu, 1 Oct 2009 18:09:31 +0000 (18:09 +0000)]
Adding title for role icons when viewing user isn't an admin, re-adding translations for those.

15 years agoSet title/h1 to something sensible when granting/revoking roles
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 18:02:08 +0000 (18:02 +0000)]
Set title/h1 to something sensible when granting/revoking roles

15 years agoAdd title="" to the revoke/grant icons that indicate what they're about to do
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 17:57:20 +0000 (17:57 +0000)]
Add title="" to the revoke/grant icons that indicate what they're about to do

15 years agoMerging 17846:17904 from trunk.
commit | commitdiff | tree
Matt Amos [Thu, 1 Oct 2009 17:23:01 +0000 (17:23 +0000)]
Merging 17846:17904 from trunk.

15 years agoRefactored user_role and controller. Now much more DRY.
commit | commitdiff | tree
Matt Amos [Thu, 1 Oct 2009 17:15:34 +0000 (17:15 +0000)]
Refactored user_role and controller. Now much more DRY.

15 years agoSynced from Translatewiki
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 16:48:31 +0000 (16:48 +0000)]
Synced from Translatewiki

15 years agocompile avar's latest commit
commit | commitdiff | tree
Richard Fairhurst [Thu, 1 Oct 2009 16:01:12 +0000 (16:01 +0000)]
compile avar's latest commit

15 years ago* Localisation updates from translatewiki.net (2009-10-01)
commit | commitdiff | tree
Translatewiki [Thu, 1 Oct 2009 13:42:46 +0000 (13:42 +0000)]
* Localisation updates from translatewiki.net (2009-10-01)
* svn:eol-style native

15 years agoTranslatewiki URLs changed. Adjust script to match
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 13:41:51 +0000 (13:41 +0000)]
Translatewiki URLs changed. Adjust script to match

15 years agoRichardF forgot to nuke cz.yml in [17664]. Nuking
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 13:18:45 +0000 (13:18 +0000)]
RichardF forgot to nuke cz.yml in [17664]. Nuking

15 years agoPotlatch 1.2c
commit | commitdiff | tree
Richard Fairhurst [Thu, 1 Oct 2009 11:04:00 +0000 (11:04 +0000)]
Potlatch 1.2c

15 years agoThe 'more' message used in the history dialog (history.as) was missing
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 10:59:43 +0000 (10:59 +0000)]
The 'more' message used in the history dialog (history.as) was missing

15 years agoThis whitespace at the end of "Custom: " isn't needed. The layer
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 10:39:31 +0000 (10:39 +0000)]
This whitespace at the end of "Custom: " isn't needed. The layer
selector looks the same without it and Translatewiki pukes on it.

In any case this needs to be turned into a message with
parameters. But Potlatch's code is too hairy so I'm not touching it.

15 years agoFixed message key that was broken due to a broken regex I used during
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Thu, 1 Oct 2009 10:21:12 +0000 (10:21 +0000)]
Fixed message key that was broken due to a broken regex I used during
importing. It had AS message params mixed up with it.

15 years agoshow buildings in pink
commit | commitdiff | tree
Richard Fairhurst [Wed, 30 Sep 2009 23:54:25 +0000 (23:54 +0000)]
show buildings in pink

15 years agoOpen up crossdomain policy to allow all headers from everywhere as I can't
commit | commitdiff | tree
Tom Hughes [Wed, 30 Sep 2009 23:47:26 +0000 (23:47 +0000)]
Open up crossdomain policy to allow all headers from everywhere as I can't
find any information anywhere that gives me any idea why we would want to
restrict what headers can be sent.

15 years agoImport extra rails translations from http://github.com/svenfuchs/rails-i18n.
commit | commitdiff | tree
Tom Hughes [Wed, 30 Sep 2009 23:26:47 +0000 (23:26 +0000)]
Import extra rails translations from http://github.com/svenfuchs/rails-i18n.

15 years agocomment out dupe purging debug message
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 17:43:17 +0000 (17:43 +0000)]
comment out dupe purging debug message

15 years agocompile error in previous commit
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 17:43:02 +0000 (17:43 +0000)]
compile error in previous commit

15 years ago--cache option
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 17:42:06 +0000 (17:42 +0000)]
--cache option

15 years agoAdded better messages and error handling in a couple of places. Added integration...
commit | commitdiff | tree
Matt Amos [Wed, 30 Sep 2009 17:39:42 +0000 (17:39 +0000)]
Added better messages and error handling in a couple of places. Added integration checks to ensure that the blocking is actually working. Tests FTW.

15 years agoTried to DRY the user_blocks controller. Moved the configuration of the blocking...
commit | commitdiff | tree
Matt Amos [Wed, 30 Sep 2009 15:44:29 +0000 (15:44 +0000)]
Tried to DRY the user_blocks controller. Moved the configuration of the blocking periods into application.yml.

15 years agoThere are a bunch of keys on Translatewiki that are equivalent to
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 11:04:16 +0000 (11:04 +0000)]
There are a bunch of keys on Translatewiki that are equivalent to
English for some reason. Probably because they were there at import
time. Nuke them.

15 years agoUpdated from Translatewiki with ''perl script/locale/merge-from-translatewiki''
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Wed, 30 Sep 2009 10:58:00 +0000 (10:58 +0000)]
Updated from Translatewiki with ''perl script/locale/merge-from-translatewiki''

15 years agoUpdate language list.
commit | commitdiff | tree
Tom Hughes [Wed, 30 Sep 2009 08:50:21 +0000 (08:50 +0000)]
Update language list.

15 years agoAdd script to update config/languages.yml from translatewiki language list.
commit | commitdiff | tree
Tom Hughes [Wed, 30 Sep 2009 08:49:28 +0000 (08:49 +0000)]
Add script to update config/languages.yml from translatewiki language list.

15 years agoRename reload_languages to reload-languages for consistency.
commit | commitdiff | tree
Tom Hughes [Wed, 30 Sep 2009 08:49:00 +0000 (08:49 +0000)]
Rename reload_languages to reload-languages for consistency.

15 years agoRemove untranslated parts in he.yml
commit | commitdiff | tree
Translatewiki [Tue, 29 Sep 2009 17:32:01 +0000 (17:32 +0000)]
Remove untranslated parts in he.yml

15 years agoNew migration to add better auditing to user_roles and better column names there...
commit | commitdiff | tree
Matt Amos [Tue, 29 Sep 2009 16:44:03 +0000 (16:44 +0000)]
New migration to add better auditing to user_roles and better column names there and on user_blocks. Added a helper for displaying block status messages.

15 years agoRevert r17851 and just give non-local flash clients access to
commit | commitdiff | tree
Tom Hughes [Tue, 29 Sep 2009 16:24:07 +0000 (16:24 +0000)]
Revert r17851 and just give non-local flash clients access to
the X_HTTP_METHOD_OVERRIDE header.

15 years agoCapitalize JavaScript as suggested on http://translatewiki.net/w/i.php?title=Special...
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 16:21:50 +0000 (16:21 +0000)]
Capitalize JavaScript as suggested on http://translatewiki.net/w/i.php?title=Special:Translate&task=review&group=out-osm&language=qqq&limit=2500

15 years agoMerged from Translatewiki with:
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 15:52:08 +0000 (15:52 +0000)]
Merged from Translatewiki with:
{{{
perl script/locale/merge-from-translatewiki
}}}

15 years agoMerge r17285 from the oauth branch - allow flash access to set headers, even when...
commit | commitdiff | tree
Andy Allan [Tue, 29 Sep 2009 14:18:33 +0000 (14:18 +0000)]
Merge r17285 from the oauth branch - allow flash access to set headers, even when hosted at non-openstreetmap domains

15 years ago * Reconstruct option
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 13:28:23 +0000 (13:28 +0000)]
 * Reconstruct option
 * I hate File::Basename and it hates absolute paths. I'm using my evil hack again

15 years agoMerging 17824:17845 from trunk to blocking branch.
commit | commitdiff | tree
Matt Amos [Tue, 29 Sep 2009 10:23:31 +0000 (10:23 +0000)]
Merging 17824:17845 from trunk to blocking branch.

15 years agoActually make the last commit work. I thought Ruby's string interpolation syntax...
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 10:12:01 +0000 (10:12 +0000)]
Actually make the last commit work. I thought Ruby's string interpolation syntax worked differently

15 years agoEscape user-supplied JavaScript. Fixes http://lists.openstreetmap.org/pipermail/talk...
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 09:23:11 +0000 (09:23 +0000)]
Escape user-supplied JavaScript. Fixes http://lists.openstreetmap.org/pipermail/talk/2009-September/042846.ht

15 years ago--locales-dir is now config/locales by default
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 09:00:53 +0000 (09:00 +0000)]
--locales-dir is now config/locales by default

15 years agoTests for [17838]
commit | commitdiff | tree
Thomas Wood [Tue, 29 Sep 2009 03:58:33 +0000 (03:58 +0000)]
Tests for [17838]

Why is our testing fixtures such a mess? It took me half an hour to find a useable node. And I'm still not sure if it's ok, since I want to get to bed. kthxbye

15 years ago5 character patch to only output duplicated nodes once in a way/full call
commit | commitdiff | tree
Thomas Wood [Tue, 29 Sep 2009 02:55:35 +0000 (02:55 +0000)]
5 character patch to only output duplicated nodes once in a way/full call
Unit tests not run - problems on this system
Fixes #2327

15 years agoRemove corrupt message from Dutch translation.
commit | commitdiff | tree
Tom Hughes [Mon, 28 Sep 2009 21:34:10 +0000 (21:34 +0000)]
Remove corrupt message from Dutch translation.

15 years agoImporting new messages to existing languages from Translatewiki. See
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 21:02:47 +0000 (21:02 +0000)]
Importing new messages to existing languages from Translatewiki. See
also [17832].

This commit can be reviewed in a sane manner by looking at
attachment:ticket:2305:first-translatewiki-patch.patch.gz

I've manually gone through it and searched for errors. I didn't find
any.

15 years agomore SYNOPSIS instructions
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:52:53 +0000 (20:52 +0000)]
more SYNOPSIS instructions

15 years agoRemove comment saying when these files were generated
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:50:03 +0000 (20:50 +0000)]
Remove comment saying when these files were generated

15 years agoActualy having autogenerated timestamps at the top of files which are
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:43:48 +0000 (20:43 +0000)]
Actualy having autogenerated timestamps at the top of files which are
under version controll is a pretty lousy idea now that I think of it..

15 years agoCommiting 26 new language translations (although some are really
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:38:39 +0000 (20:38 +0000)]
Commiting 26 new language translations (although some are really
small) from Translatewiki. This more than doubles the translations we
have as we had 25 before.

This was merged with:

{{{
perl script/locale/merge-from-translatewiki --locales-dir config/locales --only-new
}}}

And here are some stats:

{{{
$ svn st config/locales/|awk '{print $2}'|xargs wc -l|sort -nr
  5212 total
   955 config/locales/hsb.yml
   646 config/locales/fi.yml
   608 config/locales/br.yml
   432 config/locales/nds.yml
   359 config/locales/km.yml
   306 config/locales/af.yml
   289 config/locales/sk.yml
   276 config/locales/sr-EC.yml
   217 config/locales/sv.yml
   162 config/locales/ksh.yml
   154 config/locales/no.yml
   140 config/locales/be-TARASK.yml
   125 config/locales/te.yml
   116 config/locales/gsw.yml
    86 config/locales/eo.yml
    72 config/locales/bg.yml
    71 config/locales/ar.yml
    37 config/locales/tr.yml
    30 config/locales/ps.yml
    26 config/locales/lv.yml
    21 config/locales/eu.yml
    20 config/locales/pt.yml
    20 config/locales/lt.yml
    16 config/locales/nn.yml
    14 config/locales/yi.yml
    14 config/locales/bs.yml
}}}

15 years agoReport on download progress
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:27:50 +0000 (20:27 +0000)]
Report on download progress

15 years ago--only-new option
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:25:19 +0000 (20:25 +0000)]
--only-new option

Don't spew so much debug output

15 years ago * Add more keys from the optional list that we don't want to ignor
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:17:36 +0000 (20:17 +0000)]
 * Add more keys from the optional list that we don't want to ignor
 * Don't delete a singular form if the plural form exists in the source language (en)
 * Don't nuke site.key.table.entry singularls when the source language (en) has an array

15 years agoA hacky in-process script for merging translations from Translatewiki
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 19:06:34 +0000 (19:06 +0000)]
A hacky in-process script for merging translations from Translatewiki
while working around all the bugs in #2305

15 years agoAdded a confirmation step to the process of granting and revoking user roles.
commit | commitdiff | tree
Matt Amos [Mon, 28 Sep 2009 17:35:39 +0000 (17:35 +0000)]
Added a confirmation step to the process of granting and revoking user roles.

15 years agoTruncate long reason texts to not overwhelm the browser window.
commit | commitdiff | tree
Matt Amos [Mon, 28 Sep 2009 17:30:10 +0000 (17:30 +0000)]
Truncate long reason texts to not overwhelm the browser window.

15 years agoFirst version of blocking feature. Allows both time-based (for map protection) and...
commit | commitdiff | tree
Matt Amos [Mon, 28 Sep 2009 16:01:00 +0000 (16:01 +0000)]
First version of blocking feature. Allows both time-based (for map protection) and notice-based (for education) blocks on users. Also introduces user roles and a simple UI for displaying and administering these.

15 years agoCreating branch for blocking feature work.
commit | commitdiff | tree
Matt Amos [Mon, 28 Sep 2009 15:55:23 +0000 (15:55 +0000)]
Creating branch for blocking feature work.

15 years agosmall fix
commit | commitdiff | tree
Jonas Krückel [Sun, 27 Sep 2009 14:15:53 +0000 (14:15 +0000)]
small fix

15 years agoEscape language codes before matching them in case they contain
commit | commitdiff | tree
Tom Hughes [Sat, 26 Sep 2009 22:39:09 +0000 (22:39 +0000)]
Escape language codes before matching them in case they contain
characters with special meaning in a regexp. Closes #2318.

15 years agoDeal with values which are arrays, before and after:
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Sat, 26 Sep 2009 20:03:52 +0000 (20:03 +0000)]
Deal with values which are arrays, before and after:

    avar@aoeu:~/src/osm/sites/rails_port/config/locales$ perl ../../script/locale/diff --dump-flat de.yml|egrep "Nähe|Uni"
    message.inbox.people_mapping_nearby: Mappern in deiner Nähe
    message.outbox.people_mapping_nearby: Mappern in deiner Nähe
      - "Universit\xC3\xA4t"
    user.friend_map.nearby mapper: "Mapper in der Nähe: [[nearby_user]]"
    user.view.nearby users: "Benutzer in der Nähe:"
    user.view.no nearby users: Es gibt bisher keine Benutzer, die einen Standort in deiner Nähe angegeben haben.
    avar@aoeu:~/src/osm/sites/rails_port/config/locales$ perl ../../script/locale/diff --dump-flat de.yml|egrep "Nähe|Uni"
    message.inbox.people_mapping_nearby: Mappern in deiner Nähe
    message.outbox.people_mapping_nearby: Mappern in deiner Nähe
      - Universität
    user.friend_map.nearby mapper: "Mapper in der Nähe: [[nearby_user]]"
    user.view.nearby users: "Benutzer in der Nähe:"
    user.view.no nearby users: Es gibt bisher keine Benutzer, die einen Standort in deiner Nähe angegeben haben.

15 years agoUpdated Hungarian translation of OpenStreetMap website (Hu: -> HU: in wiki links)
commit | commitdiff | tree
Balló György [Fri, 25 Sep 2009 18:03:58 +0000 (18:03 +0000)]
Updated Hungarian translation of OpenStreetMap website (Hu: -> HU: in wiki links)

15 years agoUpdated Hungarian translation of OpenStreetMap website
commit | commitdiff | tree
Balló György [Fri, 25 Sep 2009 17:46:21 +0000 (17:46 +0000)]
Updated Hungarian translation of OpenStreetMap website

15 years agoFix comment typo.
commit | commitdiff | tree
Tom Hughes [Thu, 24 Sep 2009 23:27:45 +0000 (23:27 +0000)]
Fix comment typo.

15 years agoIgnore empty tags. Closes #2311.
commit | commitdiff | tree
Tom Hughes [Thu, 24 Sep 2009 23:27:13 +0000 (23:27 +0000)]
Ignore empty tags. Closes #2311.

15 years agoWrap GPX API calls with the API error handler, and make sure the create
commit | commitdiff | tree
Tom Hughes [Thu, 24 Sep 2009 23:15:35 +0000 (23:15 +0000)]
Wrap GPX API calls with the API error handler, and make sure the create
method throws on error so it can be trapped and reported. Closes #2310.

15 years agoI moved Potlatch's locales but didn't update this, which broke all i18n
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 23:34:43 +0000 (23:34 +0000)]
I moved Potlatch's locales but didn't update this, which broke all i18n

15 years agoQuick hack to add --dump-flat to get a human-readable flat version of the hash
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 20:36:09 +0000 (20:36 +0000)]
Quick hack to add --dump-flat to get a human-readable flat version of the hash

15 years agoSome of these files were in ISO-8859-1, no idea how that happened.
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 18:14:30 +0000 (18:14 +0000)]
Some of these files were in ISO-8859-1, no idea how that happened.

Fixed with:

{{{
for i in $(file *|grep ISO|awk '{print $1}'|sed s/://); do cat $i | iconv -f iso-8859-1 -t utf-8 > $i.utf8;done
for i in *yml; do mv $i.utf8 $i; done
}}}

15 years agoRemoving zh-HANS: Just contained a few messages in English
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 18:09:00 +0000 (18:09 +0000)]
Removing zh-HANS: Just contained a few messages in English

15 years agoRemoved i18n messages which contained English - old crap from the wiki
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 18:08:01 +0000 (18:08 +0000)]
Removed i18n messages which contained English - old crap from the wiki

15 years agoMake the 'Advanced' menu translatable
commit | commitdiff | tree
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 18:03:20 +0000 (18:03 +0000)]
Make the 'Advanced' menu translatable

next
The OpenStreetMap web site