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

2656 commits

Author SHA1 Message Date
translatewiki.net
76d51a2a36 Localisation updates from https://translatewiki.net. 2018-04-26 08:05:31 +02: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
Tom Hughes
10c3230e27 Merge remote-tracking branch 'upstream/pull/1801' 2018-04-02 15:25:17 +01:00
J Guthrie
6f74ae3429 Added missing onramp instructions to locale file 2018-03-31 16:31:35 +01:00
J Guthrie
becccea034 Remove/replace redundant no_place locale translation 2018-03-29 22:27:33 +01:00
J Guthrie
1bb52e3cb6 Unlocateable place now highlighted in red and specified in error message 
The textbox containing the unlocateable place gets highlighted in red
Also added a new locale value to specify an error for a specific place
 2018-03-29 21:02:42 +01:00
Tom Hughes
37f404252c Merge remote-tracking branch 'upstream/pull/1796' 2018-03-29 08:35:03 +01:00
translatewiki.net
0273b00baf Localisation updates from https://translatewiki.net. 2018-03-29 09:16:45 +02:00
Tom Hughes
357de642b3 Merge remote-tracking branch 'upstream/pull/1799' 2018-03-28 17:38:34 +01:00
Tom Hughes
be35d4ab9c Merge remote-tracking branch 'upstream/pull/1797' 2018-03-28 17:33:01 +01:00
Andy Allan
e3c8a57184 Strip trailing whitespace from multiline html translations 2018-03-28 17:16:17 +08:00
Andy Allan
3b75e92415 Be more consistent with 'my' vs 'your' for objects that belong to 
the user
 2018-03-28 17:07:50 +08:00
Andy Allan
9c3aae76e3 Move the api routes into the api/0.6 scope 2018-03-28 15:38:10 +08:00
Andy Allan
87d1a5bc93 Remove unnecessary route aliases 
These simply duplicate the aliases that are set by default.
 2018-03-28 15:29:24 +08:00
Andy Allan
ba543340b1 Use concise route definitions for single method routes 2018-03-28 15:03:32 +08:00
Andy Allan
2852ac3e4a Disable image_optim workers in tests 
They aren't needed for anything related to testing, and the warnings
about missing binaries adds noise to the test output.
 2018-03-28 13:52:51 +08:00
Andy Allan
a48633446b Remove image_optim config loading override 
image_optim_rails loads the config files by default, and has a
built-in mechanism for per-environment configs. Forcing the config
loading in this way is unnecessary.
 2018-03-28 13:52:31 +08:00
Tom Hughes
1f2ac59d1d Fix new rubocop warnings 2018-03-26 19:00:03 +01:00