cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3143 commits 4 branches 1 tag 499 MiB
Commit graph

3143 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ævar Arnfjörð Bjarmason
b0e1560875 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.
 2009-10-02 20:19:28 +00:00
Matt Amos
17f05fdb13 Merging 17905:17944 from trunk. 2009-10-02 15:36:46 +00:00
Tom Hughes
d0f2288797 Add parentheses to avoid warnings. 2009-10-02 14:40:25 +00:00
Ævar Arnfjörð Bjarmason
8c1d3fdd6b 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
 2009-10-02 13:04:47 +00:00
Tom Hughes
968e6c417f Replace the donate button with a text version that can be translated. 2009-10-02 12:29:44 +00:00
Translatewiki
9c5755b647 Localisation updates from translatewiki.net (2009-10-02) 2009-10-02 11:28:35 +00:00
Translatewiki
3d4adecbc6 * Remove trailing newline from help_html 
* Update message order
 2009-10-02 11:20:57 +00:00
Matt Amos
3429f016c2 Adding blocking to user auth bits of amf_controller. Or, at least, the bits I could find. 2009-10-02 10:49:03 +00:00
Matt Amos
1009788043 Fix wrong comment. 2009-10-02 10:46:19 +00:00
Ævar Arnfjörð Bjarmason
2dab83d57b use {{count}} instead of {{sent_count}} so rails plural forms will kick in 2009-10-02 10:41:47 +00:00
Richard Fairhurst
817aee0536 fix GPS offset 2009-10-02 07:05:05 +00:00
Tom Hughes
a549d33fdf Add "blocks on" and "blocks by" links to the user page when a logged 
in user is looking at their own page.
 2009-10-01 21:30:45 +00:00
Tom Hughes
a6952b38a0 Swap two translations so they are the right way round. 2009-10-01 21:13:13 +00:00
Tom Hughes
5a2ad3655b Replace a couple calls to inject with more readble constructs. 2009-10-01 20:39:04 +00:00
Ævar Arnfjörð Bjarmason
efc2a3fa47 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
 2009-10-01 20:29:17 +00:00
Tom Hughes
8217c55523 Correct comment. 2009-10-01 20:24:53 +00:00
Ævar Arnfjörð Bjarmason
df4267639d * The Back link in block/id/edit wasn't translatable 
* New text for back links to make them more understandable
 2009-10-01 20:24:36 +00:00
Tom Hughes
54649a39a0 Correct comment. 2009-10-01 20:22:52 +00:00
Ævar Arnfjörð Bjarmason
7dbf68aa52 * <title> for /blocks/new/* 
* use h() to escape usernames
 2009-10-01 20:18:24 +00:00
Ævar Arnfjörð Bjarmason
269ad0f52e Add a route for '/blocks/new/:display_name' so links will be 
'/blocks/new/Example' not '/blocks/new?display_name=Example'
 2009-10-01 20:08:13 +00:00
Tom Hughes
4708992f1c 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.
 2009-10-01 20:04:33 +00:00
Ævar Arnfjörð Bjarmason
78e0ec74f7 use h() to avoid XSS in usernames 2009-10-01 20:02:54 +00:00
Ævar Arnfjörð Bjarmason
e0ece00738 title/links for revoke page 2009-10-01 19:59:02 +00:00
Ævar Arnfjörð Bjarmason
2ea77833cd Oops. Mixed up heading/title 2009-10-01 19:55:25 +00:00
Ævar Arnfjörð Bjarmason
1cea0df3d8 title/heading & XSS fix for /edit 2009-10-01 19:45:36 +00:00
Ævar Arnfjörð Bjarmason
c6f844603d Add <title> to /blocks and don't Camel Case headings 2009-10-01 19:27:15 +00:00
Ævar Arnfjörð Bjarmason
1a2ccfbb8f Set title on /blocks/:id and link to usernames 2009-10-01 19:18:23 +00:00
Ævar Arnfjörð Bjarmason
e465decb97 Back -> View all blocks 2009-10-01 19:10:31 +00:00
Ævar Arnfjörð Bjarmason
8d6d7b51e8 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.
 2009-10-01 19:04:38 +00:00
Ævar Arnfjörð Bjarmason
268a2cd474 * use h() on username to avoid XSS 
* Link to username in <h1>
 * Set <title> on /blocks and /blocks_by
 2009-10-01 18:49:38 +00:00
Ævar Arnfjörð Bjarmason
4f92ce1243 More specific alt/title text 2009-10-01 18:42:45 +00:00
Matt Amos
9b82acded9 Adding title for role icons when viewing user isn't an admin, re-adding translations for those. 2009-10-01 18:09:31 +00:00
Ævar Arnfjörð Bjarmason
8a7040e155 Set title/h1 to something sensible when granting/revoking roles 2009-10-01 18:02:08 +00:00
Ævar Arnfjörð Bjarmason
1d59359202 Add title="" to the revoke/grant icons that indicate what they're about to do 2009-10-01 17:57:20 +00:00
Matt Amos
59102ea017 Merging 17846:17904 from trunk. 2009-10-01 17:23:01 +00:00
Matt Amos
1e3b3c1f10 Refactored user_role and controller. Now much more DRY. 2009-10-01 17:15:34 +00:00
Ævar Arnfjörð Bjarmason
1db1f04974 Synced from Translatewiki 2009-10-01 16:48:31 +00:00
Richard Fairhurst
ef7825ce0c compile avar's latest commit 2009-10-01 16:01:12 +00:00
Translatewiki
1812b01564 * Localisation updates from translatewiki.net (2009-10-01) 
* svn:eol-style native
 2009-10-01 13:42:46 +00:00
Ævar Arnfjörð Bjarmason
a0905290b7 Translatewiki URLs changed. Adjust script to match 2009-10-01 13:41:51 +00:00
Ævar Arnfjörð Bjarmason
f80d250d77 RichardF forgot to nuke cz.yml in [17664]. Nuking 2009-10-01 13:18:45 +00:00
Richard Fairhurst
d7de7a8567 Potlatch 1.2c 2009-10-01 11:04:00 +00:00
Ævar Arnfjörð Bjarmason
03fd04be95 The 'more' message used in the history dialog (history.as) was missing 2009-10-01 10:59:43 +00:00
Ævar Arnfjörð Bjarmason
5f7586fb0a 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.
 2009-10-01 10:39:31 +00:00
Ævar Arnfjörð Bjarmason
7ac795ff54 Fixed message key that was broken due to a broken regex I used during 
importing. It had AS message params mixed up with it.
 2009-10-01 10:21:12 +00:00
Richard Fairhurst
495b8e2cb6 show buildings in pink 2009-09-30 23:54:25 +00:00
Tom Hughes
c192b95021 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.
 2009-09-30 23:47:26 +00:00
Tom Hughes
744b2e8676 Import extra rails translations from http://github.com/svenfuchs/rails-i18n. 2009-09-30 23:26:47 +00:00
Ævar Arnfjörð Bjarmason
95c8b2a01d comment out dupe purging debug message 2009-09-30 17:43:17 +00:00
Ævar Arnfjörð Bjarmason
b2a1abf6e9 compile error in previous commit 2009-09-30 17:43:02 +00:00