rails.git
11 years agoFix changeset paging.
Tom Hughes [Wed, 15 Jul 2009 11:33:21 +0000 (11:33 +0000)]
Fix changeset paging.

11 years agoRemove bogus executable permissions.
Tom Hughes [Tue, 14 Jul 2009 23:10:39 +0000 (23:10 +0000)]
Remove bogus executable permissions.

11 years agoNew Potlatch translations pulled in as a result of http://wiki.openstreetmap.org...
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 22:23:38 +0000 (22:23 +0000)]
New Potlatch translations pulled in as a result of wiki.openstreetmap.org/index.php?title=Template%3APotlatch%2FTranslation&diff=302859&oldid=301148

11 years agoUpdated Hungarian translation from the wiki
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 22:06:12 +0000 (22:06 +0000)]
Updated Hungarian translation from the wiki

11 years agoPotlatch's i18n support predates our Rails i18n effort, so it was
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 21:55:40 +0000 (21:55 +0000)]
Potlatch's i18n support predates our Rails i18n effort, so it was
still doing its own language detection.

Scrap that and use I18n.locale instead, now Potlatch is guaranteed to
use whatever translation the rest of the site uses.

I've tested this by switching the language in preferences back and
forth, and also ensured that Potlatch will fall back on English if the
specified language doesn't exist in its list of translations.

11 years agoDelete the old localised.yaml file Potlatch used before it was split into per-languag...
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 21:40:50 +0000 (21:40 +0000)]
Delete the old localised.yaml file Potlatch used before it was split into per-language files

11 years agoFix send message links for friends and nearby mappers. Fixes #2065.
Tom Hughes [Tue, 14 Jul 2009 19:48:21 +0000 (19:48 +0000)]
Fix send message links for friends and nearby mappers. Fixes #2065.

11 years agonew translations
Jonas Krückel [Tue, 14 Jul 2009 15:25:24 +0000 (15:25 +0000)]
new translations

11 years agouptodate with en.yml 16486
Jonas Krückel [Tue, 14 Jul 2009 15:00:01 +0000 (15:00 +0000)]
uptodate with en.yml 16486

11 years agoTranslated new string introduced in the changeset_browser merge
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 00:59:44 +0000 (00:59 +0000)]
Translated new string introduced in the changeset_browser merge

11 years agoUse pluralization for showing that a changeset has 1/many node/nodes
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 00:50:38 +0000 (00:50 +0000)]
Use pluralization for showing that a changeset has 1/many node/nodes
way/ways relation/relations

11 years agouse the same text for informing the user that tags are delimited by
Ævar Arnfjörð Bjarmason [Tue, 14 Jul 2009 00:46:39 +0000 (00:46 +0000)]
use the same text for informing the user that tags are delimited by
commas in both the upload & edit form

11 years agoMerge changeset browser branch to trunk.
Tom Hughes [Mon, 13 Jul 2009 23:52:32 +0000 (23:52 +0000)]
Merge changeset browser branch to trunk.

11 years agoMerge 16355:16480 from trunk.
Tom Hughes [Mon, 13 Jul 2009 23:28:02 +0000 (23:28 +0000)]
Merge 16355:16480 from trunk.

11 years agoimproved pluralization, continuation of #2049
Štefan Baebler [Mon, 13 Jul 2009 18:51:32 +0000 (18:51 +0000)]
improved pluralization, continuation of #2049

11 years agoUpdated Hungarian translation of OpenStreetMap website
Balló György [Mon, 13 Jul 2009 15:54:23 +0000 (15:54 +0000)]
Updated Hungarian translation of OpenStreetMap website

11 years agoUpdated Hungarian translation of Potlatch
Balló György [Mon, 13 Jul 2009 15:47:51 +0000 (15:47 +0000)]
Updated Hungarian translation of Potlatch

11 years agoAdd extra keys to custom Slovenian pluralization.
Tom Hughes [Mon, 13 Jul 2009 08:59:07 +0000 (08:59 +0000)]
Add extra keys to custom Slovenian pluralization.

11 years agoAdd custom pluralizer for Slovenian. Fixes #2049.
Tom Hughes [Mon, 13 Jul 2009 08:47:59 +0000 (08:47 +0000)]
Add custom pluralizer for Slovenian. Fixes #2049.

11 years agoRemove redundant text.
Tom Hughes [Mon, 13 Jul 2009 08:30:48 +0000 (08:30 +0000)]
Remove redundant text.

11 years agoFix a missing translation. Closes #2052.
Tom Hughes [Mon, 13 Jul 2009 08:26:13 +0000 (08:26 +0000)]
Fix a missing translation. Closes #2052.

11 years agoRemove SOTM advert from site.
Tom Hughes [Mon, 13 Jul 2009 08:11:11 +0000 (08:11 +0000)]
Remove SOTM advert from site.

11 years agoAdd initial Romanian translations. Closes #2058.
Tom Hughes [Mon, 13 Jul 2009 07:52:30 +0000 (07:52 +0000)]
Add initial Romanian translations. Closes #2058.

11 years agoFixed a bug in how fields in /message/new were being pre-filled out.
Ævar Arnfjörð Bjarmason [Sun, 12 Jul 2009 16:01:49 +0000 (16:01 +0000)]
Fixed a bug in how fields in /message/new were being pre-filled out.

When someone went to /message/new/:user the "Subject" are would be
pre-filled out with t('message.new.title'). The problem was that the
@title template variable was being used for two purposes, to set the
HTML <title> AND to pre-fill out the subject.

We don't always want these two to be the same, but sometimes we
do. E.g. when someone replies to a diary entry and visits
/message/new/:user?title=Foo we want Foo in the <title> and in the
pre-filled out Subject, and the same goes for replying to a message.

So I've split up the @title variable into @title and @subject.

11 years agoUpdated Hungarian translation of Potlatch
Balló György [Sun, 12 Jul 2009 15:55:00 +0000 (15:55 +0000)]
Updated Hungarian translation of Potlatch

11 years agoUpdated Hungarian translation of Potlatch
Balló György [Sun, 12 Jul 2009 13:27:36 +0000 (13:27 +0000)]
Updated Hungarian translation of Potlatch

11 years agoand the binary
Richard Fairhurst [Sun, 12 Jul 2009 07:57:00 +0000 (07:57 +0000)]
and the binary

11 years agoDon't send a noification email if somebody comments on their own diary
Tom Hughes [Sat, 11 Jul 2009 13:24:57 +0000 (13:24 +0000)]
Don't send a noification email if somebody comments on their own diary
entry. Fixes #2053.

11 years agoand the binary
Richard Fairhurst [Sat, 11 Jul 2009 09:55:38 +0000 (09:55 +0000)]
and the binary

11 years ago...and the accompanying binary
Richard Fairhurst [Sat, 11 Jul 2009 07:12:19 +0000 (07:12 +0000)]
...and the accompanying binary

11 years agoCorrect some translation bug.
Balló György [Fri, 10 Jul 2009 15:28:44 +0000 (15:28 +0000)]
Correct some translation bug.

11 years agoFixed YAML syntax error in commit [16421]
Ævar Arnfjörð Bjarmason [Fri, 10 Jul 2009 13:16:55 +0000 (13:16 +0000)]
Fixed YAML syntax error in commit [16421]

11 years agoAdd Hungarian translation of OpenStreetMap website.
Balló György [Fri, 10 Jul 2009 12:59:28 +0000 (12:59 +0000)]
Add Hungarian translation of OpenStreetMap website.

11 years agoand the accompanying SWF
Richard Fairhurst [Thu, 9 Jul 2009 20:00:29 +0000 (20:00 +0000)]
and the accompanying SWF

11 years agorevised SWF
Richard Fairhurst [Thu, 9 Jul 2009 14:58:34 +0000 (14:58 +0000)]
revised SWF

11 years agofix #2046
Richard Fairhurst [Thu, 9 Jul 2009 06:37:19 +0000 (06:37 +0000)]
fix #2046

11 years agoimproved translations
Štefan Baebler [Thu, 9 Jul 2009 06:13:37 +0000 (06:13 +0000)]
improved translations

11 years agoadded brief help for tag entry, continuing on #2032
Štefan Baebler [Thu, 9 Jul 2009 06:11:24 +0000 (06:11 +0000)]
added brief help for tag entry, continuing on #2032

11 years ago"list mode" should really be "live mode" :)
Richard Fairhurst [Wed, 8 Jul 2009 22:29:45 +0000 (22:29 +0000)]
"list mode" should really be "live mode" :)

11 years agoPotlatch 1.1 (server code)
Richard Fairhurst [Wed, 8 Jul 2009 20:52:02 +0000 (20:52 +0000)]
Potlatch 1.1 (server code)

11 years agoUpdate Vietnamese translation. Closes #2041.
Tom Hughes [Wed, 8 Jul 2009 07:34:40 +0000 (07:34 +0000)]
Update Vietnamese translation. Closes #2041.

11 years agoStyle the table in the feed content.
Tom Hughes [Tue, 7 Jul 2009 23:30:04 +0000 (23:30 +0000)]
Style the table in the feed content.

11 years agofixed a mixup (not really broken, but producing decieving http traffic and logs)
Štefan Baebler [Tue, 7 Jul 2009 23:28:56 +0000 (23:28 +0000)]
fixed a mixup (not really broken, but producing decieving http traffic and logs)

11 years agoUse join to construct tag strings instead of mucking around counting
Tom Hughes [Tue, 7 Jul 2009 23:05:35 +0000 (23:05 +0000)]
Use join to construct tag strings instead of mucking around counting
position in the string.

11 years agoadded comment for future generations
Štefan Baebler [Tue, 7 Jul 2009 22:50:46 +0000 (22:50 +0000)]
added comment for future generations

11 years agoIntroducing comma as tag separator (if present, otherwise it behaves as before),...
Štefan Baebler [Tue, 7 Jul 2009 22:05:03 +0000 (22:05 +0000)]
Introducing comma as tag separator (if present, otherwise it behaves as before), allowing spaces in tags. fixes #2032

11 years agoFix JOSM version matching.
Tom Hughes [Mon, 6 Jul 2009 09:59:54 +0000 (09:59 +0000)]
Fix JOSM version matching.

11 years agoMore improvements to Atom feeds.
Tom Hughes [Mon, 6 Jul 2009 00:03:33 +0000 (00:03 +0000)]
More improvements to Atom feeds.

11 years agoUpdate translations to match r16356.
Tom Hughes [Sun, 5 Jul 2009 23:52:38 +0000 (23:52 +0000)]
Update translations to match r16356.

11 years agoMerge 16216:16355 from trunk.
Tom Hughes [Sun, 5 Jul 2009 23:47:40 +0000 (23:47 +0000)]
Merge 16216:16355 from trunk.

11 years agoAdd some more detail to the changeset Atom feeds.
Tom Hughes [Sun, 5 Jul 2009 23:46:28 +0000 (23:46 +0000)]
Add some more detail to the changeset Atom feeds.

11 years agoRevised some typos. Did more translated. Not done yet, though.
Jun-Wook Kwak [Sun, 5 Jul 2009 22:54:40 +0000 (22:54 +0000)]
Revised some typos. Did more translated. Not done yet, though.

11 years agoBlock JOSM revisions 1722-1727 as they have a serious bug that causes
Tom Hughes [Sun, 5 Jul 2009 08:41:18 +0000 (08:41 +0000)]
Block JOSM revisions  1722-1727 as they have a serious bug that causes
lat/lon to be swapped (http://josm.openstreetmap.de/ticket/2804)

11 years agoAdd Vietnamese translation. Closes #2033.
Tom Hughes [Sun, 5 Jul 2009 08:36:19 +0000 (08:36 +0000)]
Add Vietnamese translation. Closes #2033.

11 years agoAdd jpeg to mime-type lighttpd.conf table, fixed #2031
Grant Slater [Sun, 5 Jul 2009 01:45:10 +0000 (01:45 +0000)]
Add jpeg to mime-type lighttpd.conf table, fixed #2031

11 years agoWhen two users are <1 km apart display the distance between them in
Ævar Arnfjörð Bjarmason [Sat, 4 Jul 2009 21:35:09 +0000 (21:35 +0000)]
When two users are <1 km apart display the distance between them in
meters, not kilometers.

Solves ticket:2028

11 years agoMake subtitle an HTML element.
Tom Hughes [Sat, 4 Jul 2009 12:15:29 +0000 (12:15 +0000)]
Make subtitle an HTML element.

11 years agoFix links to changeset feeds.
Tom Hughes [Sat, 4 Jul 2009 12:12:05 +0000 (12:12 +0000)]
Fix links to changeset feeds.

11 years agoSwitch to using ATOM for changeset feeds.
Tom Hughes [Sat, 4 Jul 2009 11:34:23 +0000 (11:34 +0000)]
Switch to using ATOM for changeset feeds.

11 years agoCorrect resource name.
Tom Hughes [Fri, 3 Jul 2009 17:44:21 +0000 (17:44 +0000)]
Correct resource name.

11 years agoFixed short link integration test so that it would have caught a bug in shortlink...
Matt Amos [Fri, 3 Jul 2009 11:19:23 +0000 (11:19 +0000)]
Fixed short link integration test so that it would have caught a bug in shortlink charset.

11 years agomore strict translations
Štefan Baebler [Fri, 3 Jul 2009 07:54:26 +0000 (07:54 +0000)]
more strict translations

11 years agoadditional translations in geocoder describer
Štefan Baebler [Fri, 3 Jul 2009 06:38:43 +0000 (06:38 +0000)]
additional translations in geocoder describer

11 years agoadded missing =, fixes #1930
Štefan Baebler [Fri, 3 Jul 2009 05:49:14 +0000 (05:49 +0000)]
added missing =, fixes #1930

11 years agoupdated
Štefan Baebler [Fri, 3 Jul 2009 05:16:38 +0000 (05:16 +0000)]
updated

11 years agoChangeset [16271] changed "=" in the shortlink to "-" but didn't
Ævar Arnfjörð Bjarmason [Thu, 2 Jul 2009 21:44:26 +0000 (21:44 +0000)]
Changeset [16271] changed "=" in the shortlink to "-" but didn't
update the routes to match.

Change the regex to accept [=-]* ("=" since we want to be backwards
compatable)

11 years agoCreate separate queues for namefinder and geonames queries.
Tom Hughes [Thu, 2 Jul 2009 16:53:35 +0000 (16:53 +0000)]
Create separate queues for namefinder and geonames queries.

11 years agoMerge some changes from the live server.
Tom Hughes [Thu, 2 Jul 2009 16:49:48 +0000 (16:49 +0000)]
Merge some changes from the live server.

11 years agoChanged shortlink zoom level correction char to '-', as this seems to fare better...
Matt Amos [Thu, 2 Jul 2009 16:40:29 +0000 (16:40 +0000)]
Changed shortlink zoom level correction char to '-', as this seems to fare better with twitter et al.'s URL highlighting. Decoder is backwards-compatible with the old system.

11 years agoRemove byte order marker.
Tom Hughes [Thu, 2 Jul 2009 16:33:56 +0000 (16:33 +0000)]
Remove byte order marker.

11 years agoMake the search box load each set of results separately so that one
Tom Hughes [Thu, 2 Jul 2009 16:12:38 +0000 (16:12 +0000)]
Make the search box load each set of results separately so that one
service being slow doesn't delay the response from others.

11 years agoA little more Yoruba put in its .yml file.
Jenny Herbert [Thu, 2 Jul 2009 15:28:33 +0000 (15:28 +0000)]
A little more Yoruba put in its .yml file.

11 years agoUpdated OpenLayers config for new XYZ based usage.
Tom Hughes [Thu, 2 Jul 2009 10:52:09 +0000 (10:52 +0000)]
Updated OpenLayers config for new XYZ based usage.

11 years agopluralized some phrases
Štefan Baebler [Thu, 2 Jul 2009 05:49:43 +0000 (05:49 +0000)]
pluralized some phrases

11 years agoSome more diacritics
Maarten Deen [Wed, 1 Jul 2009 20:19:55 +0000 (20:19 +0000)]
Some more diacritics

11 years agoUpdated diactirical sign ö
Maarten Deen [Wed, 1 Jul 2009 19:16:51 +0000 (19:16 +0000)]
Updated diactirical sign ö

11 years agoTranslate geocoder.results.namefinder. May be incorrect in the context in which it...
Ævar Arnfjörð Bjarmason [Wed, 1 Jul 2009 18:14:55 +0000 (18:14 +0000)]
Translate geocoder.results.namefinder. May be incorrect in the context in which it is used

11 years agofixed interpolation error introduced in [16237]
Štefan Baebler [Wed, 1 Jul 2009 05:27:51 +0000 (05:27 +0000)]
fixed interpolation error introduced in [16237]

11 years agoFix warnings arising from geocoder translations, and use count magic
Tom Hughes [Tue, 30 Jun 2009 23:45:32 +0000 (23:45 +0000)]
Fix warnings arising from geocoder translations, and use count magic
for the distance translation.

11 years agomade geocoder results translatable. It could probably be improved but am not sure...
Štefan Baebler [Mon, 29 Jun 2009 23:36:57 +0000 (23:36 +0000)]
made geocoder results translatable. It could probably be improved but am not sure how.

11 years agoGo back to using < and > for navigation instead of the nasty looking
Tom Hughes [Mon, 29 Jun 2009 17:11:50 +0000 (17:11 +0000)]
Go back to using < and > for navigation instead of the nasty looking
unicode arrows which aren't at all consistent with the use of | as the
separator.

Also remove some of the translations - there is no reason that I can
see to allow translations to completely change how the navigation control
is laid out.

11 years agoMerge 16110:16216 from trunk.
Tom Hughes [Mon, 29 Jun 2009 16:50:34 +0000 (16:50 +0000)]
Merge 16110:16216 from trunk.

11 years agoAdd B000FTFT (as well as B000FTF) to the list of layers we should
Ævar Arnfjörð Bjarmason [Mon, 29 Jun 2009 09:47:35 +0000 (09:47 +0000)]
Add B000FTFT (as well as B000FTF) to the list of layers we should
ignore when constructing the shortlink.

The shortlink was also broken for the new /?{node,way,relation}=id
construct since the code assumed that all URL parameters that weren't
lat/lon/zoom/layers could be safely ignored. I've added
node/way/relation to that list but for future-proofness it might be
better to simply check if there's anything left in ''args'' that we
don't know how to encode, rather than checking on values we know about
now.

11 years agoI forgot to set fillColor/fillOpacity in commit [16214]. Without it
Ævar Arnfjörð Bjarmason [Mon, 29 Jun 2009 02:17:02 +0000 (02:17 +0000)]
I forgot to set fillColor/fillOpacity in commit [16214]. Without it
any area being rendered by OpenLayers would turn into a black hole
since the default fillOpacity is 100%.

11 years agoThe default OpenLayers.Layer.GML style can be nearly invisible when
Ævar Arnfjörð Bjarmason [Mon, 29 Jun 2009 02:11:34 +0000 (02:11 +0000)]
The default OpenLayers.Layer.GML style can be nearly invisible when
viewed on the main map.

Set a style that's blue (since not a lot of things on the map are
blue), with strokeWidth 3 and opacity 50%. It makes things visible
enough without being too intrusive.

11 years agoUse LoadFile(*DATA) to load the __DATA__ section as YAML
Ævar Arnfjörð Bjarmason [Mon, 29 Jun 2009 01:42:40 +0000 (01:42 +0000)]
Use LoadFile(*DATA) to load the __DATA__ section as YAML

11 years agoAdd entries to is: blacklist
Ævar Arnfjörð Bjarmason [Mon, 29 Jun 2009 01:41:33 +0000 (01:41 +0000)]
Add entries to is: blacklist

11 years agonew german translations
Jonas Krückel [Sun, 28 Jun 2009 21:30:32 +0000 (21:30 +0000)]
new german translations

11 years agouptodate with en.yml 16206
Jonas Krückel [Sun, 28 Jun 2009 21:22:29 +0000 (21:22 +0000)]
uptodate with en.yml 16206

11 years agoupdating with keys from en.yml
Jonas Krückel [Sun, 28 Jun 2009 21:18:35 +0000 (21:18 +0000)]
updating with keys from en.yml

11 years agoMake the printable_name() function call i18n.t to translate its
Ævar Arnfjörð Bjarmason [Sun, 28 Jun 2009 21:13:27 +0000 (21:13 +0000)]
Make the printable_name() function call i18n.t to translate its
output. Makes e.g. "#{name}, v#{object.version.to_s}" which is used in
the changeset browser translatable.

I'm still not happy with how the anchor is constructed. we're linking
from /browse/changeset/1234 to e.g. node "[[366672999, v1]]" even
though the page we're linking to might take us to that node at version
2. The link should be "[[366672999]], v1" instead.

But that's something to solve later.

11 years agoAnother commit in the spirit of [16199]: Don't enforce word order for translations.
Ævar Arnfjörð Bjarmason [Sun, 28 Jun 2009 19:47:57 +0000 (19:47 +0000)]
Another commit in the spirit of [16199]: Don't enforce word order for translations.

11 years agotnx, avar for beating me to it :)
Štefan Baebler [Sun, 28 Jun 2009 19:07:22 +0000 (19:07 +0000)]
tnx, avar for beating me to it :)

11 years agoAdd browse.relation_member.entry to the blacklist
Ævar Arnfjörð Bjarmason [Sun, 28 Jun 2009 18:52:41 +0000 (18:52 +0000)]
Add browse.relation_member.entry to the blacklist

11 years agoTranslated *.map.larger.*
Ævar Arnfjörð Bjarmason [Sun, 28 Jun 2009 18:48:34 +0000 (18:48 +0000)]
Translated *.map.larger.*

11 years agoAdd back ''export.start_rjs.view_larger_map'' which steveb removed in
Ævar Arnfjörð Bjarmason [Sun, 28 Jun 2009 18:40:50 +0000 (18:40 +0000)]
Add back ''export.start_rjs.view_larger_map'' which steveb removed in
[16198] due to my mistake in [16196], which was fixed in [16200].

11 years agoI mistakenly removed ''export.start_rjs.view_larger_map'' from en.yml
Ævar Arnfjörð Bjarmason [Sun, 28 Jun 2009 18:38:01 +0000 (18:38 +0000)]
I mistakenly removed ''export.start_rjs.view_larger_map'' from en.yml
when removing ''browse.map.view_larger_map'' in changeset
[16196]. This broke the HTML feature in the Export dialog
(''translation missing: en, export, start_rjs, view_larger_map'' was
inserted instead)

11 years agoThe relation browser used the translated nominative model names of
Ævar Arnfjörð Bjarmason [Sun, 28 Jun 2009 18:25:21 +0000 (18:25 +0000)]
The relation browser used the translated nominative model names of
Node/Way/Relation in /browse/relation/:id. And used the bad practice
of concating things together to translate them.

Fixed it to use translation variables.

11 years agosynced with en.yml [16196]
Štefan Baebler [Sun, 28 Jun 2009 18:13:01 +0000 (18:13 +0000)]
synced with en.yml [16196]

11 years agolocalized geocoder search results
Štefan Baebler [Sun, 28 Jun 2009 18:00:11 +0000 (18:00 +0000)]
localized geocoder search results