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

2673 commits

Author SHA1 Message Date
Andy Allan
00bd64c7fb Rename message_controller to messages_controller 2018-05-09 16:38:37 +08:00
Tom Hughes
52f0ba78ea Quote translations to stop them looking like numbers 2018-05-07 15:21:50 +01:00
translatewiki.net
7c797157bc Localisation updates from https://translatewiki.net. 2018-05-07 08:07:53 +02:00
translatewiki.net
385ce3304a Localisation updates from https://translatewiki.net. 2018-05-03 09:34:57 +02:00
Tom Hughes
64f3a1a947 Fix translation lookups for roundabout exits 2018-04-30 23:01:08 +01:00
Tom Hughes
91c30d3a8c Avoid using "one" and "two" as translation keys 2018-04-30 22:38:43 +01:00
Tom Hughes
69ff048ae1 Merge remote-tracking branch 'upstream/pull/1802' 2018-04-30 18:56:09 +01:00
translatewiki.net
b10ac932c0 Localisation updates from https://translatewiki.net. 2018-04-30 08:31:00 +02:00
J Guthrie
e833ef6315 Separated ordinal roundabout exit text from normal exit text 2018-04-29 21:59:54 +01:00
J Guthrie
e0b175d3bd Merge branch 'convert_roundabout_exits' of https://github.com/jguthrie100/openstreetmap-website into convert_roundabout_exits 2018-04-29 21:44:26 +01:00
J Guthrie
9efa2c7b92 Change roundabout exit logic and remove blank string from locale file 2018-04-29 20:30:44 +01:00
Jamie Guthrie
76bc5eba06
Merge branch 'master' into convert_roundabout_exits 2018-04-29 19:53:57 +01:00
Tom Hughes
8bd001f128 Merge remote-tracking branch 'upstream/pull/1809' 2018-04-29 19:37:50 +01:00
translatewiki.net
76d51a2a36 Localisation updates from https://translatewiki.net. 2018-04-26 08:05:31 +02:00
J Guthrie
e4c37036db Removed directions from roundabout exit instructions 2018-04-26 00:51:35 +01:00
J Guthrie
4330dcdf94 Added exit counts as seperate keys in locale file 2018-04-26 00:43:01 +01:00
Tom Hughes
b15a8c73d9 Merge remote-tracking branch 'upstream/pull/1839' 2018-04-25 17:39:27 +01:00
Tom Hughes
00425c8fca Merge remote-tracking branch 'upstream/pull/1838' 2018-04-25 17:38:35 +01:00
Tom Hughes
aebfbdcfbd Merge remote-tracking branch 'upstream/pull/1837' 2018-04-25 17:38:19 +01:00
Tom Hughes
0d7c9a187e Merge remote-tracking branch 'upstream/pull/1836' 2018-04-25 17:37:55 +01:00
Andy Allan
af4003e2ee Lazy translation lookups and key renames for help page. 2018-04-25 17:09:29 +08:00
Andy Allan
7d0a94552c Lazy translation lookup and key renames for fixthemap page. 2018-04-25 17:09:29 +08:00
Andy Allan
fb16b5ed14 Use lazy lookups and rename translation keys for export 2018-04-25 17:09:29 +08:00
Andy Allan
c7e514a56b Use lazy lookups and rename keys for the copyright page 2018-04-25 16:33:34 +08:00
Andy Allan
ab79d8c520 Use lazy lookups and rename keys for the welcome page. 2018-04-25 16:33:34 +08:00
Andy Allan
246596225e Use lazy lookups and rename keys for the about page. 2018-04-25 16:19:46 +08:00
Andy Allan
8445561fcc Use lazy translation lookups for the oauth controller. 2018-04-25 15:42:34 +08:00
Andy Allan
dfa2fd7d3d Rename note to notes in i18n lookups 
Enables lazy translation lookups for most cases. Additionally, rename
keys for notes.description.* to notes.comment.* to match partial
name.
 2018-04-25 14:56:20 +08:00
Andy Allan
2c7bc36493 Use lazy translation lookups for redactions 
Requires renaming the translation keys
 2018-04-25 14:39:37 +08:00
Andy Allan
a0de9b780d Use lazy lookups for user_blocks translations 2018-04-25 12:03:58 +08:00
translatewiki.net
3034556c82 Localisation updates from https://translatewiki.net. 2018-04-23 09:02:42 +02:00
translatewiki.net
9a14456d30 Localisation updates from https://translatewiki.net. 2018-04-19 09:31:16 +02:00
Tom Hughes
9ced230fe1 Merge remote-tracking branch 'upstream/pull/1827' 2018-04-18 20:21:52 +01:00
Tom Hughes
9d739b3d5b Merge remote-tracking branch 'upstream/pull/1826' 2018-04-18 18:38:50 +01:00
Tom Hughes
9b82e13d17 Improve formatting 2018-04-18 18:37:18 +01:00
Tom Hughes
7a64ebe982 Merge remote-tracking branch 'upstream/pull/1824' 2018-04-18 18:36:22 +01:00
Andy Allan
736ff9b1a0 Use lazy translation lookups for the user_blocks partials. 2018-04-18 14:20:41 +08:00
Andy Allan
9408ed6946 Pluralise user_preferences_controller 
This is the rails convention for controllers and can make route
generation easier.

http://guides.rubyonrails.org/action_controller_overview.html#controller-naming-convention
 2018-04-18 11:26:00 +08:00
Andy Allan
17c706291c Move the default_url_options config to the action_mailer initializer 
We can't use Rails.application.config here because the initializers
run after ActionMailer::Base has been set up.
 2018-04-18 10:53:22 +08:00
Tom Hughes
3da01218b3 Allow trusted addresses for better_errors to be set in the environment 2018-04-15 22:22:43 +01:00
Tom Hughes
c174845258 Merge remote-tracking branch 'upstream/pull/1816' 2018-04-15 19:55:03 +01:00
translatewiki.net
50aadfc6cd Localisation updates from https://translatewiki.net. 2018-04-12 19:26:02 +02:00
translatewiki.net
34f10464e8 Localisation updates from https://translatewiki.net. 2018-04-12 15:33:08 +02:00
translatewiki.net
bfe5b1ac77 Localisation updates from https://translatewiki.net. 2018-04-12 09:24:37 +02:00
Andy Allan
713de1fadb Set default_url_options for action_mailer 
This saves having to repeat the same host and protocol options
throughout the notifiers
 2018-04-11 15:53:30 +08:00
Andy Allan
0a86a1ea8d Fix handling of title when replying to diary entries 2018-04-11 14:03:17 +08:00
translatewiki.net
fc90b73581 Localisation updates from https://translatewiki.net. 2018-04-09 08:27:07 +02:00
Tom Hughes
adbd737a0c Ask for confirmation before deleting a trace 
Fixes #1812
 2018-04-05 21:16:28 +01:00
translatewiki.net
259f9650cb Localisation updates from https://translatewiki.net. 2018-04-05 09:31:53 +02:00
J Guthrie
d0c5871858 Reworded roundabout exit text 2018-04-02 23:20:31 +01:00