]>
git.openstreetmap.org Git - rails.git/log
Æ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.
Æ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%.
Æ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.
Æ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
Ævar Arnfjörð Bjarmason [Mon, 29 Jun 2009 01:41:33 +0000 (01:41 +0000)]
Add entries to is: blacklist
Frederik Ramm [Sun, 28 Jun 2009 23:04:52 +0000 (23:04 +0000)]
german translations for oauth stuff
Jonas Krückel [Sun, 28 Jun 2009 21:30:32 +0000 (21:30 +0000)]
new german translations
Jonas Krückel [Sun, 28 Jun 2009 21:22:29 +0000 (21:22 +0000)]
uptodate with en.yml 16206
Jonas Krückel [Sun, 28 Jun 2009 21:18:35 +0000 (21:18 +0000)]
updating with keys from en.yml
Æ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.
Æ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.
Štefan Baebler [Sun, 28 Jun 2009 19:07:22 +0000 (19:07 +0000)]
tnx, avar for beating me to it :)
Ævar Arnfjörð Bjarmason [Sun, 28 Jun 2009 18:52:41 +0000 (18:52 +0000)]
Add browse.relation_member.entry to the blacklist
Ævar Arnfjörð Bjarmason [Sun, 28 Jun 2009 18:48:34 +0000 (18:48 +0000)]
Translated *.map.larger.*
Æ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].
Æ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)
Æ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.
Štefan Baebler [Sun, 28 Jun 2009 18:13:01 +0000 (18:13 +0000)]
synced with en.yml [16196]
Štefan Baebler [Sun, 28 Jun 2009 18:00:11 +0000 (18:00 +0000)]
localized geocoder search results
Ævar Arnfjörð Bjarmason [Sun, 28 Jun 2009 17:33:40 +0000 (17:33 +0000)]
Delete browse.map.view_larger_map from a bunch of translations. It has kind-of been replaced by browse.map.larger.area but the translation isn't the same so I can't move them over
Ævar Arnfjörð Bjarmason [Sun, 28 Jun 2009 17:23:01 +0000 (17:23 +0000)]
s/klukkan//
Štefan Baebler [Sun, 28 Jun 2009 13:21:24 +0000 (13:21 +0000)]
made relation_members.member_type translatable via model translations
Tom Hughes [Sat, 27 Jun 2009 17:11:54 +0000 (17:11 +0000)]
Tidy up some recent commits:
- Simplify shortlinkPrefix by removing redundant code.
- Factor out duplicate code for displaying objects on maps.
- Reindent some stuff to make it more readable.
Ævar Arnfjörð Bjarmason [Sat, 27 Jun 2009 16:11:21 +0000 (16:11 +0000)]
Make ?{node,way,relation}=id GET argumens work for the shortlink as
well as the permalink.
Ævar Arnfjörð Bjarmason [Sat, 27 Jun 2009 16:07:53 +0000 (16:07 +0000)]
Only hardcode http://osm.org/ in shortlinks when we're at
openstreetmap.org (according to window.location.hostname).
Solves ticket:1994 and my headaches when trying to hack railsport
locally.
Ævar Arnfjörð Bjarmason [Sat, 27 Jun 2009 15:34:26 +0000 (15:34 +0000)]
Change the feature commited in [16174] to use the main map view
instead of being located at /map.
Ævar Arnfjörð Bjarmason [Sat, 27 Jun 2009 09:30:10 +0000 (09:30 +0000)]
Introducing a new /browse/{node,way,relation,changeset}/{id}/map page
which is slippy map covering the screen showing the map data that is
in the small map at /browse/{node,way,relation,changeset}/{id}.
/browse/{node,way,relation,changeset}/{id} now contains a link to both
"View Larger Map" which has been changed to link to this new map
feature, and "View on main map" which as before links to the area
showing the feature on the main slippy map.
/browse/{node,way,relation,changeset}/{id}/map supports permalinks
using its own hacked version of updateLocation() (which doesn't set a
cookie), but shortlinks are not supported. The Edit/History/Export
links link back to the main map.
Štefan Baebler [Sat, 27 Jun 2009 09:12:59 +0000 (09:12 +0000)]
synced
Thomas Wood [Fri, 26 Jun 2009 22:59:51 +0000 (22:59 +0000)]
Fix the nonames layer URLs, as missed in the changes to OpenStreetMap.js earlier. (Due to move from our own OSM class to the OL provided one which relies on XYZ)
Ulf [Fri, 26 Jun 2009 22:17:36 +0000 (22:17 +0000)]
Mediawiki deutsch
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 21:04:36 +0000 (21:04 +0000)]
When I navigate to /browse/{node,way,relation}/:id/history there's no
link that will take me back to /browse/{node,way,relation}/:id
So I'm adding it.
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 21:01:15 +0000 (21:01 +0000)]
"Node history: {{node_name}}" was untranslatable!
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 20:58:32 +0000 (20:58 +0000)]
Show "Vegur" in <title> not "Veginum" in /browse/way/:id
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 18:51:50 +0000 (18:51 +0000)]
Only report something in --untranslated-values if it exists in the
target translation. Users should use --keys to check what doesn't
exist in the target.
Add a blacklist for Icelandic at the end of the file.
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 18:47:43 +0000 (18:47 +0000)]
Translated activerecord.*. I have never seen most of this in any
context whatsoever so this translation probably sucks.
is.yml is now 100% translated.
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 18:32:38 +0000 (18:32 +0000)]
Use the .to_sentence feature for the English map key. The entries will come out as e.g. 'Light rail and tram' instead of 'Light rail; tram'. If you hate this then just revert it
Štefan Baebler [Fri, 26 Jun 2009 18:24:55 +0000 (18:24 +0000)]
additional translations
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 18:24:44 +0000 (18:24 +0000)]
Translate all the map key, this (ab)uses the new .to_sentence feature of the map key
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 18:23:06 +0000 (18:23 +0000)]
Call .to_sentence on site.key.table.entry. Translations are free to take advantage of this or ignore it completely
Štefan Baebler [Fri, 26 Jun 2009 17:51:23 +0000 (17:51 +0000)]
translated additional map key entries
Štefan Baebler [Fri, 26 Jun 2009 16:30:59 +0000 (16:30 +0000)]
translated remaining missing phrases
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 15:41:33 +0000 (15:41 +0000)]
notifier.gpx_notification translated. Not used by the current GPX daemon yet
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 15:34:43 +0000 (15:34 +0000)]
* Translated site.edit.*
* Changed all links pointing to the wiki to use &uselang=is
Štefan Baebler [Fri, 26 Jun 2009 15:26:43 +0000 (15:26 +0000)]
synced with en.yml [16143]
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 15:06:34 +0000 (15:06 +0000)]
Changed link from [[Disabled anonymous edits]] to [[Anonymous edits]]. It was moved on the wiki
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 14:57:08 +0000 (14:57 +0000)]
Translate everything that's not ^(active|site|notifier.gpx_)
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 14:40:46 +0000 (14:40 +0000)]
Translate view_larger_map
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 14:37:44 +0000 (14:37 +0000)]
Translated signup-confirm
Thomas Wood [Fri, 26 Jun 2009 14:27:45 +0000 (14:27 +0000)]
Fix indentation.
Štefan Baebler [Fri, 26 Jun 2009 14:25:57 +0000 (14:25 +0000)]
added colon for consistency with other fields
Thomas Wood [Fri, 26 Jun 2009 14:25:29 +0000 (14:25 +0000)]
Only try to load the map if changeset or feature not deleted.
Tom Hughes [Fri, 26 Jun 2009 13:08:36 +0000 (13:08 +0000)]
Remove asset tag monkey patch as it is no longer having any effect
due to rails changes.
Sebastian Spaeth [Fri, 26 Jun 2009 13:07:02 +0000 (13:07 +0000)]
add osmarender key stub, which will need to be completed
Tom Hughes [Fri, 26 Jun 2009 11:27:56 +0000 (11:27 +0000)]
Switch to using the new XYZ layer class on OL 2.8.
Tom Hughes [Fri, 26 Jun 2009 11:19:21 +0000 (11:19 +0000)]
Rebuild OpenLayers with fixed ca.js translation.
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 11:09:33 +0000 (11:09 +0000)]
translate list.tagged_with which is used in <title> at e.g. http://www.openstreetmap.org/traces/tag/Akranes
Shaun McDonald [Fri, 26 Jun 2009 11:02:00 +0000 (11:02 +0000)]
Hard code osm.org into the shortcode permalink.
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 10:55:39 +0000 (10:55 +0000)]
* Add map key table, still untranslated
* Remove OAuth-related translations
* Remove editing_trace. Not used anymore
Ævar Arnfjörð Bjarmason [Fri, 26 Jun 2009 10:48:30 +0000 (10:48 +0000)]
Update synopsis to include --untranslated-values
Matt Amos [Thu, 25 Jun 2009 23:31:53 +0000 (23:31 +0000)]
Adding 'shortlink' functions which will allow URLs like http://osm.org/go/XXXX suitable for use in twitter, etc...
Štefan Baebler [Thu, 25 Jun 2009 18:13:09 +0000 (18:13 +0000)]
typo
Tom Hughes [Thu, 25 Jun 2009 16:45:56 +0000 (16:45 +0000)]
Fixup tests for changes in view templates.
Tom Hughes [Thu, 25 Jun 2009 16:45:26 +0000 (16:45 +0000)]
Merge 16070:16110 from trunk.
Tom Hughes [Thu, 25 Jun 2009 16:39:16 +0000 (16:39 +0000)]
Take a copy of r16069 from the trunk to create an oauth branch.
Tom Hughes [Thu, 25 Jun 2009 16:32:05 +0000 (16:32 +0000)]
Merge 16012:16110 from trunk.
Ævar Arnfjörð Bjarmason [Thu, 25 Jun 2009 12:48:40 +0000 (12:48 +0000)]
Add a --validate-variables option to check that interpolated Ruby i18n
variables (C<{{foo}}> and C<[[foo]]>) are equivalent in the two
provided files.
Depend on 5.10 because I'm lazy and want to use smart-matching
Tom Hughes [Thu, 25 Jun 2009 12:35:59 +0000 (12:35 +0000)]
Fix some interpolation variables.
Tom Hughes [Thu, 25 Jun 2009 11:56:25 +0000 (11:56 +0000)]
Correct some interpolation names.
Ævar Arnfjörð Bjarmason [Thu, 25 Jun 2009 10:43:42 +0000 (10:43 +0000)]
Lakes are already visible on zoom 7, not 8
Tom Hughes [Wed, 24 Jun 2009 23:40:31 +0000 (23:40 +0000)]
Update to 2.8 release of OpenLayers.
Tom Hughes [Wed, 24 Jun 2009 23:39:46 +0000 (23:39 +0000)]
Add some more languages to the OpenLayers build.
Tom Hughes [Wed, 24 Jun 2009 23:39:25 +0000 (23:39 +0000)]
Add new route for AJAX call to get map key.
Tom Hughes [Wed, 24 Jun 2009 23:30:41 +0000 (23:30 +0000)]
Rework the translatable map key to be driven by a YAML file listing the
entries to show for each layer and zoom level.
Tom Hughes [Wed, 24 Jun 2009 11:50:41 +0000 (11:50 +0000)]
Make the "what does this mean" link added in r16069 more like similar
notes on other forms.
Tom Hughes [Wed, 24 Jun 2009 11:41:26 +0000 (11:41 +0000)]
Put back HTML escaping of trace names removed in r16062.
Thomas Wood [Wed, 24 Jun 2009 09:03:51 +0000 (09:03 +0000)]
Fix adding marker on Embeddable HTML export by compiling in the OpenLayers.Handler.Point class that was missed in r15615
Ævar Arnfjörð Bjarmason [Wed, 24 Jun 2009 07:15:18 +0000 (07:15 +0000)]
Remove the third param to showKeyEntry(). Not used yet.
Jonas Krückel [Tue, 23 Jun 2009 14:58:52 +0000 (14:58 +0000)]
removed anon_edits link from the de blacklist
Jonas Krückel [Tue, 23 Jun 2009 14:54:26 +0000 (14:54 +0000)]
removed urls (they need to point to a translated version (maybe still to be done) too)
added new string
Jonas Krückel [Tue, 23 Jun 2009 14:53:38 +0000 (14:53 +0000)]
more translations
Jonas Krückel [Tue, 23 Jun 2009 14:41:41 +0000 (14:41 +0000)]
uptodate with en.yml 16073
Ævar Arnfjörð Bjarmason [Tue, 23 Jun 2009 12:47:40 +0000 (12:47 +0000)]
no_auto_account_create translated
Ævar Arnfjörð Bjarmason [Tue, 23 Jun 2009 12:20:32 +0000 (12:20 +0000)]
Add zie Deutsches versionen of zie table introduzed in Changeset 16073
Ævar Arnfjörð Bjarmason [Tue, 23 Jun 2009 12:04:06 +0000 (12:04 +0000)]
Change the map key from a static PNG image to a generated HTML table that can be translated. Solves ticket:1916
Tom Hughes [Tue, 23 Jun 2009 02:48:38 +0000 (02:48 +0000)]
Revert r16046.
DO NOT COMMIT MAJOR ENHANCEMENTS TO TRUNK WITHOUT TALKING TO ME FIRST.
Ævar Arnfjörð Bjarmason [Tue, 23 Jun 2009 01:27:40 +0000 (01:27 +0000)]
Add a link to [[Visibility of GPS traces]] on the wiki to explain what public/private means. Solves ticket:1002
Ævar Arnfjörð Bjarmason [Tue, 23 Jun 2009 00:19:41 +0000 (00:19 +0000)]
Translate diary_entry.no_such_entry.title/heading/body
Ævar Arnfjörð Bjarmason [Tue, 23 Jun 2009 00:17:20 +0000 (00:17 +0000)]
Add 'diary_entry.no_such_entry.title' for diary entries that don't exist
Ævar Arnfjörð Bjarmason [Tue, 23 Jun 2009 00:08:34 +0000 (00:08 +0000)]
Translated "None"
Ævar Arnfjörð Bjarmason [Tue, 23 Jun 2009 00:02:35 +0000 (00:02 +0000)]
'trace.tags.none' was never displayed because the empty list ([]) is true in ruby. Use trace.tags.empty?
Wrap 'trace.tags.none' in <i> to make it obvious that "none" is a system-generated value
Ævar Arnfjörð Bjarmason [Mon, 22 Jun 2009 23:52:28 +0000 (23:52 +0000)]
* GPX view/edit translations
* "$time ago" translated
* Merged OAuth messages from en.yml
Ævar Arnfjörð Bjarmason [Mon, 22 Jun 2009 23:47:49 +0000 (23:47 +0000)]
* Changed "t'trace.edit.start_coord' %>Start coordinate:" to "t'trace.edit.start_coord' %>"
* "map" was untranslatable
Ævar Arnfjörð Bjarmason [Mon, 22 Jun 2009 23:43:53 +0000 (23:43 +0000)]
Fixed up the <title>/<h2> mess in trace/edit and trace/view
* @title was never set on trace editing, and thus <h2></h2> was produced
* Changed split 'trace.view.viewing_trace' into 'trace.view.title' and 'trace.view.heading'
* Introduced corresponding 'trace.edit.title' and 'trace.edit.heading'
Ævar Arnfjörð Bjarmason [Mon, 22 Jun 2009 23:27:11 +0000 (23:27 +0000)]
"download" in edit trace was untranslatable
Ævar Arnfjörð Bjarmason [Mon, 22 Jun 2009 23:20:53 +0000 (23:20 +0000)]
trace.edit.tags and trace.edit.save_button were mistakenly in the locale files but not actually used. fixed this
Ævar Arnfjörð Bjarmason [Mon, 22 Jun 2009 23:10:32 +0000 (23:10 +0000)]
translated trace_uploaded
Ævar Arnfjörð Bjarmason [Mon, 22 Jun 2009 20:33:14 +0000 (20:33 +0000)]
* Put checkboxes before form labels in an attempt to make them align with the text.
* Put a <br/> between the form and the submit button so they're not squashed together
Ævar Arnfjörð Bjarmason [Mon, 22 Jun 2009 19:30:21 +0000 (19:30 +0000)]
Add word connectors to is.yml, still needs upstream merge
Jonas Krückel [Mon, 22 Jun 2009 19:28:29 +0000 (19:28 +0000)]
removed license_url from blacklist
added de blacklist
Ævar Arnfjörð Bjarmason [Mon, 22 Jun 2009 19:14:26 +0000 (19:14 +0000)]
Translate "Send message" in /messag/new/$user