]> git.openstreetmap.org Git - rails.git/log
rails.git
21 months agoUse with_locale for the copyright page
Andy Allan [Wed, 22 Mar 2023 09:49:34 +0000 (09:49 +0000)]
Use with_locale for the copyright page

This avoids having to override the locale on each and every translation

21 months agoUse .with_locale for about page
Andy Allan [Wed, 15 Mar 2023 18:08:59 +0000 (18:08 +0000)]
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.

21 months agoRemove the language block from around the original guidance
Andy Allan [Wed, 15 Mar 2023 18:45:41 +0000 (18:45 +0000)]
Remove the language block from around the original guidance

The guidance is shown in the user's own language, not in english.

21 months agoRemove the language block from around the guidance
Andy Allan [Wed, 15 Mar 2023 18:13:56 +0000 (18:13 +0000)]
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.

21 months agoUpdate bundle
Tom Hughes [Tue, 21 Mar 2023 19:16:34 +0000 (19:16 +0000)]
Update bundle

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 20 Mar 2023 12:20:41 +0000 (13:20 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoUpdate en.yml
wtrbtl03 [Mon, 20 Mar 2023 07:29:23 +0000 (12:59 +0530)]
Update en.yml

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 16 Mar 2023 12:14:58 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoInclude count in messages for the "one" plural category
Tom Hughes [Wed, 15 Mar 2023 21:01:32 +0000 (21:01 +0000)]
Include count in messages for the "one" plural category

21 months agoUpdate bundle
Tom Hughes [Tue, 14 Mar 2023 18:13:51 +0000 (18:13 +0000)]
Update bundle

21 months agoMerge remote-tracking branch 'upstream/pull/3968'
Tom Hughes [Tue, 14 Mar 2023 18:12:42 +0000 (18:12 +0000)]
Merge remote-tracking branch 'upstream/pull/3968'

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 13 Mar 2023 12:13:27 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoRemove accidental commit
Tom Hughes [Sun, 12 Mar 2023 17:53:30 +0000 (17:53 +0000)]
Remove accidental commit

21 months agoFix "load more" button on search results
Tom Hughes [Sun, 12 Mar 2023 17:52:39 +0000 (17:52 +0000)]
Fix "load more" button on search results

Fixes #3969

21 months agoSet the locale when rendering a generic error page
Tom Hughes [Sun, 12 Mar 2023 16:09:37 +0000 (16:09 +0000)]
Set the locale when rendering a generic error page

21 months agoBump eslint from 8.35.0 to 8.36.0
dependabot[bot] [Fri, 10 Mar 2023 23:56:36 +0000 (23:56 +0000)]
Bump eslint from 8.35.0 to 8.36.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.35.0 to 8.36.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.35.0...v8.36.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
21 months agoMerge pull request #3966 from willemarcel/patch-2
Andy Allan [Fri, 10 Mar 2023 18:19:19 +0000 (18:19 +0000)]
Merge pull request #3966 from willemarcel/patch-2

Add space between form and Publish diary button

21 months agoAdd space between form and Publish diary button
Wille Marcel [Fri, 10 Mar 2023 18:16:44 +0000 (15:16 -0300)]
Add space between form and Publish diary button

21 months agoDrop legacy forums from help page
Tom Hughes [Wed, 8 Mar 2023 17:40:34 +0000 (17:40 +0000)]
Drop legacy forums from help page

21 months agoMerge remote-tracking branch 'upstream/pull/3963'
Tom Hughes [Wed, 8 Mar 2023 17:07:34 +0000 (17:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3963'

21 months agoMerge remote-tracking branch 'upstream/pull/3962'
Tom Hughes [Wed, 8 Mar 2023 17:00:48 +0000 (17:00 +0000)]
Merge remote-tracking branch 'upstream/pull/3962'

21 months agoMerge pull request #3846 from SK53/osgb-date-2022
Andy Allan [Wed, 8 Mar 2023 16:59:07 +0000 (16:59 +0000)]
Merge pull request #3846 from SK53/osgb-date-2022

Update OSGB date range for copyright

21 months agoUpdate copyright date based on LWG request
Andy Allan [Wed, 8 Mar 2023 16:52:10 +0000 (16:52 +0000)]
Update copyright date based on LWG request

21 months agoDocument the procedure to change the copyright attribution page
Andy Allan [Wed, 8 Mar 2023 16:43:54 +0000 (16:43 +0000)]
Document the procedure to change the copyright attribution page

This comes up every now and then, and so let's have the existing procedure documented.

21 months agoMerge pull request #3958 from tomhughes/geocoder-post
Andy Allan [Wed, 8 Mar 2023 16:28:55 +0000 (16:28 +0000)]
Merge pull request #3958 from tomhughes/geocoder-post

Use POST for geocoder backends

21 months agoRework confirmations page to avoid raw html in translations
Andy Allan [Wed, 8 Mar 2023 15:54:35 +0000 (15:54 +0000)]
Rework confirmations page to avoid raw html in translations

21 months agoRework shared kramdown instructions to avoid html in translations
Andy Allan [Wed, 8 Mar 2023 15:42:15 +0000 (15:42 +0000)]
Rework shared kramdown instructions to avoid html in translations

21 months agoRemove html from translations for terms page
Andy Allan [Sat, 25 Feb 2023 17:07:09 +0000 (18:07 +0100)]
Remove html from translations for terms page

21 months agoRemove remaining html in translations from fixthemap page
Andy Allan [Sat, 25 Feb 2023 11:27:30 +0000 (12:27 +0100)]
Remove remaining html in translations from fixthemap page

21 months agoRefactor communities page to avoid html in translations
Andy Allan [Sat, 25 Feb 2023 11:15:36 +0000 (12:15 +0100)]
Refactor communities page to avoid html in translations

21 months agoRefactor potlatch page to avoid html in translations
Andy Allan [Sat, 25 Feb 2023 11:15:09 +0000 (12:15 +0100)]
Refactor potlatch page to avoid html in translations

21 months agoMerge remote-tracking branch 'upstream/pull/3961'
Tom Hughes [Wed, 8 Mar 2023 16:07:08 +0000 (16:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3961'

21 months agoMerge remote-tracking branch 'upstream/pull/3960'
Tom Hughes [Wed, 8 Mar 2023 15:58:03 +0000 (15:58 +0000)]
Merge remote-tracking branch 'upstream/pull/3960'

21 months agoAdd the i18n-tasks gem
Andy Allan [Sun, 26 Feb 2023 11:35:12 +0000 (12:35 +0100)]
Add the i18n-tasks gem

This can be used for checking our translations, for example to see
if there are unused translations in en.yml

21 months agoRemove unused user_blocks translations
Andy Allan [Wed, 8 Mar 2023 15:10:19 +0000 (15:10 +0000)]
Remove unused user_blocks translations

These checkboxes were removed in 95c3d640a44857b0b92ec3be6dad606e40057c5c

21 months agoRemove used issues#update translations
Andy Allan [Wed, 8 Mar 2023 15:03:57 +0000 (15:03 +0000)]
Remove used issues#update translations

These are covered by reports#create, and there is no issues#update
controller method or view.

21 months agoRemove used translations on the registration page
Andy Allan [Wed, 8 Mar 2023 14:53:34 +0000 (14:53 +0000)]
Remove used translations on the registration page

We use activerecord attributes for this instead

21 months agoRemove set_home translation
Andy Allan [Wed, 8 Mar 2023 14:51:13 +0000 (14:51 +0000)]
Remove set_home translation

The corresponding method was removed in 2010 with fbe529d87e61ab63bcf749067422ab2cbbb655d0

21 months agoRemove several unused translations from the user#show page
Andy Allan [Wed, 8 Mar 2023 14:46:12 +0000 (14:46 +0000)]
Remove several unused translations from the user#show page

21 months agoUse POST for geocoder backends
Tom Hughes [Tue, 7 Mar 2023 17:24:48 +0000 (17:24 +0000)]
Use POST for geocoder backends

The geocoder backend calls are a private implementation detail
and using POST enables request forgery checks and makes scraping
of nominatim via the backend calls harder.

21 months agoAdd rubocop-capybara
Tom Hughes [Tue, 7 Mar 2023 17:09:29 +0000 (17:09 +0000)]
Add rubocop-capybara

21 months agoUpdate bundle
Tom Hughes [Tue, 7 Mar 2023 17:02:18 +0000 (17:02 +0000)]
Update bundle

21 months agoMerge remote-tracking branch 'upstream/pull/3957'
Tom Hughes [Tue, 7 Mar 2023 17:01:22 +0000 (17:01 +0000)]
Merge remote-tracking branch 'upstream/pull/3957'

21 months agoBump qs from 6.11.0 to 6.11.1
dependabot[bot] [Mon, 6 Mar 2023 23:56:38 +0000 (23:56 +0000)]
Bump qs from 6.11.0 to 6.11.1

Bumps [qs](https://github.com/ljharb/qs) from 6.11.0 to 6.11.1.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.11.0...v6.11.1)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Mar 2023 12:14:43 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoMerge remote-tracking branch 'upstream/pull/3955'
Tom Hughes [Fri, 3 Mar 2023 22:32:37 +0000 (22:32 +0000)]
Merge remote-tracking branch 'upstream/pull/3955'

21 months agoUpdate to iD v2.25.1
Martin Raifer [Fri, 3 Mar 2023 15:53:00 +0000 (16:53 +0100)]
Update to iD v2.25.1

21 months agoMerge remote-tracking branch 'upstream/pull/3953'
Tom Hughes [Fri, 3 Mar 2023 17:55:53 +0000 (17:55 +0000)]
Merge remote-tracking branch 'upstream/pull/3953'

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Mar 2023 12:17:49 +0000 (13:17 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoBump coverallsapp/github-action from 1.2.2 to 1.2.4
dependabot[bot] [Wed, 1 Mar 2023 23:57:09 +0000 (23:57 +0000)]
Bump coverallsapp/github-action from 1.2.2 to 1.2.4

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.2.2 to 1.2.4.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v1.2.2...v1.2.4)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
21 months agoFix new rubocop warnings
Tom Hughes [Tue, 28 Feb 2023 15:20:33 +0000 (15:20 +0000)]
Fix new rubocop warnings

21 months agoUpdate bundle
Tom Hughes [Tue, 28 Feb 2023 15:19:07 +0000 (15:19 +0000)]
Update bundle

21 months agoMerge remote-tracking branch 'upstream/pull/3950'
Tom Hughes [Tue, 28 Feb 2023 15:16:49 +0000 (15:16 +0000)]
Merge remote-tracking branch 'upstream/pull/3950'

21 months agoMerge remote-tracking branch 'upstream/pull/3949'
Tom Hughes [Tue, 28 Feb 2023 15:16:43 +0000 (15:16 +0000)]
Merge remote-tracking branch 'upstream/pull/3949'

21 months agoRemove duplicate translation key
Andy Allan [Tue, 28 Feb 2023 11:05:46 +0000 (11:05 +0000)]
Remove duplicate translation key

It's already defined three lines above.

21 months agoRemove old model name
Andy Allan [Tue, 28 Feb 2023 11:04:12 +0000 (11:04 +0000)]
Remove old model name

I doubt this was ever used, but anyway it was made redundant in
4395b79bf72f85543bce8ff3627eb7a0583b5ccc when the class was renamed.

21 months agoBump coverallsapp/github-action from 1.2.1 to 1.2.2
dependabot[bot] [Mon, 27 Feb 2023 23:57:10 +0000 (23:57 +0000)]
Bump coverallsapp/github-action from 1.2.1 to 1.2.2

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/v1.2.1...v1.2.2)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
21 months agoBump eslint from 8.34.0 to 8.35.0
dependabot[bot] [Mon, 27 Feb 2023 23:56:39 +0000 (23:56 +0000)]
Bump eslint from 8.34.0 to 8.35.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.34.0 to 8.35.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.34.0...v8.35.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
21 months agoRemove translations that are no longer used when showing messages
Andy Allan [Sun, 26 Feb 2023 14:27:05 +0000 (15:27 +0100)]
Remove translations that are no longer used when showing messages

21 months agoRemove used translations for new messages
Andy Allan [Sun, 26 Feb 2023 14:23:07 +0000 (15:23 +0100)]
Remove used translations for new messages

We use the activerecord attribute hierarchy for this

21 months agoRemove unused translations
Andy Allan [Sun, 26 Feb 2023 13:49:40 +0000 (14:49 +0100)]
Remove unused translations

These were removed in 6adcce4e5d75fa21dea85742fa3

21 months agoBump coverallsapp/github-action to 1.2.1
Tom Hughes [Mon, 27 Feb 2023 12:22:17 +0000 (12:22 +0000)]
Bump coverallsapp/github-action to 1.2.1

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 27 Feb 2023 12:12:47 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoMerge remote-tracking branch 'upstream/pull/3941'
Tom Hughes [Mon, 27 Feb 2023 12:07:42 +0000 (12:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3941'

21 months agoRemove unused tooltip translations
Andy Allan [Sun, 26 Feb 2023 10:22:32 +0000 (11:22 +0100)]
Remove unused tooltip translations

These were removed in 2d9a083b365e5cfa527c40add35464630c1a9b00

21 months agoRemove unused metro extract translations
Andy Allan [Sun, 26 Feb 2023 10:12:41 +0000 (11:12 +0100)]
Remove unused metro extract translations

Refs 9340c461732ef7387dd453ea3fcf5e64ea782ab4

21 months agoRemove translations no longer used on the login page
Andy Allan [Sat, 25 Feb 2023 17:36:42 +0000 (18:36 +0100)]
Remove translations no longer used on the login page

This page was refactored in 2a3bc0a38789b29b8798eafd80fc4fb77c5c7957

21 months agoBump coverallsapp/github-action from 1.1.3 to 1.2.0
dependabot[bot] [Fri, 24 Feb 2023 23:56:58 +0000 (23:56 +0000)]
Bump coverallsapp/github-action from 1.1.3 to 1.2.0

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 1.1.3 to 1.2.0.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](https://github.com/coverallsapp/github-action/compare/1.1.3...v1.2.0)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 23 Feb 2023 12:14:12 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoMerge remote-tracking branch 'upstream/pull/3936'
Tom Hughes [Wed, 22 Feb 2023 18:17:51 +0000 (18:17 +0000)]
Merge remote-tracking branch 'upstream/pull/3936'

21 months agoMerge pull request #3935 from Hufkratzer/rename-horse-riding-label
Andy Allan [Wed, 22 Feb 2023 15:26:20 +0000 (15:26 +0000)]
Merge pull request #3935 from Hufkratzer/rename-horse-riding-label

Change label for leisure=horse_riding in en.yml

21 months agoRework about page to avoid html in the translations
Andy Allan [Wed, 15 Feb 2023 16:47:21 +0000 (16:47 +0000)]
Rework about page to avoid html in the translations

21 months agoRemove html from translations for the welcome page
Andy Allan [Wed, 15 Feb 2023 16:47:02 +0000 (16:47 +0000)]
Remove html from translations for the welcome page

This also refactors the "any questions" section, which is shared with the fixthemap page.

21 months agoMerge remote-tracking branch 'upstream/pull/3937'
Tom Hughes [Wed, 22 Feb 2023 10:04:31 +0000 (10:04 +0000)]
Merge remote-tracking branch 'upstream/pull/3937'

21 months agoEnsure kramdown table alignment styles are converted to bootstrap classes
Andy Allan [Wed, 22 Feb 2023 09:46:48 +0000 (09:46 +0000)]
Ensure kramdown table alignment styles are converted to bootstrap classes

Adds tests for commit f42a7a2d8dd507a3746a1e2de91deda9614cf807

21 months agoRefactor trace guidance to avoid raw html in translations
Andy Allan [Wed, 8 Feb 2023 14:33:46 +0000 (14:33 +0000)]
Refactor trace guidance to avoid raw html in translations

Also rearrange to avoid multiple sentences in a heading.

21 months agoRefactor translation to avoid raw html tags
Andy Allan [Wed, 8 Feb 2023 14:11:45 +0000 (14:11 +0000)]
Refactor translation to avoid raw html tags

21 months agoMove public editing content into its own partial
Andy Allan [Wed, 8 Feb 2023 14:01:41 +0000 (14:01 +0000)]
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.

21 months agoRefactor public editing note to avoid raw html in the translations
Andy Allan [Wed, 8 Feb 2023 13:55:33 +0000 (13:55 +0000)]
Refactor public editing note to avoid raw html in the translations

21 months agoUpdate bundle
Tom Hughes [Tue, 21 Feb 2023 18:09:58 +0000 (18:09 +0000)]
Update bundle

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 20 Feb 2023 12:14:01 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoChange label for leisure=horse_riding in en.yml
Hufkratzer [Sat, 18 Feb 2023 21:16:19 +0000 (22:16 +0100)]
Change label for leisure=horse_riding in en.yml

Change "Horse Riding" to "Horse Riding Centre"

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 16 Feb 2023 12:14:07 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoUpdate bundle
Tom Hughes [Tue, 14 Feb 2023 18:08:45 +0000 (18:08 +0000)]
Update bundle

22 months agoAdd limit parameter to api changesets query
Anton Khorev [Tue, 14 Feb 2023 17:54:40 +0000 (20:54 +0300)]
Add limit parameter to api changesets query

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 13 Feb 2023 12:12:35 +0000 (13:12 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoMerge remote-tracking branch 'upstream/pull/3930'
Tom Hughes [Sun, 12 Feb 2023 18:25:36 +0000 (18:25 +0000)]
Merge remote-tracking branch 'upstream/pull/3930'

22 months agoBump eslint from 8.33.0 to 8.34.0
dependabot[bot] [Fri, 10 Feb 2023 23:57:11 +0000 (23:57 +0000)]
Bump eslint from 8.33.0 to 8.34.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.33.0 to 8.34.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.33.0...v8.34.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
22 months agoMerge remote-tracking branch 'upstream/pull/3924'
Tom Hughes [Thu, 9 Feb 2023 17:48:55 +0000 (17:48 +0000)]
Merge remote-tracking branch 'upstream/pull/3924'

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 9 Feb 2023 12:13:40 +0000 (13:13 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoUpdate to iD v2.24.2
Martin Raifer [Thu, 9 Feb 2023 10:15:22 +0000 (11:15 +0100)]
Update to iD v2.24.2

22 months agoMerge pull request #3691 from AntonKhorev/wikipedia-secondary-links
Andy Allan [Wed, 8 Feb 2023 17:30:25 +0000 (17:30 +0000)]
Merge pull request #3691 from AntonKhorev/wikipedia-secondary-links

Link prefixed wikipedia tags

22 months agoUpdate bundle
Tom Hughes [Tue, 7 Feb 2023 18:22:50 +0000 (18:22 +0000)]
Update bundle

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 6 Feb 2023 12:15:08 +0000 (13:15 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 2 Feb 2023 12:14:55 +0000 (13:14 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoMerge remote-tracking branch 'upstream/pull/3911'
Tom Hughes [Wed, 1 Feb 2023 19:10:22 +0000 (19:10 +0000)]
Merge remote-tracking branch 'upstream/pull/3911'

22 months agoMerge remote-tracking branch 'upstream/pull/3915'
Tom Hughes [Wed, 1 Feb 2023 19:07:09 +0000 (19:07 +0000)]
Merge remote-tracking branch 'upstream/pull/3915'

22 months agoAvoid converting conditional restriction tags into emails
Andy Allan [Wed, 1 Feb 2023 18:57:16 +0000 (18:57 +0000)]
Avoid converting conditional restriction tags into emails

Fixes #3884

22 months agoRefactor to use submit_tag helper
Andy Allan [Wed, 1 Feb 2023 17:01:32 +0000 (17:01 +0000)]
Refactor to use submit_tag helper

This is more readable than interpolating into element attributes

22 months agoRefactor translation strings for notes
Andy Allan [Thu, 26 Jan 2023 11:36:09 +0000 (11:36 +0000)]
Refactor translation strings for notes

These aren't used by any javascript code, so don't need to be in
the `javascripts` key.