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

2907 commits

Author SHA1 Message Date
Andy Allan
d58cae6ff6 Avoid using the zero key for pluralisation in English 
This makes it impossible to translate to other languages that use the
`zero:` key, e.g. for other numbers that end in zero.

An alternative approach would be possible in future, when ruby-i18n
and rails and translatewiki all have full support for `0:` and `1:` keys.

Fixes #3997
 2023-07-05 14:47:39 +01:00
Andy Allan
e9e4b10473
Merge pull request #3907 from Dimitar5555/patch-1 
Facelift `offline.html` and use Bootstrap classes for "notifications" under the search bar
 2023-06-14 14:08:38 +01:00
Branko Kokanovic
e66e2c1b16 Fix ERB Lint for copyright 2023-06-12 10:40:45 +02:00
Branko Kokanovic
8d7fca30de Adding information about Serbia sources 2023-06-08 22:15:13 +02:00
Andy Allan
aebac722c2 Rework geocoder titles to avoid raw html in translations 2023-04-02 10:14:00 +01:00
Andy Allan
63484a169a Rework the help text to avoid raw html in translations 
Unfortunately bootstrap_form has no method for passing interpolation
values to the automatic help text system, so instead we'll use an
explicit override.
 2023-04-02 10:14:00 +01:00
Andy Allan
7751f7a04b Avoid raw html in translations for the note icon 2023-04-02 10:14:00 +01:00
Andy Allan
4ac0c9c1e8 Rework browse pages to avoid raw html in translations 2023-03-29 18:52:45 +01:00
Andy Allan
a859fe1acf Avoid raw html in translations for changeset comments 2023-03-29 18:52:45 +01:00
Andy Allan
dff0c82f17 Avoid using raw html in translations for the issues index 2023-03-29 18:52:45 +01:00
Andy Allan
92e3e425f1 Avoid using raw html in translations on the about page 2023-03-29 18:52:45 +01:00
Dimitar
318064b2a7 Facelift offline.html and use Bootstrap classes for "notifications" 
Update site_controller_test.rb

Update site_controller_test.rb

Remove whitespace

Reset Settings.status after test is done

Update test for offline page

Update site_controller.rb

Fix indentation

Update offline controller

Update offline.html.erb

Remove flash CSS classes and fix missed tests

Updated tests

Address most PR comments

Update _flash.html.erb

Update _flash.html.erb

Update edit.html.erb

Update offline.html.erb
 2023-03-26 13:57:51 +03:00
Andy Allan
071f2798d4 Avoid using raw html in credit translations 2023-03-22 14:40:55 +00:00
Andy Allan
77e6bb8577 Avoid using raw html in translations on the copyright page 2023-03-22 14:40:55 +00:00
Tom Hughes
a7051e924f Merge remote-tracking branch 'upstream/pull/3982' 2023-03-22 11:00:09 +00:00
Tom Hughes
425d568037 Merge remote-tracking branch 'upstream/pull/3981' 2023-03-22 10:52:02 +00:00
Andy Allan
3ec310b0c8 Fix indentation 2023-03-22 10:37:20 +00:00
Andy Allan
d41d52877e Use with_locale for the copyright page 
This avoids having to override the locale on each and every translation
 2023-03-22 10:37:20 +00:00
Andy Allan
a91afa0e78 Use .with_locale for about page 
This simplifies the code, since we can avoid having to specify the
locale for every translation.

The test was added since I originally developed another approach,
but that caused exceptions on invalid locales.
 2023-03-22 10:13:01 +00:00
Andy Allan
473d425c10 Remove the language block from around the original guidance 
The guidance is shown in the user's own language, not in english.
 2023-03-22 09:55:41 +00:00
Andy Allan
1d5ba57c49 Remove the language block from around the guidance 
This was unnecessary and also incorrect. The guidance is shown in the users
own language, not in the @locale of the copyright statement, and so
doesn't need any language wrapping and certainly not stating that it's in
the @locale.
 2023-03-22 09:55:41 +00:00
Tom Hughes
b5cc4449a6 Include count in messages for the "one" plural category 2023-03-15 21:01:32 +00:00
Wille Marcel
525c041743
Add space between form and Publish diary button 2023-03-10 15:16:44 -03:00
Tom Hughes
e2e79ba549 Drop legacy forums from help page 2023-03-08 17:40:34 +00:00
Andy Allan
59ed461a5d Rework confirmations page to avoid raw html in translations 2023-03-08 16:09:27 +00:00
Andy Allan
2771921cb1 Rework shared kramdown instructions to avoid html in translations 2023-03-08 16:09:27 +00:00
Andy Allan
235618b9c0 Remove html from translations for terms page 2023-03-08 16:09:27 +00:00
Andy Allan
8a8935c8b6 Remove remaining html in translations from fixthemap page 2023-03-08 16:09:27 +00:00
Andy Allan
e6395508c4 Refactor communities page to avoid html in translations 2023-03-08 16:09:27 +00:00
Andy Allan
9c8bb75b9d Refactor potlatch page to avoid html in translations 2023-03-08 16:09:27 +00:00
Andy Allan
8df3c7b12a Rework about page to avoid html in the translations 2023-02-22 10:25:51 +00:00
Andy Allan
9101705656 Remove html from translations for the welcome page 
This also refactors the "any questions" section, which is shared with the fixthemap page.
 2023-02-22 10:25:51 +00:00
Andy Allan
10e035df93 Refactor trace guidance to avoid raw html in translations 
Also rearrange to avoid multiple sentences in a heading.
 2023-02-22 09:16:17 +00:00
Andy Allan
317b1871f4 Refactor translation to avoid raw html tags 2023-02-22 09:16:17 +00:00
Andy Allan
e11c70f751 Move public editing content into its own partial 
This makes the editing page easier to read, and simplifies the i18n
in the public editing section.
 2023-02-22 09:16:17 +00:00
Andy Allan
c7e9888bb6 Refactor public editing note to avoid raw html in the translations 2023-02-22 09:16:17 +00:00
Andy Allan
c276625e7f Refactor to use submit_tag helper 
This is more readable than interpolating into element attributes
 2023-02-01 17:24:48 +00:00
Andy Allan
a88da1d71a Refactor translation strings for notes 
These aren't used by any javascript code, so don't need to be in
the `javascripts` key.
 2023-02-01 17:24:48 +00:00
Andy Allan
9bb8dd739a Use data attributes to pass alternative button labels 
This allows the text to be defined in the html partials, instead
of looking up the i18n via javascript.
 2023-02-01 17:24:47 +00:00
Andy Allan
9748ce301c Move browse#note to notes#show 
This allows a more resourceful routing approach.
 2023-02-01 17:13:41 +00:00
Andy Allan
b5046fdcd0 Move browse#new_note to notes#new 
This allows a more resourceful routing approach.
 2023-02-01 17:13:41 +00:00
Andy Allan
f7367baa6b Rename api_notes resource to avoid conflict with non-API resource 
This allows using e.g. note_path for notes#show in the future.
 2023-01-25 19:01:57 +00:00
Tom Hughes
152e524002 Make error pages translatable 
Fixes #3877
 2023-01-09 19:32:22 +00:00
Dimitar
3247ffd57c
Added missing </p> tag 2023-01-01 16:06:41 +02:00
Andy Allan
f78c032b07 Use buttons for dropdown toggles 
These elements don't link to another page, and so there's no need
to use a link that leads to nowhere.
 2022-12-22 09:56:56 +00:00
Andy Allan
a11e156f56 Use mail_to help to avoid handcrafting mailto links 
This also reworks the user suspended page to avoid having html in
the translation strings.
 2022-11-30 11:13:44 +00:00
Andy Allan
067b0de439
Merge pull request #3676 from harry-wood/notes-disappear-time 
Display how long until a note will disappear
 2022-11-23 15:44:26 +00:00
Tom Hughes
8cef62cd2c Merge remote-tracking branch 'upstream/pull/3301' 2022-11-22 18:47:24 +00:00
Tom Hughes
c0278a01da Merge remote-tracking branch 'upstream/pull/3803' 2022-11-17 17:49:17 +00:00
Andy Allan
1559d88048 Create a second title_user translation, to avoid using html_safe 2022-11-17 12:10:49 +00:00