]>
git.openstreetmap.org Git - rails.git/log
Æ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
Ævar Arnfjörð Bjarmason [Tue, 29 Sep 2009 09:00:53 +0000 (09:00 +0000)]
--locales-dir is now config/locales by default
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
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
Tom Hughes [Mon, 28 Sep 2009 21:34:10 +0000 (21:34 +0000)]
Remove corrupt message from Dutch translation.
Æ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.
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:52:53 +0000 (20:52 +0000)]
more SYNOPSIS instructions
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:50:03 +0000 (20:50 +0000)]
Remove comment saying when these files were generated
Æ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..
Æ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
}}}
Ævar Arnfjörð Bjarmason [Mon, 28 Sep 2009 20:27:50 +0000 (20:27 +0000)]
Report on download progress
Æ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
Æ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
Æ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
Jonas Krückel [Sun, 27 Sep 2009 14:15:53 +0000 (14:15 +0000)]
small fix
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.
Æ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.
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)
Balló György [Fri, 25 Sep 2009 17:46:21 +0000 (17:46 +0000)]
Updated Hungarian translation of OpenStreetMap website
Tom Hughes [Thu, 24 Sep 2009 23:27:45 +0000 (23:27 +0000)]
Fix comment typo.
Tom Hughes [Thu, 24 Sep 2009 23:27:13 +0000 (23:27 +0000)]
Ignore empty tags. Closes #2311.
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.
Æ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
Æ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
Æ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
}}}
Æ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
Æ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
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 18:03:20 +0000 (18:03 +0000)]
Make the 'Advanced' menu translatable
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 17:36:51 +0000 (17:36 +0000)]
oops, removing debugging code
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 17:29:29 +0000 (17:29 +0000)]
Delete redundant translations from localised files.
I used this script:
{{{
#!/usr/bin/env perl
use feature ':5.10';
use strict;
use warnings;
use YAML::Syck qw(Load LoadFile Dump DumpFile);
use File::Slurp qw(slurp);
use Data::Dump 'dump';
use Encode qw(decode);
use autodie;
$YAML::Syck::Headless = 1;
$YAML::Syck::SortKeys = 1;
$YAML::Syck::ImplicitUnicode = 1;
my %lang;
chdir 'locales';
my @yml = glob "*.yml";
my @lang = map { s/\.yml//; $_ } @yml;
for my $lang (@lang) {
say "Loading $lang";
$lang{$lang} = LoadFile("$lang.yml")->{$lang};
}
for my $lang (grep { $_ ne 'en' } @lang) {
while (my ($k, $v) = each %{ $lang{ $lang } }) {
if ($lang{ $lang }->{$k} eq $lang{ en }->{$k}
or (exists $lang{ $lang }->{$k} and not exists $lang{ en }->{$k})) {
delete $lang{ $lang }->{$k};
}
}
}
for my $lang (@lang) {
DumpFile("$lang.yml", { $lang => $lang{$lang} }) or die "arghl";
}
}}}
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 17:23:58 +0000 (17:23 +0000)]
Used perl -pi -e 's/^.*?"action_createpoi":/ action_createpoi:/g' *yml
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 17:08:46 +0000 (17:08 +0000)]
[2304]: Split the default English i18n parameter in Potlatch out to a YAML file
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 16:26:17 +0000 (16:26 +0000)]
Convert all the Potlatch locale files to a rails-like format (to make
it easier for Translatewiki).
Here's the program I used to convert it:
{{{
#!/usr/bin/env perl
use feature ':5.10';
use strict;
use warnings;
use YAML::Syck qw(Load LoadFile Dump DumpFile);
use File::Slurp qw(slurp);
use Data::Dump 'dump';
use Encode qw(decode);
use autodie;
$YAML::Syck::Headless = 1;
$YAML::Syck::SortKeys = 1;
$YAML::Syck::ImplicitUnicode = 1;
my %lang;
chdir 'locales';
my @yml = glob "*.yml";
my @lang = map { s/\.yml//; $_ } @yml;
for my $lang (@lang) {
say "Loading $lang";
my $file = "$lang.yml";
$lang{$lang} = LoadFile($file);
if (-f "$lang.html") {
$lang{$lang}->{"help_html"} = slurp("$lang.html")
}
DumpFile("$lang.yml.new", { $lang => $lang{$lang} }) or die "arghl";
}
}}}
Ævar Arnfjörð Bjarmason [Wed, 23 Sep 2009 16:05:56 +0000 (16:05 +0000)]
delete localised directory
Æ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
Æ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 :)
Tom Hughes [Tue, 22 Sep 2009 20:15:09 +0000 (20:15 +0000)]
Remove remaining trailing spaces from translations.
Æ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
Æ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.
Tom Hughes [Sun, 20 Sep 2009 16:47:19 +0000 (16:47 +0000)]
Update Vietnamese translation. Closes #2299.
Æ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.
Æ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.
Æ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
Richard Fairhurst [Fri, 18 Sep 2009 14:11:18 +0000 (14:11 +0000)]
add ability to specify custom background in the query string
Æ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.
Æ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 [...]"
Ævar Arnfjörð Bjarmason [Thu, 17 Sep 2009 22:49:42 +0000 (22:49 +0000)]
Icelandic day names should be in lower case
Richard Fairhurst [Thu, 17 Sep 2009 00:51:45 +0000 (00:51 +0000)]
Or maybe this one. #2279. Ugh.
Richard Fairhurst [Thu, 17 Sep 2009 00:48:55 +0000 (00:48 +0000)]
Localisation
Richard Fairhurst [Thu, 17 Sep 2009 00:38:20 +0000 (00:38 +0000)]
Potlatch 1.2b
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.
Tom Hughes [Tue, 15 Sep 2009 20:20:21 +0000 (20:20 +0000)]
Update be locale. Closes #2284.
Tom Hughes [Tue, 15 Sep 2009 16:01:50 +0000 (16:01 +0000)]
Remove scale bar. Closes #1704.
Æ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!
Æ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)
Tom Hughes [Mon, 14 Sep 2009 23:22:10 +0000 (23:22 +0000)]
Update Russian translation. Closes #2281.
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.
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.
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.
Æ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.
Æ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)"
Ævar Arnfjörð Bjarmason [Mon, 14 Sep 2009 19:32:29 +0000 (19:32 +0000)]
Link to username in "Send message to" message
Tom Hughes [Sat, 12 Sep 2009 16:46:25 +0000 (16:46 +0000)]
Treat an explicit public=0 argument as meaning private.
Tom Hughes [Sat, 12 Sep 2009 10:57:33 +0000 (10:57 +0000)]
Update zh-TW translation. Closes #2272.
Ævar Arnfjörð Bjarmason [Mon, 7 Sep 2009 19:29:25 +0000 (19:29 +0000)]
oops, wrong e-mail address
Tom Hughes [Mon, 7 Sep 2009 16:44:54 +0000 (16:44 +0000)]
Add xid_to_int4() function for Postgres.
Æ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."
Richard Fairhurst [Mon, 7 Sep 2009 11:16:35 +0000 (11:16 +0000)]
cancel upload howler
Richard Fairhurst [Sun, 6 Sep 2009 23:54:02 +0000 (23:54 +0000)]
fix annoying retry bug, and fine-tune relations colours
Richard Fairhurst [Fri, 4 Sep 2009 14:51:48 +0000 (14:51 +0000)]
fix menu issue spotted by randomjunk
Tom Hughes [Fri, 4 Sep 2009 10:52:58 +0000 (10:52 +0000)]
Workaround rails 2.3.4 bogus deprecation warnings.
Tom Hughes [Fri, 4 Sep 2009 08:45:38 +0000 (08:45 +0000)]
Update to rails 2.3.4 for security fixes.
Tom Hughes [Thu, 3 Sep 2009 21:55:42 +0000 (21:55 +0000)]
Add support for reloading the language table.
Tom Hughes [Thu, 3 Sep 2009 21:31:34 +0000 (21:31 +0000)]
Add Guadeloupean Creole French translation of web site. Closes #2255.
Richard Fairhurst [Tue, 1 Sep 2009 14:38:52 +0000 (14:38 +0000)]
(binary)
Jonas Krückel [Tue, 1 Sep 2009 10:47:24 +0000 (10:47 +0000)]
typo correction
Jonas Krückel [Tue, 1 Sep 2009 10:37:47 +0000 (10:37 +0000)]
more translations
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).
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.
Tom Hughes [Mon, 31 Aug 2009 23:32:03 +0000 (23:32 +0000)]
Tidy up.
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.
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.
Richard Fairhurst [Sun, 30 Aug 2009 19:14:50 +0000 (19:14 +0000)]
Potlatch 1.2a
Jonas Krückel [Fri, 28 Aug 2009 11:54:29 +0000 (11:54 +0000)]
new translations
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.
Shaun McDonald [Fri, 28 Aug 2009 07:15:06 +0000 (07:15 +0000)]
fix indentation in yaml
Jonas Krückel [Thu, 27 Aug 2009 23:30:06 +0000 (23:30 +0000)]
uptodate with en.yml 17163
Tom Hughes [Thu, 27 Aug 2009 22:42:14 +0000 (22:42 +0000)]
Revert es.yml to utf-8 encoding. Closes #2231.
Tom Hughes [Thu, 27 Aug 2009 15:50:52 +0000 (15:50 +0000)]
Wrap tile numbers at the international dateline. Closes #2226.
Iván Sánchez Ortega [Wed, 26 Aug 2009 13:43:35 +0000 (13:43 +0000)]
Update of spanish translation
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.
Balló György [Wed, 19 Aug 2009 14:52:54 +0000 (14:52 +0000)]
Updated Hungarian translation for Potlatch 1.2
Balló György [Wed, 19 Aug 2009 13:46:12 +0000 (13:46 +0000)]
Updated Hungarian translation of OpenStreetMap website
Tom Hughes [Wed, 19 Aug 2009 10:29:57 +0000 (10:29 +0000)]
Commit resource changes from r17160.
Tom Hughes [Wed, 19 Aug 2009 08:04:42 +0000 (08:04 +0000)]
Remove debugging.
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.
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.
Štefan Baebler [Wed, 19 Aug 2009 05:07:26 +0000 (05:07 +0000)]
tests for diary rss feeds
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.
Tom Hughes [Tue, 18 Aug 2009 20:06:33 +0000 (20:06 +0000)]
Add parentheses to fix warning.