Commit graph

2670 commits

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
d9c17e930d * Reconstruct option
* I hate File::Basename and it hates absolute paths. I'm using my evil hack again
2009-09-29 13:28:23 +00:00
Ævar Arnfjörð Bjarmason
801182d2ea Actually make the last commit work. I thought Ruby's string interpolation syntax worked differently 2009-09-29 10:12:01 +00:00
Ævar Arnfjörð Bjarmason
0197460689 Escape user-supplied JavaScript. Fixes http://lists.openstreetmap.org/pipermail/talk/2009-September/042846.ht 2009-09-29 09:23:11 +00:00
Ævar Arnfjörð Bjarmason
1355455f83 --locales-dir is now config/locales by default 2009-09-29 09:00:53 +00:00
Thomas Wood
76b6d7d876 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
2009-09-29 03:58:33 +00:00
Thomas Wood
ec26e06706 5 character patch to only output duplicated nodes once in a way/full call
Unit tests not run - problems on this system
Fixes #2327
2009-09-29 02:55:35 +00:00
Tom Hughes
18f9ebaf71 Remove corrupt message from Dutch translation. 2009-09-28 21:34:10 +00:00
Ævar Arnfjörð Bjarmason
b14abdd888 Importing new messages to existing languages from Translatewiki. See
also [17832].

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

I've manually gone through it and searched for errors. I didn't find
any.
2009-09-28 21:02:47 +00:00
Ævar Arnfjörð Bjarmason
f59967a894 more SYNOPSIS instructions 2009-09-28 20:52:53 +00:00
Ævar Arnfjörð Bjarmason
8cdee8e0c7 Remove comment saying when these files were generated 2009-09-28 20:50:03 +00:00
Ævar Arnfjörð Bjarmason
b479b0c2b6 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..
2009-09-28 20:43:48 +00:00
Ævar Arnfjörð Bjarmason
06836b839c 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
}}}
2009-09-28 20:38:39 +00:00
Ævar Arnfjörð Bjarmason
ea970889e5 Report on download progress 2009-09-28 20:27:50 +00:00
Ævar Arnfjörð Bjarmason
5524765d17 --only-new option
Don't spew so much debug output
2009-09-28 20:25:19 +00:00
Ævar Arnfjörð Bjarmason
134ff60ab7 * 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
2009-09-28 20:17:36 +00:00
Ævar Arnfjörð Bjarmason
1facda11d6 A hacky in-process script for merging translations from Translatewiki
while working around all the bugs in #2305
2009-09-28 19:06:34 +00:00
Jonas Krückel
d09d8c3296 small fix 2009-09-27 14:15:53 +00:00
Tom Hughes
f0d3831f12 Escape language codes before matching them in case they contain
characters with special meaning in a regexp. Closes #2318.
2009-09-26 22:39:09 +00:00
Ævar Arnfjörð Bjarmason
088bd1dcb2 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.
2009-09-26 20:03:52 +00:00
Balló György
425bf20b38 Updated Hungarian translation of OpenStreetMap website (Hu: -> HU: in wiki links) 2009-09-25 18:03:58 +00:00
Balló György
25bb6e4192 Updated Hungarian translation of OpenStreetMap website 2009-09-25 17:46:21 +00:00
Tom Hughes
b8afd4fbf3 Fix comment typo. 2009-09-24 23:27:45 +00:00
Tom Hughes
77ce1b2809 Ignore empty tags. Closes #2311. 2009-09-24 23:27:13 +00:00
Tom Hughes
2297dc9074 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.
2009-09-24 23:15:35 +00:00
Ævar Arnfjörð Bjarmason
9b7e39dc49 I moved Potlatch's locales but didn't update this, which broke all i18n 2009-09-23 23:34:43 +00:00
Ævar Arnfjörð Bjarmason
2b2e754b3d Quick hack to add --dump-flat to get a human-readable flat version of the hash 2009-09-23 20:36:09 +00:00
Ævar Arnfjörð Bjarmason
e7d7f35120 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
}}}
2009-09-23 18:14:30 +00:00
Ævar Arnfjörð Bjarmason
65fec5d38a Removing zh-HANS: Just contained a few messages in English 2009-09-23 18:09:00 +00:00
Ævar Arnfjörð Bjarmason
623c0dcef8 Removed i18n messages which contained English - old crap from the wiki 2009-09-23 18:08:01 +00:00
Ævar Arnfjörð Bjarmason
f32dc6ff8c Make the 'Advanced' menu translatable 2009-09-23 18:03:20 +00:00
Ævar Arnfjörð Bjarmason
5a76b08868 oops, removing debugging code 2009-09-23 17:36:51 +00:00
Ævar Arnfjörð Bjarmason
d5c71f697b 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";
}
}}}
2009-09-23 17:29:29 +00:00
Ævar Arnfjörð Bjarmason
aeca7367be Used perl -pi -e 's/^.*?"action_createpoi":/ action_createpoi:/g' *yml 2009-09-23 17:23:58 +00:00
Ævar Arnfjörð Bjarmason
65eec82978 [2304]: Split the default English i18n parameter in Potlatch out to a YAML file 2009-09-23 17:08:46 +00:00
Ævar Arnfjörð Bjarmason
889523944f 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";
    }
}}}
2009-09-23 16:26:17 +00:00
Ævar Arnfjörð Bjarmason
4462275225 delete localised directory 2009-09-23 16:05:56 +00:00
Ævar Arnfjörð Bjarmason
c60743e615 I'm hacking the Potlatch i18n system, moving the old files to the new location before I overwrite them to preserve history 2009-09-23 16:05:09 +00:00
Ævar Arnfjörð Bjarmason
3d4270d452 Syncing translations from the wiki. Hopefully for the last time :) 2009-09-23 15:51:33 +00:00
Tom Hughes
fc5261ece5 Remove remaining trailing spaces from translations. 2009-09-22 20:15:09 +00:00
Ævar Arnfjörð Bjarmason
6480d7ec02 Use the list form for school instead of the colon 2009-09-22 19:16:34 +00:00
Ævar Arnfjörð Bjarmason
32a06b9e5b 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.
2009-09-22 12:40:59 +00:00
Tom Hughes
d0bc9b9091 Update Vietnamese translation. Closes #2299. 2009-09-20 16:47:19 +00:00
Ævar Arnfjörð Bjarmason
421b611389 Use i18n() parameters for this JavaScript message instead of ad-hoc
string concatenation.

See [17712] for why I'm changing this.
2009-09-20 10:41:57 +00:00
Ævar Arnfjörð Bjarmason
185c7c24ae 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.
2009-09-20 10:25:31 +00:00
Ævar Arnfjörð Bjarmason
039a49a97b 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
2009-09-20 10:10:12 +00:00
Richard Fairhurst
00332614f9 add ability to specify custom background in the query string 2009-09-18 14:11:18 +00:00
Ævar Arnfjörð Bjarmason
658a34714f 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.
2009-09-17 23:36:54 +00:00
Ævar Arnfjörð Bjarmason
619cacba7c "Athugasemd eftir Foo þann fimmtudaginn [...]" is grammatically
incorrect. Use "Athugasemd eftir Foo sett inn fimmtudaginn [...]"
2009-09-17 22:58:10 +00:00
Ævar Arnfjörð Bjarmason
eef5ac2c73 Icelandic day names should be in lower case 2009-09-17 22:49:42 +00:00
Richard Fairhurst
1db51102cd Or maybe this one. #2279. Ugh. 2009-09-17 00:51:45 +00:00